LDEV-5267 unbundle EHCache extension

https://luceeserver.atlassian.net/browse/LDEV-5267
zspitzer · Jan 21, 2025 · 659b312 · 659b312
1 parent c7c5447
commit 659b312
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 22 deletions.
diff --git a/ant/build-core.xml b/ant/build-core.xml
@@ -24,6 +24,7 @@
   <property name="extChart"          value="D46B46A9-A0E3-44E1-D972A04AC3A8DC10;version=1.0.19.24"/>
   <property name="extRedis"          value="60772C12-F179-D555-8E2CD2B4F7428718;version=3.0.0.54-SNAPSHOT"/>
   <property name="extHibernate"          value="FAD1E8CB-4F45-4184-86359145767C29DE;version=5.4.29.27-BETA"/>
+  <property name="extEHCache"          value="87FE44E5-179C-43A3-A87B3D38BEF4652E;version=2.10.0.37"/>
 
   <property name="stableLoader" value="lucee-5.3.7.48"/>
   <property name="javaVersionCoreDefault" value="11"/>
@@ -135,9 +136,6 @@
         <!-- S3 -->
         <not><isset property="extS3"/></not>
         <not><isset property="extS3Version"/></not>
-        <!-- EHCache -->
-        <not><isset property="extEHCache"/></not>
-        <not><isset property="extEHCacheVersion"/></not>
         <!-- MySQL -->
         <not><isset property="extMySQL"/></not>
         <not><isset property="extMySQLVersion"/></not>
@@ -248,7 +246,7 @@
         </sequential>
     </macrodef>
 
-    <target name="check" depends="check-mysql,check-mssql,check-postgre,check-jdts,check-s3,check-ehcache,check-pdf,check-admin,check-doc,check-image,check-esapi,check-compress,check-testbox,check-lucee-loader-jar,download-lucee-loader-jar">
+    <target name="check" depends="check-mysql,check-mssql,check-postgre,check-jdts,check-s3,check-pdf,check-admin,check-doc,check-image,check-esapi,check-compress,check-testbox,check-lucee-loader-jar,download-lucee-loader-jar">
       <mkdir dir="${temp}/loader/extensions/"/>
     </target> 
 
@@ -635,7 +633,7 @@
       <jvmarg value="-Dlucee.base.dir=${temp}/archive/base"/>
       <jvmarg value="-Dlucee.web.dir=${temp}/archive/webroot"/>
       <!-- TODO remove axis, lucene -->
-      <jvmarg value="-Dlucee-extensions=${extH2},${extMongo},${extOracle},${extLucene},${extAxis},${extChart},${extRedis},${extHibernate}"/>
+      <jvmarg value="-Dlucee-extensions=${extH2},${extMongo},${extOracle},${extLucene},${extAxis},${extChart},${extRedis},${extHibernate},{extEHCache}"/>
       <jvmarg value="-Dlucee.enable.dialect=true"/>
       <jvmarg value="-Dlucee.extensions.install=true"/>
       <jvmarg value="-Dlucee.full.null.support=false"/>

diff --git a/ant/build-extensions.xml b/ant/build-extensions.xml
@@ -149,7 +149,6 @@
 		<available file="${cache}/${extPostgreSQL}-${extPostgreSQLVersion}.lex" property="postgre.present"/>
 		<available file="${cache}/${extJDTsSQL}-${extJDTsSQLVersion}.lex" property="jdts.present"/>
 		<available file="${cache}/${extS3}-${extS3Version}.lex" property="s3.present"/>
-		<available file="${cache}/${extEHCache}-${extEHCacheVersion}.lex" property="ehcache.present"/>
 		<available file="${cache}/${extAdmin}-${extAdminVersion}.lex" property="admin.present"/>
 		<available file="${cache}/${extDoc}-${extDocVersion}.lex" property="doc.present"/>
 		<available file="${cache}/${extPDF}-${extPDFVersion}.lex" property="pdf.present"/>
@@ -173,9 +172,6 @@
 	<target name="check-s3" depends="check-cache" unless="s3.present">
 		<get src="${extURL}${extS3}?version=${extS3Version}" dest="${cache}/${extS3}-${extS3Version}.lex"/>
 	</target>
-	<target name="check-ehcache" depends="check-cache" unless="ehcache.present">
-		<get src="${extURL}${extEHCache}?version=${extEHCacheVersion}" dest="${cache}/${extEHCache}-${extEHCacheVersion}.lex"/>
-	</target>
 	<target name="check-pdf" depends="check-cache" unless="pdf.present">
 		<get src="${extURL}${extPDF}?version=${extPDFVersion}" dest="${cache}/${extPDF}-${extPDFVersion}.lex"/>
 	</target>
@@ -262,18 +258,6 @@
 			tofile="${goal}/extensions/${ext_s3.filename}"/>
 		<echo level="info">add:${goal}/extensions/${ext_s3.filename}</echo>
 		<echo file="${goal}/extensions/.index" append="true">${ext_s3.filename};</echo>
-
-		<!-- add extension EHCache -->
-		<loadmf jar="${cache}/${extEHCache}-${extEHCacheVersion}.lex" prefix="ext_ehcache."/>
-		<toFileName id="${ext_ehcache.id}" name="${ext_ehcache.name}" version="${ext_ehcache.version}" property="ext_ehcache.filename"/>
-		<copy 
-			file="${cache}/${extEHCache}-${extEHCacheVersion}.lex" 
-			todir="${goal}/extensions/"/>
-		<move 
-			file="${goal}/extensions/${extEHCache}-${extEHCacheVersion}.lex" 
-			tofile="${goal}/extensions/${ext_ehcache.filename}"/>
-		<echo level="info">add:${goal}/extensions/${ext_ehcache.filename}</echo>
-		<echo file="${goal}/extensions/.index" append="true">${ext_ehcache.filename};</echo>
 
 		<!-- add extension PDF -->
 		<loadmf jar="${cache}/${extPDF}-${extPDFVersion}.lex" prefix="ext_pdf."/>

diff --git a/core/src/main/java/META-INF/MANIFEST.MF b/core/src/main/java/META-INF/MANIFEST.MF
@@ -368,7 +368,6 @@ Require-Extension: 7E673D15-D87C-41A6-8B5F1956528C605F;name=MySQL;label=MySQL;ve
  CED6227E-0F49-6367-A68D21AACA6B07E8;name=Admin;label=Lucee Administrator;version=1.0.0.5,
  D46D49C3-EB85-8D97-30BEC2F38561E985;name=Doc;label=Lucee Documentation;version=1.0.0.4,
  17AB52DE-B300-A94B-E058BD978511E39E;name=S3;label=S3;version=2.0.2.19,
- 87FE44E5-179C-43A3-A87B3D38BEF4652E;name=EHCache;label=EHCache;version=2.10.0.36,
  66E312DD-D083-27C0-64189D16753FD6F0;name=PDF;label=PDF;version=1.2.0.10,
  B737ABC4-D43F-4D91-8E8E973E37C40D1B;name=Image;label=Image;version=2.0.0.26;since=5.3.0.35-ALPHA,
  37C61C0A-5D7E-4256-8572639BE0CF5838;name=Esapi;label=ESAPI;version=2.2.4.17-SNAPSHOT;since=5.3.0.37-ALPHA,