Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

LDEV-5267 unbundle EHCache extension #2481

Open
wants to merge 3 commits into
base: 6.2
Choose a base branch
from
Open

LDEV-5267 unbundle EHCache extension #2481

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
659b312
LDEV-5267 unbundle EHCache extension
zspitzer Jan 21, 2025
3975c4d
Update build-core.xml
zspitzer Jan 21, 2025
96edac0
Update build-core.xml
zspitzer Jan 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 11 additions & 13 deletions ant/build-core.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,15 @@
value="https://downloads.ortussolutions.com/ortussolutions/testbox/${testboxVersion}/testbox-${testboxVersion}.zip"/>
<property name="extURL" value="https://extension.lucee.org/rest/extension/provider/full/"/>

<property name="extMongo" value="E6634E1A-4CC5-4839-A83C67549ECA8D5B"/>
<property name="extH2" value="465E1E35-2425-4F4E-8B3FAB638BD7280A;version=2.1.214.0001L"/>
<property name="extOracle" value="D4EDFDBD-A9A3-E9AF-597322D767E0C949;version=19.12.0.0-ojdbc8"/>
<property name="extLucene" value="EFDEB172-F52E-4D84-9CD1A1F561B3DFC8;version=2.4.2.4"/>
<property name="extAxis" value="DF28D0A4-6748-44B9-A2FDC12E4E2E4D38;version=1.4.0.38-SNAPSHOT"/>
<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="extMongo" value="E6634E1A-4CC5-4839-A83C67549ECA8D5B"/>
<property name="extH2" value="465E1E35-2425-4F4E-8B3FAB638BD7280A;version=2.1.214.0001L"/>
<property name="extOracle" value="D4EDFDBD-A9A3-E9AF-597322D767E0C949;version=19.12.0.0-ojdbc8"/>
<property name="extLucene" value="EFDEB172-F52E-4D84-9CD1A1F561B3DFC8;version=2.4.2.4"/>
<property name="extAxis" value="DF28D0A4-6748-44B9-A2FDC12E4E2E4D38;version=1.4.0.38-SNAPSHOT"/>
<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-SNAPSHOT"/>

<property name="stableLoader" value="lucee-5.3.7.48"/>
<property name="javaVersionCoreDefault" value="11"/>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>

Expand Down Expand Up @@ -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"/>
Expand Down
16 changes: 0 additions & 16 deletions ant/build-extensions.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"/>
Expand All @@ -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>
Expand Down Expand Up @@ -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."/>
Expand Down
1 change: 0 additions & 1 deletion core/src/main/java/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Loading