Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Test Fixes

  • Loading branch information...
commit ee7de9c80e10edd9a28c9f4ed0d0c41fe12e3b4a 1 parent 47fc8eb
Michael Hashimoto authored February 02, 2012 brianchandotcom committed February 02, 2012
160  build-test-db-upgrade.xml
@@ -3,9 +3,7 @@
3 3
 <project name="portal-test-db-upgrade" basedir="." default="test" xmlns:antelope="antlib:ise.antelope.tasks">
4 4
 	<import file="build-test.xml" />
5 5
 
6  
-	<target name="prepare-db-db2-common">
7  
-		<echo file="test.${user.name}.properties">db.type=db2</echo>
8  
-
  6
+	<target name="prepare-db-common">
9 7
 		<antcall target="prepare-portal-ext-properties" inheritAll="false" />
10 8
 
11 9
 		<ant dir="portal-impl" target="deploy-properties" inheritAll="false" />
@@ -14,7 +12,52 @@
14 12
 			<isset property="sql.version" />
15 13
 			<then>
16 14
 				<property name="sql.dir" value="sql\legacy\${sql.version}\create\" />
17  
-				<property name="sql.file" value="create-db2.sql" />
  15
+
  16
+				<if>
  17
+					<equals arg1="${db.type}" arg2="db2" />
  18
+					<then>
  19
+						<property name="sql.file" value="create-db2.sql" />
  20
+					</then>
  21
+					<elseif>
  22
+						<equals arg1="${db.type}" arg2="mysql" />
  23
+						<then>
  24
+							<property name="sql.file" value="create-mysql.sql" />
  25
+						</then>
  26
+					</elseif>
  27
+					<elseif>
  28
+						<or>
  29
+							<equals arg1="${db.type}" arg2="oracle-10" />
  30
+							<equals arg1="${db.type}" arg2="oracle-11" />
  31
+						</or>
  32
+						<then>
  33
+							<property name="sql.file" value="create-oracle.sql" />
  34
+						</then>
  35
+					</elseif>
  36
+					<elseif>
  37
+						<or>
  38
+							<equals arg1="${db.type}" arg2="postgresql-8.4" />
  39
+							<equals arg1="${db.type}" arg2="postgresql-9.0" />
  40
+						</or>
  41
+						<then>
  42
+							<property name="sql.file" value="create-postgresql.sql" />
  43
+						</then>
  44
+					</elseif>
  45
+					<elseif>
  46
+						<or>
  47
+							<equals arg1="${db.type}" arg2="sql-server-2005" />
  48
+							<equals arg1="${db.type}" arg2="sql-server-2008" />
  49
+						</or>
  50
+						<then>
  51
+							<property name="sql.file" value="create-sql-server.sql" />
  52
+						</then>
  53
+					</elseif>
  54
+					<elseif>
  55
+						<equals arg1="${db.type}" arg2="sybase" />
  56
+						<then>
  57
+							<property name="sql.file" value="create-sybase.sql" />
  58
+						</then>
  59
+					</elseif>
  60
+				</if>
18 61
 			</then>
19 62
 		</if>
20 63
 
@@ -24,109 +67,58 @@
24 67
 		</antcall>
25 68
 	</target>
26 69
 
27  
-	<target name="prepare-db-mysql-common">
28  
-		<echo file="test.${user.name}.properties">db.type=mysql</echo>
29  
-
30  
-		<antcall target="prepare-portal-ext-properties" inheritAll="false" />
  70
+	<target name="prepare-db-db2-common">
  71
+		<echo file="test.${user.name}.properties">db.type=db2</echo>
31 72
 
32  
-		<ant dir="portal-impl" target="deploy-properties" inheritAll="false" />
  73
+		<antcall target="prepare-db-common" />
  74
+	</target>
33 75
 
34  
-		<if>
35  
-			<isset property="sql.version" />
36  
-			<then>
37  
-				<property name="sql.dir" value="sql\legacy\${sql.version}\create\" />
38  
-				<property name="sql.file" value="create-mysql.sql" />
39  
-			</then>
40  
-		</if>
  76
+	<target name="prepare-db-mysql-common">
  77
+		<echo file="test.${user.name}.properties">db.type=mysql</echo>
41 78
 
42  
-		<antcall target="rebuild-database" inheritAll="false">
43  
-			<param name="sql.dir" value="${sql.dir}" />
44  
-			<param name="sql.file" value="${sql.file}" />
45  
-		</antcall>
  79
+		<antcall target="prepare-db-common" />
46 80
 	</target>
47 81
 
48  
-	<target name="prepare-db-oracle-common">
49  
-		<echo file="test.${user.name}.properties">db.type=oracle</echo>
50  
-
51  
-		<antcall target="prepare-portal-ext-properties" inheritAll="false" />
  82
+	<target name="prepare-db-oracle-10-common">
  83
+		<echo file="test.${user.name}.properties">db.type=oracle-10</echo>
52 84
 
53  
-		<ant dir="portal-impl" target="deploy-properties" inheritAll="false" />
  85
+		<antcall target="prepare-db-common" />
  86
+	</target>
54 87
 
55  
-		<if>
56  
-			<isset property="sql.version" />
57  
-			<then>
58  
-				<property name="sql.dir" value="sql\legacy\${sql.version}\create\" />
59  
-				<property name="sql.file" value="create-oracle.sql" />
60  
-			</then>
61  
-		</if>
  88
+	<target name="prepare-db-oracle-11-common">
  89
+		<echo file="test.${user.name}.properties">db.type=oracle-11</echo>
62 90
 
63  
-		<antcall target="rebuild-database" inheritAll="false">
64  
-			<param name="sql.dir" value="${sql.dir}" />
65  
-			<param name="sql.file" value="${sql.file}" />
66  
-		</antcall>
  91
+		<antcall target="prepare-db-common" />
67 92
 	</target>
68 93
 
69  
-	<target name="prepare-db-postgresql-common">
70  
-		<echo file="test.${user.name}.properties">db.type=postgresql</echo>
  94
+	<target name="prepare-db-postgresql-8.4-common">
  95
+		<echo file="test.${user.name}.properties">db.type=postgresql-8.4</echo>
71 96
 
72  
-		<antcall target="prepare-portal-ext-properties" inheritAll="false" />
73  
-
74  
-		<ant dir="portal-impl" target="deploy-properties" inheritAll="false" />
  97
+		<antcall target="prepare-db-common" />
  98
+	</target>
75 99
 
76  
-		<if>
77  
-			<isset property="sql.version" />
78  
-			<then>
79  
-				<property name="sql.dir" value="sql\legacy\${sql.version}\create\" />
80  
-				<property name="sql.file" value="create-postgresql.sql" />
81  
-			</then>
82  
-		</if>
  100
+	<target name="prepare-db-postgresql-9.0-common">
  101
+		<echo file="test.${user.name}.properties">db.type=postgresql-9.0</echo>
83 102
 
84  
-		<antcall target="rebuild-database" inheritAll="false">
85  
-			<param name="sql.dir" value="${sql.dir}" />
86  
-			<param name="sql.file" value="${sql.file}" />
87  
-		</antcall>
  103
+		<antcall target="prepare-db-common" />
88 104
 	</target>
89 105
 
90  
-	<target name="prepare-db-sql-server-common">
91  
-		<echo file="test.${user.name}.properties">db.type=sql-server</echo>
92  
-
93  
-		<antcall target="prepare-portal-ext-properties" inheritAll="false" />
  106
+	<target name="prepare-db-sql-server-2005-common">
  107
