partially invert "improve osgi file handling"

lucee · Jul 22, 2024 · 75305bf · 75305bf
1 parent 036dcc0
commit 75305bf
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 2 deletions.
diff --git a/core/src/main/java/lucee/runtime/osgi/OSGiUtil.java b/core/src/main/java/lucee/runtime/osgi/OSGiUtil.java
@@ -1095,6 +1095,39 @@ private static BundleFile _getBundleFile(CFMLEngineFactory factory, BundleRange
 			if (mbf != null) {
 				return improveFileName(bd, mbf);
 			}
+
+			List<Resource> children = listFiles(dir, addional, JAR_EXT_FILTER);
+
+			// now we check all jar files
+			{
+
+				// now we check by Manifest comparsion, name not necessary reflect the correct bundle info
+				BundleFile bf;
+				for (boolean checkBundleRange: checkBundleRanges) {
+					mbf = null;
+					for (Resource child: children) {
+						if (checkBundleRange && !new Filter(bundleRange).accept(child.getName())) continue;
+						match = child;
+						bf = BundleFile.getInstance(child);
+						if (bf.isBundle()) {
+							if (bf.getSymbolicName().equals(bundleRange.getName())) {
+								if (bundleRange.matches(bf)) {
+									if (mbf == null || OSGiUtil.isNewerThan(bf.getVersion(), mbf.getVersion())) mbf = bf;
+								}
+								else {
+									if (versionsFound != null) {
+										if (versionsFound.length() > 0) versionsFound.append(", ");
+										versionsFound.append(bf.getVersionAsString());
+									}
+								}
+							}
+						}
+					}
+					if (mbf != null) {
+						return improveFileName(factory.getBundleDirectory(), mbf);
+					}
+				}
+			}
 			/*
 			 * List<Resource> children = listFiles(dir, addional, JAR_EXT_FILTER);
 			 * 

diff --git a/loader/build.xml b/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.1.1.51-BETA"/>
+  <property name="version" value="6.1.1.51-SNAPSHOT"/>
 
   <taskdef uri="antlib:org.apache.maven.resolver.ant" resource="org/apache/maven/resolver/ant/antlib.xml">
     <classpath>

diff --git a/loader/pom.xml b/loader/pom.xml
@@ -3,7 +3,7 @@
 
   <groupId>org.lucee</groupId>
   <artifactId>lucee</artifactId>
-  <version>6.1.1.51-BETA</version>
+  <version>6.1.1.51-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>Lucee Loader Build</name>