LPS-19839

xieh · Aug 10, 2011 · eb9270d · eb9270d
1 parent 2b46beb
commit eb9270d
Show file tree

Hide file tree

Showing 4 changed files with 101 additions and 2 deletions.
diff --git a/build-test-plugins.xml b/build-test-plugins.xml
@@ -60,6 +60,30 @@ plugins.includes=${plugins.includes}</echo>
 		</if>
 	</target>
 
+	<target name="deploy-weblogic-10.3-plugins">
+		<exec dir="${lp.plugins.dir}" executable="cmd.exe">
+			<arg line="/c svn --username ${svn.username} --password ${svn.password} update" />
+		</exec>
+
+		<echo file="${lp.plugins.dir}/build.${user.name}.properties">app.server.dir=${app.server.tomcat.dir}
+app.server.lib.global.dir=${app.server.tomcat.lib.global.dir}
+app.server.portal.dir=${app.server.tomcat.portal.dir}
+
+plugins.includes=${plugins.includes}</echo>
+
+		<ant dir="${lp.plugins.dir}/${plugin.types}" inheritAll="false">
+			<target name="clean" />
+			<target name="war" />
+		</ant>
+
+		<exec executable="${pscp.executable}">
+			<arg line="-pw ${vm.password} ${lp.plugins.dir}\dist\*.war ${vm.username}@${vm.host}:/oracle/middleware/user_projects/domains/deploy" />
+		</exec>
+
+		<delete dir="${lp.plugins.dir}/dist" />
+		<mkdir dir="${lp.plugins.dir}/dist" />
+	</target>
+
 	<target name="test-create">
 		<echo file="${lp.plugins.dir}/build.${user.name}.properties">app.server.dir=${app.server.tomcat.dir}</echo>
 

diff --git a/build-test-weblogic-10.3.xml b/build-test-weblogic-10.3.xml
@@ -111,6 +111,77 @@
 			value="${vm.host}:7001"
 		/>
 
+		<if>
+			<isset property="hook.plugins.includes" />
+			<then>
+				<ant antfile="build-test-plugins.xml" target="deploy-weblogic-10.3-plugins">
+					<property name="plugin.types" value="hooks" />
+					<property name="plugins.deployed" value="${plugins.deployed}" />
+					<property name="plugins.includes" value="${hook.plugins.includes}" />
+				</ant>
+
+				<property name="plugins.deployed" value="true" />
+			</then>
+		</if>
+
+		<if>
+			<isset property="plugins.version.includes" />
+			<then>
+				<ant antfile="build-test-plugins.xml" target="deploy-versioned-weblogic-10.3-plugins">
+					<property name="plugins.includes" value="${plugins.version.includes}" />
+				</ant>
+			</then>
+		</if>
+
+		<if>
+			<isset property="portlet.plugins.includes" />
+			<then>
+				<ant antfile="build-test-plugins.xml" target="deploy-weblogic-10.3-plugins">
+					<property name="plugin.types" value="portlets" />
+					<property name="plugins.deployed" value="${plugins.deployed}" />
+					<property name="plugins.includes" value="${portlet.plugins.includes}" />
+				</ant>
+
+				<property name="plugins.deployed" value="true" />
+			</then>
+		</if>
+
+		<if>
+			<isset property="portlet.plugins.upgrade.includes" />
+			<then>
+				<ant antfile="build-test-plugins.xml" target="deploy-upgrade-weblogic-10.3-plugins">
+					<property name="plugin.types" value="portlets" />
+					<property name="plugins.includes" value="${portlet.plugins.upgrade.includes}" />
+				</ant>
+			</then>
+		</if>
+
+		<if>
+			<isset property="theme.plugins.includes" />
+			<then>
+				<ant antfile="build-test-plugins.xml" target="deploy-weblogic-10.3-plugins">
+					<property name="plugin.types" value="themes" />
+					<property name="plugins.deployed" value="${plugins.deployed}" />
+					<property name="plugins.includes" value="${theme.plugins.includes}" />
+				</ant>
+
+				<property name="plugins.deployed" value="true" />
+			</then>
+		</if>
+
+		<if>
+			<isset property="web.plugins.includes" />
+			<then>
+				<ant antfile="build-test-plugins.xml" target="deploy-weblogic-10.3-plugins">
+					<property name="plugin.types" value="webs" />
+					<property name="plugins.deployed" value="${plugins.deployed}" />
+					<property name="plugins.includes" value="${web.plugins.includes}" />
+				</ant>
+
+				<property name="plugins.deployed" value="true" />
+			</then>
+		</if>
+
 		<antcall target="start-selenium" />
 
 		<antcall target="run-weblogic-10.3">

diff --git a/build-test.xml b/build-test.xml
@@ -206,7 +206,7 @@
 	</target>
 
 	<target name="build-test-ant-scripts">
-		<property name="build-test-ant-scripts.version" value="5" />
+		<property name="build-test-ant-scripts.version" value="6" />
 
 		<if>
 			<available file="portal-web/test-ant-scripts/version" />
@@ -1140,7 +1140,6 @@
 			<param name="test.ant.script.suite" value="PluginsVimeoTestSuite" />
 		</antcall>
 
-
 		<antcall target="build-test-ant-script">
 			<param name="test.ant.script.command" value="plugins-weather" />
 			<param name="test.ant.script.plugin.portlets" value="weather-portlet" />

diff --git a/portal-web/test-ant-templates/ant-script.xml b/portal-web/test-ant-templates/ant-script.xml
@@ -133,6 +133,7 @@
 			${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.host.db}" />
 		</antcall>
@@ -219,6 +220,10 @@
 		</antcall>
 
 		<ant antfile="build-test-weblogic-10.3.xml" target="run-selenium-weblogic-10.3">
+			${test.ant.script.file.plugin.hooks}
+			${test.ant.script.file.plugin.portlets}
+			${test.ant.script.file.plugin.themes}
+			${test.ant.script.file.plugin.webs}
 			<property name="test.name" value="${test.ant.script.suite}" />
 		</ant>
 	</target>