+		<echo file="test.${user.name}.properties">db.type=sql-server-2005</echo>
94 108
 
95  
-		<ant dir="portal-impl" target="deploy-properties" inheritAll="false" />
  109
+		<antcall target="prepare-db-common" />
  110
+	</target>
96 111
 
97  
-		<if>
98  
-			<isset property="sql.version" />
99  
-			<then>
100  
-				<property name="sql.dir" value="sql\legacy\${sql.version}\create\" />
101  
-				<property name="sql.file" value="create-sql-server.sql" />
102  
-			</then>
103  
-		</if>
  112
+	<target name="prepare-db-sql-server-2008-common">
  113
+		<echo file="test.${user.name}.properties">db.type=sql-server-2008</echo>
104 114
 
105  
-		<antcall target="rebuild-database" inheritAll="false">
106  
-			<param name="sql.dir" value="${sql.dir}" />
107  
-			<param name="sql.file" value="${sql.file}" />
108  
-		</antcall>
  115
+		<antcall target="prepare-db-common" />
109 116
 	</target>
110 117
 
111 118
 	<target name="prepare-db-sybase-common">
112 119
 		<echo file="test.${user.name}.properties">db.type=sybase</echo>
113 120
 
114  
-		<antcall target="prepare-portal-ext-properties" inheritAll="false" />
115  
-
116  
-		<ant dir="portal-impl" target="deploy-properties" inheritAll="false" />
117  
-
118  
-		<if>
119  
-			<isset property="sql.version" />
120  
-			<then>
121  
-				<property name="sql.dir" value="sql\legacy\${sql.version}\create\" />
122  
-				<property name="sql.file" value="create-sybase.sql" />
123  
-			</then>
124  
-		</if>
125  
-
126  
-		<antcall target="rebuild-database" inheritAll="false">
127  
-			<param name="sql.dir" value="${sql.dir}" />
128  
-			<param name="sql.file" value="${sql.file}" />
129  
-		</antcall>
  121
+		<antcall target="prepare-db-common" />
130 122
 	</target>
131 123
 
132 124
 	<target name="run-latest-upgrade-test">
10  build-test-tomcat.xml
@@ -15,16 +15,6 @@
15 15
 		/>
16 16
 	</target>
17 17
 
18  
-	<target name="copy-optional-jars">
19  
-		<copy
20  
-			todir="${app.server.lib.global.dir}">
21  
-				<fileset
22  
-					dir="${jdbc.drivers.optional.dir}"
23  
-					includes="*.jar"
24  
-			/>
25  
-		</copy>
26  
-	</target>
27  
-
28 18
 	<target name="prepare-cluster-tomcat-node">
29 19
 		<exec executable="${pscp.executable}">
30 20
 			<arg line="-pw ${vm.password} dist/liferay-portal-tomcat-${lp.version}.zip ${vm.username}@${cluster-node.host}:/" />
162  build-test.xml
@@ -1960,6 +1960,22 @@
1960 1960
 		</if>
1961 1961
 	</target>
1962 1962
 
  1963
+	<target name="copy-optional-jars">
  1964
+		<delete includeemptydirs="true" failonerror="false">
  1965
+			<fileset
  1966
+				dir="${simple.server.lib.global.dir}"
  1967
+				includes="db2*.jar,jtds.jar,ojdbc*.jar"
  1968
+			/>
  1969
+		</delete>
  1970
+
  1971
+		<copy todir="${app.server.lib.global.dir}">
  1972
+				<fileset
  1973
+					dir="${jdbc.drivers.optional.dir}/${db.type}"
  1974
+					includes="*.jar"
  1975
+			/>
  1976
+		</copy>
  1977
+	</target>
  1978
+
1963 1979
 	<target name="create-ant-script">
1964 1980
 		<loadfile property="template.content" srcfile="portal-web/test-ant-templates/${ant.script.template}">
1965 1981
 			<filterchain>
@@ -2125,8 +2141,14 @@
2125 2141
 		<antcall target="prepare-common" />
2126 2142
 	</target>
2127 2143
 
2128  
-	<target name="prepare-oracle">
2129  
-		<echo file="test.${user.name}.properties">db.type=oracle</echo>
  2144
+	<target name="prepare-oracle-10">
  2145
+		<echo file="test.${user.name}.properties">db.type=oracle-10</echo>
  2146
+
  2147
+		<antcall target="prepare-common" />
  2148
+	</target>
  2149
+
  2150
+	<target name="prepare-oracle-11">
  2151
+		<echo file="test.${user.name}.properties">db.type=oracle-11</echo>
2130 2152
 
2131 2153
 		<antcall target="prepare-common" />
2132 2154
 	</target>
@@ -2167,7 +2189,10 @@ custom.sql.function.isnull=CAST(? AS VARCHAR(32672)) IS NULL
2167 2189
 custom.sql.function.isnotnull=CAST(? AS VARCHAR(32672)) IS NOT NULL</echo>
2168 2190
 			</then>
2169 2191
 			<elseif>
2170  
-				<equals arg1="${db.type}" arg2="oracle" />
  2192
+				<or>
  2193
+					<equals arg1="${db.type}" arg2="oracle-10" />
  2194
+					<equals arg1="${db.type}" arg2="oracle-11" />
  2195
+				</or>
2171 2196
 				<then>
2172 2197
 					<echo file="portal-impl/src/portal-ext.properties" append="true">
2173 2198
 
@@ -2362,7 +2387,8 @@ message.boards.subscribe.by.default=false</echo>
2362 2387
 				<echo file="portal-impl/src/portal-ext.properties" append="true">
2363 2388
 
2364 2389
 upgrade.processes=\
2365  
-	com.liferay.portal.upgrade.UpgradeProcess_6_0_12_to_6_1_0</echo>
  2390
+	com.liferay.portal.upgrade.UpgradeProcess_6_0_12_to_6_1_0,\
  2391
+	com.liferay.portal.upgrade.UpgradeProcess_6_1_1</echo>
2366 2392
 			</then>
2367 2393
 		</if>
2368 2394
 
