LPS-134421 Turn off websphere jsp precompile

JorgeFerrer · Jun 21, 2021 · 1761140 · 1761140
1 parent 95739ec
commit 1761140
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 33 deletions.
diff --git 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
@@ -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
diff --git a/portal-web/docroot/WEB-INF/ibm-web-ext.xml 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>