Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion ant/build-core.xml
Original file line number Diff line number Diff line change
Expand Up @@ -756,7 +756,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},${extEHCache},${extJtds},${extFtp}"/>
<jvmarg value="-Dlucee-extensions=${extH2},${extMongo},${extOracle},${extLucene},${extAxis},${extChart},${extRedis},${extEHCache},${extJtds},${extFtp}"/>
<jvmarg value="-Dlucee.enable.dialect=true"/>
<jvmarg value="-Dlucee.extensions.install=true"/>
<jvmarg value="-Dlucee.full.null.support=false"/>
Expand Down
12 changes: 0 additions & 12 deletions core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -205,12 +205,6 @@
<version>1.0.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.lucee</groupId>
<artifactId>xml-apis</artifactId>
<version>1.4.1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.lucee</groupId>
<artifactId>jta</artifactId>
Expand Down Expand Up @@ -326,12 +320,6 @@
<version>1.2.1.0002L</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>w3c</groupId>
<artifactId>dom</artifactId>
<version>1.1.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>net.java.dev.jna</groupId>
<artifactId>jna</artifactId>
Expand Down
2 changes: 0 additions & 2 deletions core/src/main/java/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,6 @@ Require-Bundle: org.apache.commons.commons-codec;bundle-version=1.15.0,
org.lucee.log4j-core;bundle-version=2.25.1,
org.lucee.log4j-api;bundle-version=2.25.1,
org.lucee.portlet;bundle-version=1.0.0,
org.lucee.xml.apis;bundle-version=1.4.1,
org.lucee.jta;bundle-version=1.1.0,
fusiondebug.api.server;bundle-version=1.0.20,
org.lucee.httpcomponents.httpclient;bundle-version=4.5.13,
Expand All @@ -351,7 +350,6 @@ Require-Bundle: org.apache.commons.commons-codec;bundle-version=1.15.0,
slf4j.api;bundle-version=1.7.36,
org.lucee.commons-email-all;bundle-version=1.6.0,
tagsoup;bundle-version=1.2.1.0002L,
w3c.dom;bundle-version=1.1.0,
org.lucee.jzlib;bundle-version=1.1.3,
com.sun.jna;bundle-version=5.13.0,
org.lucee.commonmark;bundle-version=0.22.0,
Expand Down
82 changes: 47 additions & 35 deletions core/src/main/java/default.properties
Original file line number Diff line number Diff line change
@@ -1,10 +1,36 @@
# OSGi settings
# ==============================================================================
# Lucee OSGi Framework Configuration (Apache Felix)
# ==============================================================================
#
# Boot Delegation: Packages delegated directly to the parent classloader,
# bypassing OSGi resolution. Required for JDK internals and Lucee core.
#
# System Packages: Felix 7.x auto-detects java.*/javax.* packages via JPMS
# for packages that are part of the JDK. We use system.packages.extra for:
# - Lucee-specific packages (coldfusion.*, com.allaire.*)
# - Java EE/Jakarta EE packages not in the JDK (servlet, ejb, jms, etc.)
# - JDK internal packages that may be needed (com.sun.*, sun.*)
#
# ==============================================================================

# Felix runtime settings
felix.log.level=error
felix.cache.locking=false
felix.cache.bufsize=65536
org.osgi.framework.storage.clean=none
org.osgi.framework.bundle.parent=framework

# ==============================================================================
# Boot Delegation
# ==============================================================================
# Classes in these packages load directly from the parent classloader.
# This is necessary for:
# - JDK internal classes (java.*, sun.*, com.sun.*, jdk.*)
# - Servlet container classes (javax.servlet.*, jakarta.servlet.*)
# - Lucee core classes needed before OSGi initializes
# - Felix framework itself
# ==============================================================================

org.osgi.framework.bootdelegation= \
coldfusion.xml.rpc,\
\
Expand Down Expand Up @@ -71,8 +97,24 @@ org.osgi.framework.bootdelegation= \
\
sun.*,sun.misc

# necessary only for the maven build, no clue why atm
org.osgi.framework.system.packages= \
# ==============================================================================
# System Packages Extra
# ==============================================================================
# Additional packages exported by the system bundle.
#
# NOTE: Felix 7.x auto-detects all java.*/javax.* packages that are part of
# the JDK via JPMS reflection at runtime. We do NOT override
# org.osgi.framework.system.packages - this allows Felix to automatically
# include all JDK packages for the running JVM.
#
# This section includes:
# - Lucee-specific packages (coldfusion.*, com.allaire.*)
# - Java EE/Jakarta EE packages removed from JDK in Java 11
# - JDK internal packages (com.sun.*, sun.*) that bundles may import
# - OSGi framework packages
# ==============================================================================