@@ -2461,8 +2487,14 @@ svn --username ${svn.username} --password ${svn.password} update -r ${svn.info.r
2461 2487
 		</if>
2462 2488
 	</target>
2463 2489
 
2464  
-	<target name="prepare-postgresql">
2465  
-		<echo file="test.${user.name}.properties">db.type=postgresql</echo>
  2490
+	<target name="prepare-postgresql-8.4">
  2491
+		<echo file="test.${user.name}.properties">db.type=postgresql-8.4</echo>
  2492
+
  2493
+		<antcall target="prepare-common" />
  2494
+	</target>
  2495
+
  2496
+	<target name="prepare-postgresql-9.0">
  2497
+		<echo file="test.${user.name}.properties">db.type=postgresql-9.0</echo>
2466 2498
 
2467 2499
 		<antcall target="prepare-common" />
2468 2500
 	</target>
@@ -2618,8 +2650,14 @@ executable ZIP file.
2618 2650
 		</if>
2619 2651
 	</target>
2620 2652
 
2621  
-	<target name="prepare-sql-server">
2622  
-		<echo file="test.${user.name}.properties">db.type=sql-server</echo>
  2653
+	<target name="prepare-sql-server-2005">
  2654
+		<echo file="test.${user.name}.properties">db.type=sql-server-2005</echo>
  2655
+
  2656
+		<antcall target="prepare-common" />
  2657
+	</target>
  2658
+
  2659
+	<target name="prepare-sql-server-2008">
  2660
+		<echo file="test.${user.name}.properties">db.type=sql-server-2008</echo>
2623 2661
 
2624 2662
 		<antcall target="prepare-common" />
2625 2663
 	</target>
@@ -2781,19 +2819,28 @@ file.
2781 2819
 								</then>
2782 2820
 							</elseif>
2783 2821
 							<elseif>
2784  
-								<equals arg1="${db.type}" arg2="oracle" />
  2822
+								<or>
  2823
+									<equals arg1="${db.type}" arg2="oracle-10" />
  2824
+									<equals arg1="${db.type}" arg2="oracle-11" />
  2825
+								</or>
2785 2826
 								<then>
2786 2827
 									<antcall target="rebuild-database-oracle" />
2787 2828
 								</then>
2788 2829
 							</elseif>
2789 2830
 							<elseif>
2790  
-								<equals arg1="${db.type}" arg2="postgresql" />
  2831
+								<or>
  2832
+									<equals arg1="${db.type}" arg2="postgresql-8.4" />
  2833
+									<equals arg1="${db.type}" arg2="postgresql-9.0" />
  2834
+								</or>
2791 2835
 								<then>
2792 2836
 									<antcall target="rebuild-database-postgresql" />
2793 2837
 								</then>
2794 2838
 							</elseif>
2795 2839
 							<elseif>
2796  
-								<equals arg1="${db.type}" arg2="sql-server" />
  2840
+								<or>
  2841
+									<equals arg1="${db.type}" arg2="sql-server-2005" />
  2842
+									<equals arg1="${db.type}" arg2="sql-server-2008" />
  2843
+								</or>
2797 2844
 								<then>
2798 2845
 									<antcall target="rebuild-database-sql-server" />
2799 2846
 								</then>
@@ -2843,26 +2890,26 @@ file.
2843 2890
 		<copy file="${sql.dir}${sql.file}" tofile="${sql.file}" />
2844 2891
 
2845 2892
 		<replace file="${sql.file}">
2846  
-			<replacefilter token="drop database lportal;" value="drop database ${db.db2.schema};"/>
2847  
-			<replacefilter token="create database lportal;" value="create database ${db.db2.schema} pagesize 8192;"/>
2848  
-			<replacefilter token="create database lportal pagesize 8192;" value="create database ${db.db2.schema} pagesize 8192;"/>
2849  
-			<replacefilter token="connect to lportal;" value="connect to ${db.db2.schema} USER ${db.db2.username} USING ${db.db2.password};"/>
  2893
+			<replacefilter token="drop database lportal;" value="drop database ${db.schema};"/>
  2894
+			<replacefilter token="create database lportal;" value="create database ${db.schema} pagesize 8192;"/>
  2895
+			<replacefilter token="create database lportal pagesize 8192;" value="create database ${db.schema} pagesize 8192;"/>
  2896
+			<replacefilter token="connect to lportal;" value="connect to ${db.schema} USER ${db.username} USING ${db.password};"/>
2850 2897
 		</replace>
2851 2898
 
2852 2899
 		<exec executable="${plink.executable}">
2853  
-			<arg line="-pw ${vm.password} ${vm.username}@${db.db2.host} cmd.exe /c mkdir C:\${tstamp.value}" />
  2900
+			<arg line="-pw ${vm.password} ${vm.username}@${db.host} cmd.exe /c mkdir C:\${tstamp.value}" />
2854 2901
 		</exec>
2855 2902
 
2856 2903
 		<exec executable="${pscp.executable}">
2857  
-			<arg line="-pw ${vm.password} ${sql.file} ${vm.username}@${db.db2.host}:\${tstamp.value}" />
  2904
+			<arg line="-pw ${vm.password} ${sql.file} ${vm.username}@${db.host}:\${tstamp.value}" />
2858 2905
 		</exec>
2859 2906
 
2860 2907
 		<exec executable="${plink.executable}">
2861  
-			<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;" />
  2908
+			<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;" />
2862 2909
 		</exec>
2863 2910
 
2864 2911
 		<exec executable="${plink.executable}">
2865  
-			<arg line="-pw ${vm.password} ${vm.username}@${db.db2.host} cmd.exe /c rmdir /q /s C:\${tstamp.value}" />
  2912
+			<arg line="-pw ${vm.password} ${vm.username}@${db.host} cmd.exe /c rmdir /q /s C:\${tstamp.value}" />
2866 2913
 		</exec>
2867 2914
 
2868 2915
 		<delete file="${sql.file}" />
@@ -2909,9 +2956,9 @@ file.
2909 2956
 				<copy file="${sql.dir}${sql.file}" tofile="${sql.file}" />
2910 2957
 
2911 2958
 				<replace file="${sql.file}">
2912  
-					<replacefilter token="drop database if exists lportal;" value="drop database if exists ${db.mysql.schema};"/>
2913  
-					<replacefilter token="create database lportal character set utf8;" value="create database ${db.mysql.schema} character set utf8;"/>
2914  
-					<replacefilter token="use lportal;" value="use ${db.mysql.schema};"/>
  2959
+					<replacefilter token="drop database if exists lportal;" value="drop database if exists ${db.schema};"/>
  2960
+					<replacefilter token="create database lportal character set utf8;" value="create database ${db.schema} character set utf8;"/>
  2961
+					<replacefilter token="use lportal;" value="use ${db.schema};"/>
2915 2962
 				</replace>
2916 2963
 
2917 2964
 				<exec executable="cmd">
@@ -2953,19 +3000,19 @@ file.
2953 3000
 		</tstamp>
2954 3001
 
2955 3002
 		<exec executable="${plink.executable}">
2956  
-			<arg line="-pw ${vm.password} ${vm.username}@${db.oracle.host} cmd.exe /c mkdir C:\${tstamp.value}" />
  3003
+			<arg line="-pw ${vm.password} ${vm.username}@${db.host} cmd.exe /c mkdir C:\${tstamp.value}" />
2957 3004
 		</exec>
2958 3005
 
2959 3006
 		<exec executable="${pscp.executable}">
2960  
-			<arg line="-pw ${vm.password} ${sql.dir}${sql.file} ${vm.username}@${db.oracle.host}:\${tstamp.value}" />
  3007
+			<arg line="-pw ${vm.password} ${sql.dir}${sql.file} ${vm.username}@${db.host}:\${tstamp.value}" />
2961 3008
 		</exec>
2962 3009
 
2963 3010
 		<exec executable="${plink.executable}">
2964  
-			<arg line="-pw ${vm.password} ${vm.username}@${db.oracle.host} sqlplus system/password @C:\${tstamp.value}\${sql.file} ${db.oracle.username} ${db.oracle.password}" />
  3011
+			<arg line="-pw ${vm.password} ${vm.username}@${db.host} sqlplus system/password @C:\${tstamp.value}\${sql.file} ${db.username} ${db.password}" />
2965 3012
 		</exec>
2966 3013
 
2967 3014
 		<exec executable="${plink.executable}">
2968  
-			<arg line="-pw ${vm.password} ${vm.username}@${db.oracle.host} cmd.exe /c rmdir /q /s C:\${tstamp.value}" />
  3015
+			<arg line="-pw ${vm.password} ${vm.username}@${db.host} cmd.exe /c rmdir /q /s C:\${tstamp.value}" />
2969 3016
 		</exec>
2970 3017
 	</target>
2971 3018
 
@@ -3001,25 +3048,38 @@ file.
3001 3048
 		<copy file="${sql.dir}${sql.file}" tofile="${sql.file}" />
3002 3049
 
3003 3050
 		<replace file="${sql.file}">
3004  
-			<replacefilter token="drop database lportal;" value="drop database ${db.postgresql.schema};"/>
3005  
-			<replacefilter token="create database lportal encoding = 'UNICODE';" value="create database ${db.postgresql.schema} encoding = 'UNICODE';"/>
3006  
-			<replacefilter token="\c lportal;" value="\c ${db.postgresql.schema};"/>
  3051
+			<replacefilter token="drop database lportal;" value="drop database ${db.schema};"/>
  3052
+			<replacefilter token="create database lportal encoding = 'UNICODE';" value="create database ${db.schema} encoding = 'UNICODE';"/>
  3053
+			<replacefilter token="\c lportal;" value="\c ${db.schema};"/>
3007 3054
 		</replace>
3008 3055
 
3009 3056
 		<exec executable="${plink.executable}">
3010  
-			<arg line="-pw ${vm.password} ${vm.username}@${db.postgresql.host} cmd.exe /c mkdir C:\${tstamp.value}" />
  3057
+			<arg line="-pw ${vm.password} ${vm.username}@${db.host} cmd.exe /c mkdir C:\${tstamp.value}" />
3011 3058
 		</exec>
3012 3059
 
3013 3060
 		<exec executable="${pscp.executable}">
3014  
-			<arg line="-pw ${vm.password} ${sql.file} ${vm.username}@${db.postgresql.host}:\${tstamp.value}" />
  3061
+			<arg line="-pw ${vm.password} ${sql.file} ${vm.username}@${db.host}:\${tstamp.value}" />
3015 3062
 		</exec>
3016 3063
 
3017  
-		<exec executable="${plink.executable}">
3018  
-			<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}" />
3019  
-		</exec>
  3064
