From 1761140fc45ff123c65d85cf3bfe92e9747f8d69 Mon Sep 17 00:00:00 2001
From: shuyangzhou <shuyang.zhou@liferay.com>
Date: Tue, 15 Jun 2021 20:47:56 -0700
Subject: [PATCH] LPS-134421 Turn off websphere jsp precompile

---
 build-test.xml                             | 24 ++++------------------
 build.xml                                  | 11 ++++------
 portal-web/docroot/WEB-INF/ibm-web-ext.xmi |  6 ------
 portal-web/docroot/WEB-INF/ibm-web-ext.xml |  8 ++++++++
 4 files changed, 16 insertions(+), 33 deletions(-)
 delete mode 100644 portal-web/docroot/WEB-INF/ibm-web-ext.xmi
 create mode 100644 portal-web/docroot/WEB-INF/ibm-web-ext.xml

diff --git a/build-test.xml b/build-test.xml
index aeac17f7e4f8aa..0bf46f22a95b3c 100644
--- a/build-test.xml
+++ b/build-test.xml
@@ -11548,26 +11548,10 @@ ANT_OPTS=${env.ANT_OPTS}</echo>
 							todir="${app.server.websphere.java.ext.dir}"
 						/>
 
-						<if>
-							<available file="${app.server.portal.dir}/WEB-INF/ibm-web-ext.xml" />
-							<then>
-								<replace
-									file="${app.server.portal.dir}/WEB-INF/ibm-web-ext.xml"
-								>
-									<replacetoken><![CDATA[</web-ext>]]></replacetoken>
-									<replacevalue><![CDATA[  <jsp-attribute name="jdkSourceLevel" value="18" />
-</web-ext>]]></replacevalue>
-								</replace>
-
-								<replace
-									file="${app.server.websphere.instance.dir}/config/cells/liferay-cell/applications/liferay-portal.ear/deployments/liferay-portal/liferay-portal.war/WEB-INF/ibm-web-ext.xml"
-								>
-									<replacetoken><![CDATA[</web-ext>]]></replacetoken>
-									<replacevalue><![CDATA[  <jsp-attribute name="jdkSourceLevel" value="18" />
-</web-ext>]]></replacevalue>
-								</replace>
-							</then>
-						</if>
+						<copy
+							file="${app.server.portal.dir}/WEB-INF/ibm-web-ext.xml"
+							tofile="${app.server.websphere.instance.dir}/config/cells/liferay-cell/applications/liferay-portal.ear/deployments/liferay-portal/liferay-portal.war/WEB-INF/ibm-web-ext.xml"
+						/>
 					</then>
 				</if>
 
diff --git a/build.xml b/build.xml
index 93ee3c932e6e85..61a3b4f78b6b8f 100644
--- a/build.xml
+++ b/build.xml
@@ -313,13 +313,10 @@ message.
 		<if>
 			<equals arg1="${app.server.type}" arg2="websphere" />
 			<then>
-				<replace
-					file="${app.server.websphere.instance.dir}/config/cells/liferay-cell/applications/liferay-portal.ear/deployments/liferay-portal/liferay-portal.war/WEB-INF/ibm-web-ext.xml"
-				>
-					<replacetoken><![CDATA[</web-ext>]]></replacetoken>
-					<replacevalue><![CDATA[  <jsp-attribute name="jdkSourceLevel" value="18" />
-</web-ext>]]></replacevalue>
-				</replace>
+				<copy
+					file="${app.server.portal.dir}/WEB-INF/ibm-web-ext.xml"
+					tofile="${app.server.websphere.instance.dir}/config/cells/liferay-cell/applications/liferay-portal.ear/deployments/liferay-portal/liferay-portal.war/WEB-INF/ibm-web-ext.xml"
+				/>
 			</then>
 		</if>
 
diff --git a/portal-web/docroot/WEB-INF/ibm-web-ext.xmi b/portal-web/docroot/WEB-INF/ibm-web-ext.xmi
deleted file mode 100644
index b2835abc98f7ba..00000000000000
--- a/portal-web/docroot/WEB-INF/ibm-web-ext.xmi
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<webappext:WebAppExtension xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:webappext="webappext.xmi" xmi:id="WebAppExtension_1210060997332" reloadInterval="3" reloadingEnabled="true" additionalClassPath="" fileServingEnabled="true" directoryBrowsingEnabled="false" serveServletsByClassnameEnabled="false">
-	<webApp href="WEB-INF/web.xml#Liferay_Portal" />
-	<jspAttributes xmi:id="JSPAttribute_5" name="jdkSourceLevel" value="16" />
-</webappext:WebAppExtension>
\ No newline at end of file
diff --git a/portal-web/docroot/WEB-INF/ibm-web-ext.xml b/portal-web/docroot/WEB-INF/ibm-web-ext.xml
new file mode 100644
index 00000000000000..e83ac9172d6eba
--- /dev/null
+++ b/portal-web/docroot/WEB-INF/ibm-web-ext.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+
+<web-ext version="1.0" xmlns="http://websphere.ibm.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://websphere.ibm.com/xml/ns/javaee http://websphere.ibm.com/xml/ns/javaee/ibm-web-ext_1_0.xsd">
+	<enable-reloading value="false" />
+	<jsp-attribute name="reloadEnabled" value="false" />
+	<jsp-attribute name="disableJspRuntimeCompilation" value="true" />
+	<pre-compile-jsps value="false" />
+</web-ext>
\ No newline at end of file