org.osgi.framework.system.packages.extra= \
coldfusion.xml.rpc,\
com.allaire.cfx,\
\
Expand All @@ -85,8 +127,8 @@ org.osgi.framework.system.packages= \
com.sun.msv.datatype,com.sun.msv.datatype.xsd,\
com.sun.net.ssl,com.sun.net.ssl.internal.ssl,\
\
jakarta.el,\
jakarta.ejb,\
jakarta.el,\
jakarta.enterprise.context,jakarta.enterprise.inject,\
jakarta.inject,\
jakarta.script,\
Expand All @@ -98,52 +140,22 @@ org.osgi.framework.system.packages= \
jakarta.validation,\
jakarta.xml.bind,jakarta.xml.bind.annotation,jakarta.xml.bind.annotation.adapters,jakarta.xml.bind.helpers,\
\
java.io,\
java.lang,\
java.lang.invoke,\
java.nio.charset,\
java.nio.file,\
java.text,\
java.util,\
java.util.concurrent.atomic,\
java.util.function,\
java.util.regex,\
\
javax.accessibility,\
javax.annotation,javax.annotation.processing,\
javax.crypto,javax.crypto.interfaces,javax.crypto.spec,\
javax.ejb,\
javax.el,\
javax.enterprise.context,javax.enterprise.inject,\
javax.imageio,javax.imageio.event,javax.imageio.metadata,javax.imageio.plugins.bmp,javax.imageio.plugins.jpeg,javax.imageio.plugins.tiff,javax.imageio.spi,javax.imageio.stream,\
javax.inject,\
javax.jmdns,\
javax.jms,\
javax.lang.model,javax.lang.model.element,javax.lang.model.type,javax.lang.model.util,\
javax.management,javax.management.loading,javax.management.openmbean,javax.management.timer,\
javax.naming,javax.naming.directory,javax.naming.event,javax.naming.ldap,javax.naming.spi,\
javax.net,javax.net.ssl,\
javax.print,javax.print.attribute,\
javax.resource,javax.resource.spi,javax.resource.spi.endpoint,javax.resource.spi.security,\
javax.script,\
javax.security.auth,javax.security.auth.callback,javax.security.auth.kerberos,javax.security.auth.login,javax.security.auth.x500,\
javax.security.cert,\
javax.security.sasl,\
javax.servlet,javax.servlet.http,javax.servlet.jsp,javax.servlet.jsp.el,javax.servlet.jsp.tagext,\
javax.sql,javax.sql.rowset,javax.sql.rowset.spi,\
javax.swing,javax.swing.border,javax.swing.event,javax.swing.filechooser,javax.swing.plaf,javax.swing.plaf.basic,javax.swing.plaf.metal,javax.swing.table,javax.swing.text,javax.swing.text.html,javax.swing.tree,\
javax.tools,\
javax.transaction,\
javax.validation,\
javax.xml.bind,javax.xml.bind.annotation,javax.xml.bind.annotation.adapters,javax.xml.bind.helpers,\
javax.xml.crypto,javax.xml.crypto.dom,javax.xml.crypto.dsig,javax.xml.crypto.dsig.dom,javax.xml.crypto.dsig.keyinfo,javax.xml.crypto.dsig.spec,\
\
org.apache.felix,org.apache.felix.framework,\
org.ietf.jgss,\
org.osgi.framework,\
\
sun.awt.image.codec,\
sun.io,\
sun.misc,\
sun.nio.cs,\
sun.security.x509
sun.security.x509
12 changes: 0 additions & 12 deletions loader/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -502,12 +502,6 @@
<artifactId>portlet</artifactId>
<version>1.0.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.lucee</groupId>
<artifactId>xml-apis</artifactId>
<version>1.4.1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.lucee</groupId>
Expand Down Expand Up @@ -617,12 +611,6 @@
<version>1.2.1.0002L</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>w3c</groupId>
<artifactId>dom</artifactId>
<version>1.1.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.websocket</groupId>
<artifactId>javax.websocket-api</artifactId>
Expand Down