+		<if>
  3065
+			<equals arg1="${db.type}" arg2="postgresql-8.4" />
  3066
+			<then>
  3067
+				<exec executable="${plink.executable}">
  3068
+					<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}" />
  3069
+				</exec>
  3070
+			</then>
  3071
+			<elseif>
  3072
+				<equals arg1="${db.type}" arg2="postgresql-9.0" />
  3073
+				<then>
  3074
+					<exec executable="${plink.executable}">
  3075
+						<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}" />
  3076
+					</exec>
  3077
+				</then>
  3078
+			</elseif>
  3079
+		</if>
3020 3080
 
3021 3081
 		<exec executable="${plink.executable}">
3022  
-			<arg line="-pw ${vm.password} ${vm.username}@${db.postgresql.host} cmd.exe /c rmdir /q /s C:\${tstamp.value}" />
  3082
+			<arg line="-pw ${vm.password} ${vm.username}@${db.host} cmd.exe /c rmdir /q /s C:\${tstamp.value}" />
3023 3083
 		</exec>
3024 3084
 
3025 3085
 		<delete file="${sql.file}" />
@@ -3057,25 +3117,25 @@ file.
3057 3117
 		<copy file="${sql.dir}${sql.file}" tofile="${sql.file}" />
3058 3118
 
3059 3119
 		<replace file="${sql.file}">
3060  
-			<replacefilter token="drop database lportal;" value="drop database ${db.sql-server.schema};"/>
3061  
-			<replacefilter token="create database lportal;" value="create database ${db.sql-server.schema};"/>
3062  
-			<replacefilter token="use lportal;" value="use ${db.sql-server.schema};"/>
  3120
+			<replacefilter token="drop database lportal;" value="drop database ${db.schema};"/>
  3121
+			<replacefilter token="create database lportal;" value="create database ${db.schema};"/>
  3122
+			<replacefilter token="use lportal;" value="use ${db.schema};"/>
3063 3123
 		</replace>
3064 3124
 
3065 3125
 		<exec executable="${plink.executable}">
3066  
-			<arg line="-pw ${vm.password} ${vm.username}@${db.sql-server.host} cmd.exe /c mkdir C:\${tstamp.value}" />
  3126
+			<arg line="-pw ${vm.password} ${vm.username}@${db.host} cmd.exe /c mkdir C:\${tstamp.value}" />
3067 3127
 		</exec>
3068 3128
 
3069 3129
 		<exec executable="${pscp.executable}">
3070  
-			<arg line="-pw ${vm.password} ${sql.file} ${vm.username}@${db.sql-server.host}:\${tstamp.value}" />
  3130
+			<arg line="-pw ${vm.password} ${sql.file} ${vm.username}@${db.host}:\${tstamp.value}" />
3071 3131
 		</exec>
3072 3132
 
3073 3133
 		<exec executable="${plink.executable}">
3074  
-			<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}" />
  3134
+			<arg line="-pw ${vm.password} ${vm.username}@${db.host} osql -n -U ${db.username} -P ${db.password} -i C:\${tstamp.value}\${sql.file}" />
3075 3135
 		</exec>
3076 3136
 
3077 3137
 		<exec executable="${plink.executable}">
3078  
-			<arg line="-pw ${vm.password} ${vm.username}@${db.sql-server.host} cmd.exe /c rmdir /q /s C:\${tstamp.value}" />
  3138
+			<arg line="-pw ${vm.password} ${vm.username}@${db.host} cmd.exe /c rmdir /q /s C:\${tstamp.value}" />
3079 3139
 		</exec>
3080 3140
 
3081 3141
 		<delete file="${sql.file}" />
@@ -3113,26 +3173,26 @@ file.
3113 3173
 		<copy file="${sql.dir}${sql.file}" tofile="${sql.file}" />
3114 3174
 
3115 3175
 		<replace file="${sql.file}">
3116  
-			<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" />
3117  
-			<replacefilter token="exec sp_dboption 'lportal', 'allow nulls by default' , true" value="exec sp_dboption '${db.sybase.schema}', 'allow nulls by default' , true"/>
3118  
-			<replacefilter token="exec sp_dboption 'lportal', 'select into/bulkcopy/pllsort' , true" value="exec sp_dboption '${db.sybase.schema}', 'select into/bulkcopy/pllsort' , true"/>
3119  
-			<replacefilter token="use lportal" value="use ${db.sybase.schema}${line.separator}go"/>
  3176
+			<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" />
  3177
+			<replacefilter token="exec sp_dboption 'lportal', 'allow nulls by default' , true" value="exec sp_dboption '${db.schema}', 'allow nulls by default' , true"/>
  3178
+			<replacefilter token="exec sp_dboption 'lportal', 'select into/bulkcopy/pllsort' , true" value="exec sp_dboption '${db.schema}', 'select into/bulkcopy/pllsort' , true"/>
  3179
+			<replacefilter token="use lportal" value="use ${db.schema}${line.separator}go"/>
3120 3180
 		</replace>
3121 3181
 
3122 3182
 		<exec executable="${plink.executable}">
3123  
-			<arg line="-pw ${vm.password} ${vm.username}@${db.sybase.host} cmd.exe /c mkdir C:\${tstamp.value}" />
  3183
+			<arg line="-pw ${vm.password} ${vm.username}@${db.host} cmd.exe /c mkdir C:\${tstamp.value}" />
3124 3184
 		</exec>
3125 3185
 
3126 3186
 		<exec executable="${pscp.executable}">
3127  
-			<arg line="-pw ${vm.password} ${sql.file} ${vm.username}@${db.sybase.host}:\${tstamp.value}" />
  3187
+			<arg line="-pw ${vm.password} ${sql.file} ${vm.username}@${db.host}:\${tstamp.value}" />
3128 3188
 		</exec>
3129 3189
 
