LDEV-6165 skip OSGi Export-Package validation for LAR archives

Author: zspitzer

core/src/main/java/lucee/runtime/osgi/BundleInfo.java

@@ -131,7 +131,11 @@ public BundleInfo(File file) throws IOException, BundleException {
 				else if (!StringUtil.isEmpty(exportPackage, true) || !StringUtil.isEmpty(fragementHost, true)) {
 					valid = true;
 				}
-				// has no exportPackage, fine wjhen it has other files than just class files or has no class files
+				// LAR archive (Lucee mapping archive) — always valid, not a real OSGi bundle
+				else if (attrs.getValue("mapping-type") != null) {
+					valid = true;
+				}
+				// has no exportPackage, fine when it has other files than just class files or has no class files
 				// at all
 				else {
 					valid = true;

loader/build.xml

@@ -2,7 +2,7 @@
 <project default="core" basedir="." name="Lucee" 
   xmlns:resolver="antlib:org.apache.maven.resolver.ant">
 
-  <property name="version" value="6.2.6.4-SNAPSHOT"/>
+  <property name="version" value="6.2.6.5-SNAPSHOT"/>
 
   <taskdef uri="antlib:org.apache.maven.resolver.ant" resource="org/apache/maven/resolver/ant/antlib.xml">
     <classpath>

loader/pom.xml

@@ -3,7 +3,7 @@
 
   <groupId>org.lucee</groupId>
   <artifactId>lucee</artifactId>
-  <version>6.2.6.4-SNAPSHOT</version>
+  <version>6.2.6.5-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>Lucee Loader Build</name>

test/tickets/LDEV6165.cfc

@@ -0,0 +1,107 @@
+component extends="org.lucee.cfml.test.LuceeTestCase" labels="mapping,archive" {
+
+	variables.testVirtual = "/ldev6165-test";
+	variables.adminPassword = "";
+
+	function beforeAll() {
+		variables.adminPassword = request.WEBADMINPASSWORD;
+		variables.oldMappings = GetApplicationSettings().mappings;
+		// cleanup mapping from previous runs
+		try {
+			admin action="removeMapping" type="web" password="#variables.adminPassword#" virtual="#variables.testVirtual#";
+		} catch ( any e ) {}
+	}
+
+	function afterAll() {
+		application action="update" mappings=variables.oldMappings;
+		try {
+			admin action="removeMapping" type="web" password="#variables.adminPassword#" virtual="#variables.testVirtual#";
+		} catch ( any e ) {}
+	}
+
+	private function createLarArchive( required string srcDir, required string larFile, boolean addNonCFMLFiles=false ) {
+		// create mapping pointing to physical source
+		admin
+			action="updateMapping"
+			type="web"
+			password="#variables.adminPassword#"
+			virtual="#variables.testVirtual#"
+			physical="#arguments.srcDir#"
+			toplevel="true"
+			archive=""
+			primary="physical"
+			trusted="no";
+
+		// create an archive (compiles CFML to .class files)
+		admin
+			action="createArchive"
+			type="web"
+			password="#variables.adminPassword#"
+			file="#arguments.larFile#"
+			virtual="#variables.testVirtual#"
+			addCFMLFiles="false"
+			addNonCFMLFiles="#arguments.addNonCFMLFiles#";
+
+		expect( fileExists( arguments.larFile ) ).toBeTrue( "LAR file should exist" );
+
+		// switch mapping to archive-only, no physical
+		admin
+			action="updateMapping"
+			type="web"
+			password="#variables.adminPassword#"
+			virtual="#variables.testVirtual#"
+			physical=""
+			toplevel="true"
+			archive="#arguments.larFile#"
+			primary="archive"
+			trusted="no";
+
+		// remove the physical source so we know it's coming from the archive
+		directoryDelete( arguments.srcDir, true );
+	}
+
+	function run( testResults, testBox ) {
+		describe( "LDEV-6165: LAR archive mapping with only compiled CFML", function() {
+
+			it( "should resolve pages from a CFML-only LAR archive", function() {
+				var testDir = getTempDirectory() & "LDEV6165/cfml-only/";
+				var srcDir = testDir & "src/";
+				var larFile = testDir & "test.lar";
+
+				// cleanup from previous runs
+				if ( directoryExists( testDir ) ) directoryDelete( testDir, true );
+				directoryCreate( srcDir, true, true );
+
+				// create a simple CFML file — no non-CFML resources
+				fileWrite( srcDir & "hello.cfm", "<cfset greeting = 'cfml-only'>" );
+
+				createLarArchive( srcDir, larFile, false );
+
+				// this is where the bug manifests — include from the archive
+				include "#variables.testVirtual#/hello.cfm";
+				expect( greeting ).toBe( "cfml-only" );
+			});
+
+			it( "should resolve pages from a LAR archive with mixed content", function() {
+				var testDir = getTempDirectory() & "LDEV6165/mixed/";
+				var srcDir = testDir & "src/";
+				var larFile = testDir & "test.lar";
+
+				// cleanup from previous runs
+				if ( directoryExists( testDir ) ) directoryDelete( testDir, true );
+				directoryCreate( srcDir, true, true );
+
+				// CFML file plus a static resource
+				fileWrite( srcDir & "hello.cfm", "<cfset greeting = 'mixed-content'>" );
+				fileWrite( srcDir & "style.css", "body { color: red; }" );
+
+				createLarArchive( srcDir, larFile, true );
+
+				include "#variables.testVirtual#/hello.cfm";
+				expect( greeting ).toBe( "mixed-content" );
+			});
+
+		});
+	}
+
+}