LRQA-84469 Update build-test-oauth2.xml to search in global dependenc…

…y folder too
shuyangzhou · Nov 23, 2023 · a9614da · a9614da
1 parent d8af5eb
commit a9614da
Showing 1 changed file with 24 additions and 5 deletions.
diff --git a/build-test-oauth2.xml b/build-test-oauth2.xml
@@ -4,7 +4,15 @@
 	<import file="build-test.xml" />
 
 	<target name="prepare-oauth2-osgi-configuration">
-		<property name="osgi.dependency.dir" value="${project.dir}/portal-web/test/functional/com/liferay/portalweb/dependencies" />
+		<if>
+			<available file="${project.dir}/portal-web/test/functional/com/liferay/portalweb/tests/coreinfrastructure/security/oauth2/dependencies/${osgi.config.file.name}" />
+			<then>
+				<property name="osgi.dependency.dir" value="${project.dir}/portal-web/test/functional/com/liferay/portalweb/tests/coreinfrastructure/security/oauth2/dependencies" />
+			</then>
+			<else>
+				<property name="osgi.dependency.dir" value="${project.dir}/portal-web/test/functional/com/liferay/portalweb/dependencies" />
+			</else>
+		</if>
 
 		<copy
 			file="${osgi.dependency.dir}/${osgi.config.file.name}"
@@ -17,10 +25,21 @@
 			value="companyId=L&quot;${companyId}&quot;"
 		/>
 
-		<move
-			file="${liferay.home}/${osgi.config.file.name}"
-			todir="${liferay.home}/osgi/configs"
-		/>
+		<if>
+			<isset property="bundle.id" />
+			<then>
+				<move
+					file="${liferay.home}/${osgi.config.file.name}"
+					todir="${liferay.home}-${bundle.id}/osgi/configs"
+				/>
+			</then>
+			<else>
+				<move
+					file="${liferay.home}/${osgi.config.file.name}"
+					todir="${liferay.home}/osgi/configs"
+				/>
+			</else>
+		</if>
 	</target>
 
 	<target depends="setup-yarn" name="start-oauth2-application">