3130 3190
 		<exec executable="${plink.executable}">
3131  
-			<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}" />
  3191
+			<arg line="-pw ${vm.password} ${vm.username}@${db.host} isql -U ${db.username} -P ${db.password} -i C:\${tstamp.value}\${sql.file}" />
3132 3192
 		</exec>
3133 3193
 
3134 3194
 		<exec executable="${plink.executable}">
3135  
-			<arg line="-pw ${vm.password} ${vm.username}@${db.sybase.host} cmd.exe /c rmdir /q /s C:\${tstamp.value}" />
  3195
+			<arg line="-pw ${vm.password} ${vm.username}@${db.host} cmd.exe /c rmdir /q /s C:\${tstamp.value}" />
3136 3196
 		</exec>
3137 3197
 
3138 3198
 		<delete file="${sql.file}" />
@@ -3223,6 +3283,8 @@ file.
3223 3283
 	<target name="run-simple-server">
3224 3284
 		<antcall target="rebuild-database" inheritAll="false" />
3225 3285
 
  3286
+		<antcall target="copy-optional-jars" inheritAll="false" />
  3287
+
3226 3288
 		<if>
3227 3289
 			<not>
3228 3290
 				<equals arg1="${skip.clean-server-deploy-dir}" arg2="true" />
189  portal-web/test-ant-templates/ant-script-db-upgrade-5.2.3.xml
@@ -102,7 +102,7 @@
102 102
 		</antcall>
103 103
 	</target>
104 104
 
105  
-	<target name="test-${test.ant.script.command}-5.2.3-tomcat-oracle-firefox">
  105
+	<target name="test-${test.ant.script.command}-5.2.3-tomcat-oracle-10-firefox">
106 106
 		<ant antfile="build-dist.xml" target="build-dist-tomcat" />
107 107
 
108 108
 		<antcall target="prepare-vm-server">
@@ -112,7 +112,7 @@
112 112
 			<param name="vm.host" value="${vm.db.host}" />
113 113
 		</antcall>
114 114
 
115  
-		<antcall target="prepare-db-oracle-common">
  115
+		<antcall target="prepare-db-oracle-10-common">
116 116
 			<param name="skip.prepare-bundle" value="true" />
117 117
 			<param name="sql.version" value="5.2.3" />
118 118
 		</antcall>
@@ -127,7 +127,7 @@
127 127
 			<param name="tomcat.folder.dir" value="liferay-portal-5.2.3/tomcat-6.0.18" />
128 128
 		</antcall>
129 129
 
130  
-		<antcall target="prepare-db-oracle-common">
  130
+		<antcall target="prepare-db-oracle-10-common">
131 131
 			<param name="skip.prepare-bundle" value="true" />
132 132
 			<param name="skip.rebuild-database" value="true" />
133 133
 			<param name="sql.version" value="5.2.3" />
@@ -139,7 +139,7 @@
139 139
 			<param name="test.name" value="DBUpgrade${test.ant.script.suite}523LatestConvertTestSuite" />
140 140
 		</antcall>
141 141
 
142  
-		<antcall target="prepare-db-oracle-common">
  142
+		<antcall target="prepare-db-oracle-10-common">
143 143
 			<param name="set.permission.algorithm.6" value="true" />
144 144
 			<param name="skip.prepare-bundle" value="true" />
145 145
 			<param name="skip.rebuild-database" value="true" />
@@ -157,7 +157,62 @@
157 157
 		</antcall>
158 158
 	</target>
159 159
 
160  
-	<target name="test-${test.ant.script.command}-5.2.3-tomcat-postgresql-firefox">
  160
+	<target name="test-${test.ant.script.command}-5.2.3-tomcat-oracle-11-firefox">
  161
+		<ant antfile="build-dist.xml" target="build-dist-tomcat" />
  162
+
  163
+		<antcall target="prepare-vm-server">
  164
+			<param name="build.war" value="false" />
  165
+			<param name="skip.prepare-bundle" value="true" />
  166
+			<param name="vm.vmdk.suffix" value="oracle-11.2.0.1.0" />
  167
+			<param name="vm.host" value="${vm.db.host}" />
  168
+		</antcall>
  169
+
  170
+		<antcall target="prepare-db-oracle-11-common">
  171
+			<param name="skip.prepare-bundle" value="true" />
  172
+			<param name="sql.version" value="5.2.3" />
  173
+		</antcall>
  174
+
  175
+		<antcall target="run-versioned-upgrade-test">
  176
+			<param name="file.name" value="liferay-portal-tomcat-6.0-5.2.3.zip" />
  177
+			<param name="legacy.theme.ids" value="classic,controlpanel" />
  178
+			<param name="lp.version" value="5.2.3" />
  179
+			${test.ant.script.file.evaluate.logs}
  180
+			${test.ant.script.file.plugin.portlets.ee}
  181
+			<param name="test.name" value="DBUpgrade${test.ant.script.suite}523TestSuite" />
  182
+			<param name="tomcat.folder.dir" value="liferay-portal-5.2.3/tomcat-6.0.18" />
  183
+		</antcall>
  184
+
  185
+		<antcall target="prepare-db-oracle-11-common">
  186
+			<param name="skip.prepare-bundle" value="true" />
  187
+			<param name="skip.rebuild-database" value="true" />
  188
+			<param name="sql.version" value="5.2.3" />
  189
+		</antcall>
  190
+
  191
+		<antcall target="run-latest-upgrade-test">
  192
+			${test.ant.script.file.evaluate.logs}
  193
+			${test.ant.script.file.plugin.portlets}
  194
+			<param name="test.name" value="DBUpgrade${test.ant.script.suite}523LatestConvertTestSuite" />
  195
+		</antcall>
  196
+
  197
+		<antcall target="prepare-db-oracle-11-common">
  198
+			<param name="set.permission.algorithm.6" value="true" />
  199
+			<param name="skip.prepare-bundle" value="true" />
  200
+			<param name="skip.rebuild-database" value="true" />
  201
+			<param name="sql.version" value="5.2.3" />
  202
+		</antcall>
  203
+
  204
+		<antcall target="run-latest-upgrade-test">
  205
+			${test.ant.script.file.evaluate.logs}
  206
+			${test.ant.script.file.plugin.portlets}
  207
+			<param name="test.name" value="DBUpgrade${test.ant.script.suite}523LatestTestSuite" />
  208
+		</antcall>
  209
+
  210
+		<antcall target="stop-vm">
  211
+			<param name="vm.host" value="${vm.db.host}" />
  212
+		</antcall>
  213
+	</target>
  214
+
  215
+	<target name="test-${test.ant.script.command}-5.2.3-tomcat-postgresql-8.4-firefox">
161 216
 		<ant antfile="build-dist.xml" target="build-dist-tomcat" />
162 217
 
163 218
 		<antcall target="prepare-vm-server">
@@ -167,7 +222,62 @@
167 222
 			<param name="vm.host" value="${vm.db.host}" />
168 223
 		</antcall>
169 224
 
170  
-		<antcall target="prepare-db-postgresql-common">
  225
+		<antcall target="prepare-db-postgresql-8.4-common">
  226
+			<param name="skip.prepare-bundle" value="true" />
  227
+			<param name="sql.version" value="5.2.3" />
  228
+		</antcall>
  229
+
  230
+		<antcall target="run-versioned-upgrade-test">
  231
+			<param name="file.name" value="liferay-portal-tomcat-6.0-5.2.3.zip" />
  232
+			<param name="legacy.theme.ids" value="classic,controlpanel" />
  233
+			<param name="lp.version" value="5.2.3" />
  234
+			${test.ant.script.file.evaluate.logs}
  235
+			${test.ant.script.file.plugin.portlets.ee}
  236
+			<param name="test.name" value="DBUpgrade${test.ant.script.suite}523TestSuite" />
  237
+			<param name="tomcat.folder.dir" value="liferay-portal-5.2.3/tomcat-6.0.18" />
  238
+		</antcall>
  239
+
  240
+		<antcall target="prepare-db-postgresql-8.4-common">
  241
+			<param name="skip.prepare-bundle" value="true" />
  242
+			<param name="skip.rebuild-database" value="true" />
  243
+			<param name="sql.version" value="5.2.3" />
  244
+		</antcall>
  245
+
  246
+		<antcall target="run-latest-upgrade-test">
  247
+			${test.ant.script.file.evaluate.logs}
  248
+			${test.ant.script.file.plugin.portlets}
  249
+			<param name="test.name" value="DBUpgrade${test.ant.script.suite}523LatestConvertTestSuite" />
  250
+		</antcall>
  251
+
  252
+		<antcall target="prepare-db-postgresql-8.4-common">
  253
+			<param name="set.permission.algorithm.6" value="true" />
  254
+			<param name="skip.prepare-bundle" value="true" />
  255
+			<param name="skip.rebuild-database" value="true" />
  256
+			<param name="sql.version" value="5.2.3" />
  257
+		</antcall>
  258
+
  259
+		<antcall target="run-latest-upgrade-test">
  260
+			${test.ant.script.file.evaluate.logs}
  261
+			${test.ant.script.file.plugin.portlets}
  262
+			<param name="test.name" value="DBUpgrade${test.ant.script.suite}523LatestTestSuite" />
  263
+		</antcall>
  264
+
  265
+		<antcall target="stop-vm">
  266
+			<param name="vm.host" value="${vm.db.host}" />
  267
+		</antcall>
  268
+	</target>
  269
+
  270
+	<target name="test-${test.ant.script.command}-5.2.3-tomcat-postgresql-9.0-firefox">
  271
+		<ant antfile="build-dist.xml" target="build-dist-tomcat" />
  272
+
  273
+		<antcall target="prepare-vm-server">
  274
+			<param name="build.war" value="false" />
  275
+			<param name="skip.prepare-bundle" value="true" />
  276
+			<param name="vm.vmdk.suffix" value="postgresql-9.0.4-1" />
  277
+			<param name="vm.host" value="${vm.db.host}" />
  278
+		</antcall>
  279
+
  280
+		<antcall target="prepare-db-postgresql-9.0-common">
171 281
 			<param name="skip.prepare-bundle" value="true" />
172 282
 			<param name="sql.version" value="5.2.3" />
173 283
 		</antcall>
@@ -182,7 +292,7 @@
182 292
 			<param name="tomcat.folder.dir" value="liferay-portal-5.2.3/tomcat-6.0.18" />
183 293
 		</antcall>
184 294
 
185  
-		<antcall target="prepare-db-postgresql-common">
  295
+		<antcall target="prepare-db-postgresql-9.0-common">
186 296
 			<param name="skip.prepare-bundle" value="true" />
187 297
 			<param name="skip.rebuild-database" value="true" />
188 298
 			<param name="sql.version" value="5.2.3" />
@@ -194,7 +304,7 @@
194 304
 			<param name="test.name" value="DBUpgrade${test.ant.script.suite}523LatestConvertTestSuite" />
195 305
 		</antcall>
196 306
 
197  
-		<antcall target="prepare-db-postgresql-common">
  307
+		<antcall target="prepare-db-postgresql-9.0-common">
198 308
 			<param name="set.permission.algorithm.6" value="true" />
199 309
 			<param name="skip.prepare-bundle" value="true" />
200 310
 			<param name="skip.rebuild-database" value="true" />
@@ -212,7 +322,7 @@
212 322
 		</antcall>
213 323
 	</target>
214 324
 
215  
-	<target name="test-${test.ant.script.command}-5.2.3-tomcat-sql-server-firefox">
  325
+	<target name="test-${test.ant.script.command}-5.2.3-tomcat-sql-server-2005-firefox">
216 326
 		<ant antfile="build-dist.xml" target="build-dist-tomcat" />
217 327
 
218 328
 		<antcall target="prepare-vm-server">
@@ -222,7 +332,62 @@
222 332
 			<param name="vm.host" value="${vm.db.host}" />
223 333
 		</antcall>
224 334
 
225  
-		<antcall target="prepare-db-sql-server-common">
  335
+		<antcall target="prepare-db-sql-server-2005-common">
  336
+			<param name="skip.prepare-bundle" value="true" />
  337
+			<param name="sql.version" value="5.2.3" />
  338
+		</antcall>
  339
+
  340
+		<antcall target="run-versioned-upgrade-test">
  341
+			<param name="file.name" value="liferay-portal-tomcat-6.0-5.2.3.zip" />
  342
+			<param name="legacy.theme.ids" value="classic,controlpanel" />
  343
+			<param name="lp.version" value="5.2.3" />
  344
+			${test.ant.script.file.evaluate.logs}
  345
+			${test.ant.script.file.plugin.portlets.ee}
  346
+			<param name="test.name" value="DBUpgrade${test.ant.script.suite}523TestSuite" />
  347
+			<param name="tomcat.folder.dir" value="liferay-portal-5.2.3/tomcat-6.0.18" />
  348
+		</antcall>
  349
+
  350
+		<antcall target="prepare-db-sql-server-2005-common">
  351
+			<param name="skip.prepare-bundle" value="true" />
  352
+			<param name="skip.rebuild-database" value="true" />
  353
+			<param name="sql.version" value="5.2.3" />
  354
+		</antcall>
  355
+
  356
+		<antcall target="run-latest-upgrade-test">
  357
+			${test.ant.script.file.evaluate.logs}
  358
+			${test.ant.script.file.plugin.portlets}
  359
+			<param name="test.name" value="DBUpgrade${test.ant.script.suite}523LatestConvertTestSuite" />
  360
+		</antcall>
  361
+
  362
+		<antcall target="prepare-db-sql-server-2005-common">
  363
+			<param name="set.permission.algorithm.6" value="true" />
  364
+			<param name="skip.prepare-bundle" value="true" />
  365
+			<param name="skip.rebuild-database" value="true" />
  366
+			<param name="sql.version" value="5.2.3" />
  367
+		</antcall>
  368
+
  369
+		<antcall target="run-latest-upgrade-test">
  370
+			${test.ant.script.file.evaluate.logs}
  371
+			${test.ant.script.file.plugin.portlets}
  372
+			<param name="test.name" value="DBUpgrade${test.ant.script.suite}523LatestTestSuite" />
  373
+		</antcall>
  374
+
  375
+		<antcall target="stop-vm">
  376
+			<param name="vm.host" value="${vm.db.host}" />
  377
+		</antcall>
  378
+	</target>
  379
+
  380
+	<target name="test-${test.ant.script.command}-5.2.3-tomcat-sql-server-2008-firefox">
  381
+		<ant antfile="build-dist.xml" target="build-dist-tomcat" />
  382
+
  383
+		<antcall target="prepare-vm-server">
  384
+			<param name="build.war" value="false" />
  385
+			<param name="skip.prepare-bundle" value="true" />
  386
+			<param name="vm.vmdk.suffix" value="sql-server-2008-r2" />
  387
+			<param name="vm.host" value="${vm.db.host}" />
  388
+		</antcall>
  389
+
  390
+		<antcall target="prepare-db-sql-server-2008-common">
226 391
 			<param name="skip.prepare-bundle" value="true" />
227 392
 			<param name="sql.version" value="5.2.3" />
228 393
 		</antcall>
@@ -237,7 +402,7 @@
237 402
 			<param name="tomcat.folder.dir" value="liferay-portal-5.2.3/tomcat-6.0.18" />
238 403
 		</antcall>
239 404
 
240  
-		<antcall target="prepare-db-sql-server-common">
  405
+		<antcall target="prepare-db-sql-server-2008-common">
241 406
 			<param name="skip.prepare-bundle" value="true" />
242 407
 			<param name="skip.rebuild-database" value="true" />
243 408
 			<param name="sql.version" value="5.2.3" />
@@ -249,7 +414,7 @@
249 414
 			<param name="test.name" value="DBUpgrade${test.ant.script.suite}523LatestConvertTestSuite" />
250 415
 		</antcall>
251 416
 
252  
-		<antcall target="prepare-db-sql-server-common">
  417
+		<antcall target="prepare-db-sql-server-2008-common">
253 418
 			<param name="set.permission.algorithm.6" value="true" />
254 419
 			<param name="skip.prepare-bundle" value="true" />
255 420
 			<param name="skip.rebuild-database" value="true" />
324  portal-web/test-ant-templates/ant-script-db-upgrade-5.2.5.xml
... ...
@@ -1,324 +0,0 @@
1  
-<?xml version="1.0"?>
2  
-
3  
-<project name="portal-test-${test.ant.script.command}-5.2.5" basedir="../../." default="test" xmlns:antelope="antlib:ise.antelope.tasks">
4  
-	<import file="../../build-test-db-upgrade.xml" />
5  
-
6  
-	<target name="test-${test.ant.script.command}-5.2.5-tomcat-db2-firefox">
7  
-		<ant antfile="build-dist.xml" target="build-dist-tomcat" />
8  
-
9  
-		<antcall target="prepare-vm-server">
10  
-			<param name="build.war" value="false" />
11  
-			<param name="skip.prepare-bundle" value="true" />
12  
-			<param name="vm.vmdk.suffix" value="db2-9.7" />
13  
-			<param name="vm.host" value="${vm.db.host}" />
14  
-		</antcall>
15  
-
16  
-		<antcall target="prepare-db-db2-common">
17  
-			<param name="skip.prepare-bundle" value="true" />
18  
-			<param name="sql.version" value="5.2.5" />
19  
-		</antcall>
20  
-
21  
-		<antcall target="run-versioned-upgrade-test">
22  
-			<param name="file.name" value="liferay-portal-tomcat-6.0-5.2-ee-sp1.zip" />
23  
-			<param name="legacy.theme.ids" value="classic,controlpanel" />
24  
-			<param name="lp.version" value="5.2.5" />
25  
-			${test.ant.script.file.evaluate.logs}
26  
-			${test.ant.script.file.plugin.portlets.ee}
27  
-			<param name="test.name" value="DBUpgrade${test.ant.script.suite}525TestSuite" />
28  
-			<param name="tomcat.folder.dir" value="liferay-portal-5.2-ee-sp1/tomcat-6.0.18" />
29  
-		</antcall>
30  
-
31  
-		<antcall target="prepare-db-db2-common">
32  
-			<param name="skip.prepare-bundle" value="true" />
33  
-			<param name="skip.rebuild-database" value="true" />
34  
-			<param name="sql.version" value="5.2.5" />
35  
-		</antcall>
36  
-
37  
-		<antcall target="run-latest-upgrade-test">
38  
-			${test.ant.script.file.evaluate.logs}
39  
-			${test.ant.script.file.plugin.portlets}
40  
-			<param name="test.name" value="DBUpgrade${test.ant.script.suite}525LatestConvertTestSuite" />
41  
-		</antcall>
42  
-
43  
-		<antcall target="prepare-db-db2-common">
44  
-			<param name="set.permission.algorithm.6" value="true" />
45  
-			<param name="skip.prepare-bundle" value="true" />
46  
-			<param name="skip.rebuild-database" value="true" />
47  
-			<param name="sql.version" value="5.2.5" />
48  
-		</antcall>
49  
-
50  
-		<antcall target="run-latest-upgrade-test">
51  
-			${test.ant.script.file.evaluate.logs}
52  
-			${test.ant.script.file.plugin.portlets}
53  
-			<param name="test.name" value="DBUpgrade${test.ant.script.suite}525LatestTestSuite" />
54  
-		</antcall>
55  
-
56  
-		<antcall target="stop-vm">
57  
-			<param name="vm.host" value="${vm.db.host}" />
58  
-		</antcall>
59  
-	</target>
60  
-
61  
-	<target name="test-${test.ant.script.command}-5.2.5-tomcat-mysql-firefox">
62  
-		<ant antfile="build-dist.xml" target="build-dist-tomcat" />
63  
-
64  
-		<antcall target="prepare-db-mysql-common">
65  
-			<param name="skip.prepare-bundle" value="true" />
66  
-			<param name="sql.version" value="5.2.5" />
67  
-		</antcall>
68  
-
69  
-		<antcall target="run-versioned-upgrade-test">
70  
-			<param name="file.name" value="liferay-portal-tomcat-6.0-5.2-ee-sp1.zip" />
71  
-			<param name="legacy.theme.ids" value="classic,controlpanel" />
72  
-			<param name="lp.version" value="5.2.5" />
73  
-			${test.ant.script.file.evaluate.logs}
74  
-			${test.ant.script.file.plugin.portlets.ee}
75  
-			<param name="test.name" value="DBUpgrade${test.ant.script.suite}525TestSuite" />
76  
-			<param name="tomcat.folder.dir" value="liferay-portal-5.2-ee-sp1/tomcat-6.0.18" />
77  
-		</antcall>
78  
-
79  
-		<antcall target="prepare-db-mysql-common">
80  
-			<param name="skip.prepare-bundle" value="true" />
81  
-			<param name="skip.rebuild-database" value="true" />
82  
-			<param name="sql.version" value="5.2.5" />
83  
-		</antcall>
84  
-
85  
-		<antcall target="run-latest-upgrade-test">
86  
-			${test.ant.script.file.evaluate.logs}
87  
-			${test.ant.script.file.plugin.portlets}
88  
-			<param name="test.name" value="DBUpgrade${test.ant.script.suite}525LatestConvertTestSuite" />
89  
-		</antcall>
90  
-
91  
-		<antcall target="prepare-db-mysql-common">
92  
-			<param name="set.permission.algorithm.6" value="true" />
93  
-			<param name="skip.prepare-bundle" value="true" />
94  
-			<param name="skip.rebuild-database" value="true" />
95  
-			<param name="sql.version" value="5.2.5" />
96  
-		</antcall>
97  
-
98  
-		<antcall target="run-latest-upgrade-test">
99  
-			${test.ant.script.file.evaluate.logs}
100  
-			${test.ant.script.file.plugin.portlets}
101  
-			<param name="test.name" value="DBUpgrade${test.ant.script.suite}525LatestTestSuite" />
102  
-		</antcall>
103  
-	</target>
104  
-
105  
-	<target name="test-${test.ant.script.command}-5.2.5-tomcat-oracle-firefox">
106  
-		<ant antfile="build-dist.xml" target="build-dist-tomcat" />
107  
-
108  
-		<antcall target="prepare-vm-server">
109  
-			<param name="build.war" value="false" />
110  
-			<param name="skip.prepare-bundle" value="true" />
111  
-			<param name="vm.vmdk.suffix" value="oracle-10.2.0.1.0" />
112  
-			<param name="vm.host" value="${vm.db.host}" />
113  
-		</antcall>
114  
-
115  
-		<antcall target="prepare-db-oracle-common">
116  
-			<param name="skip.prepare-bundle" value="true" />
117  
-			<param name="sql.version" value="5.2.5" />
118  
-		</antcall>
119  
-
120  
-		<antcall target="run-versioned-upgrade-test">
121  
-			<param name="file.name" value="liferay-portal-tomcat-6.0-5.2-ee-sp1.zip" />
122  
-			<param name="legacy.theme.ids" value="classic,controlpanel" />
123  
-			<param name="lp.version" value="5.2.5" />
124  
-			${test.ant.script.file.evaluate.logs}
125  
-			${test.ant.script.file.plugin.portlets.ee}
126  
-			<param name="test.name" value="DBUpgrade${test.ant.script.suite}525TestSuite" />
127  
-			<param name="tomcat.folder.dir" value="liferay-portal-5.2-ee-sp1/tomcat-6.0.18" />
128  
-		</antcall>
129  
-
130  
-		<antcall target="prepare-db-oracle-common">
131  
-			<param name="skip.prepare-bundle" value="true" />
132  
-			<param name="skip.rebuild-database" value="true" />
133  
-			<param name="sql.version" value="5.2.5" />
134  
-		</antcall>
135  
-
136  
-		<antcall target="run-latest-upgrade-test">
137  
-			${test.ant.script.file.evaluate.logs}
138  
-			${test.ant.script.file.plugin.portlets}
139  
-			<param name="test.name" value="DBUpgrade${test.ant.script.suite}525LatestConvertTestSuite" />
140  
-		</antcall>
141  
-
142  
-		<antcall target="prepare-db-oracle-common">
143  
-			<param name="set.permission.algorithm.6" value="true" />
144  
-			<param name="skip.prepare-bundle" value="true" />
145  
-			<param name="skip.rebuild-database" value="true" />
146  
-			<param name="sql.version" value="5.2.5" />
147  
-		</antcall>
148  
-
149  
-		<antcall target="run-latest-upgrade-test">
150  
-			${test.ant.script.file.evaluate.logs}
151  
-			${test.ant.script.file.plugin.portlets}
152  
-			<param name="test.name" value="DBUpgrade${test.ant.script.suite}525LatestTestSuite" />
153  
-		</antcall>
154  
-
155  
-		<antcall target="stop-vm">
156  
-			<param name="vm.host" value="${vm.db.host}" />
157  
-		</antcall>
158  
-	</target>
159  
-
160  
-	<target name="test-${test.ant.script.command}-5.2.5-tomcat-postgresql-firefox">
161  
-		<ant antfile="build-dist.xml" target="build-dist-tomcat" />
162  
-
163  
-		<antcall target="prepare-vm-server">
164  
-			<param name="build.war" value="false" />
165  
-			<param name="skip.prepare-bundle" value="true" />
166  
-			<param name="vm.vmdk.suffix" value="postgresql-8.4.2-1" />
167  
-			<param name="vm.host" value="${vm.db.host}" />
168  
-		</antcall>
169  
-
170  
-		<antcall target="prepare-db-postgresql-common">
171  
-			<param name="skip.prepare-bundle" value="true" />
172  
-			<param name="sql.version" value="5.2.5" />
173  
-		</antcall>
174  
-
175  
-		<antcall target="run-versioned-upgrade-test">
176  
-			<param name="file.name" value="liferay-portal-tomcat-6.0-5.2-ee-sp1.zip" />
177  
-			<param name="legacy.theme.ids" value="classic,controlpanel" />
178  
-			<param name="lp.version" value="5.2.5" />
179  
-			${test.ant.script.file.evaluate.logs}
180  
-			${test.ant.script.file.plugin.portlets.ee}
181  
-			<param name="test.name" value="DBUpgrade${test.ant.script.suite}525TestSuite" />
182  
-			<param name="tomcat.folder.dir" value="liferay-portal-5.2-ee-sp1/tomcat-6.0.18" />
183  
-		</antcall>
184  
-
185  
-		<antcall target="prepare-db-postgresql-common">
186  
-			<param name="skip.prepare-bundle" value="true" />
187  
-			<param name="skip.rebuild-database" value="true" />
188  
-			<param name="sql.version" value="5.2.5" />
189  
-		</antcall>
190  
-
191  
-		<antcall target="run-latest-upgrade-test">
192  
-			${test.ant.script.file.evaluate.logs}
193  
-			${test.ant.script.file.plugin.portlets}
194  
-			<param name="test.name" value="DBUpgrade${test.ant.script.suite}525LatestConvertTestSuite" />
195  
-		</antcall>
196  
-
197  
-		<antcall target="prepare-db-postgresql-common">
198  
-			<param name="set.permission.algorithm.6" value="true" />
199  
-			<param name="skip.prepare-bundle" value="true" />
200  
-			<param name="skip.rebuild-database" value="true" />
201  
-			<param name="sql.version" value="5.2.5" />
202  
-		</antcall>
203  
-
204  
-		<antcall target="run-latest-upgrade-test">
205  
-			${test.ant.script.file.evaluate.logs}
206  
-			${test.ant.script.file.plugin.portlets}
207  
-			<param name="test.name" value="DBUpgrade${test.ant.script.suite}525LatestTestSuite" />
208  
-		</antcall>
209  
-
210  
-		<antcall target="stop-vm">
211  
-			<param name="vm.host" value="${vm.db.host}" />
212  
-		</antcall>
213  
-	</target>
214  
-
215  
-	<target name="test-${test.ant.script.command}-5.2.5-tomcat-sql-server-firefox">
216  
-		<ant antfile="build-dist.xml" target="build-dist-tomcat" />
217  
-
218  
-		<antcall target="prepare-vm-server">
219  
-			<param name="build.war" value="false" />
220  
-			<param name="skip.prepare-bundle" value="true" />
221  
-			<param name="vm.vmdk.suffix" value="sql-server-2005-sp2" />
222  
-			<param name="vm.host" value="${vm.db.host}" />
223  
-		</antcall>
224  
-
225  
-		<antcall target="prepare-db-sql-server-common">
226  
-			<param name="skip.prepare-bundle" value="true" />
227  
-			<param name="sql.version" value="5.2.5" />
228  
-		</antcall>
229  
-
230  
-		<antcall target="run-versioned-upgrade-test">
231  
-			<param name="file.name" value="liferay-portal-tomcat-6.0-5.2-ee-sp1.zip" />
232  
-			<param name="legacy.theme.ids" value="classic,controlpanel" />
233  
-			<param name="lp.version" value="5.2.5" />
234  
-			${test.ant.script.file.evaluate.logs}
235  
-			${test.ant.script.file.plugin.portlets.ee}
236  
-			<param name="test.name" value="DBUpgrade${test.ant.script.suite}525TestSuite" />
237  
-			<param name="tomcat.folder.dir" value="liferay-portal-5.2-ee-sp1/tomcat-6.0.18" />
238  
-		</antcall>
239  
-
240  
-		<antcall target="prepare-db-sql-server-common">
241  
-			<param name="skip.prepare-bundle" value="true" />
242  
-			<param name="skip.rebuild-database" value="true" />
243  
-			<param name="sql.version" value="5.2.5" />
244  
-		</antcall>
245  
-