Merge pull request #4902 from evolvedbinary/hotfix/expath-pkg-classpath

Ensure that EXPath packages installed in $EXIST_HOME/data/expathrepo are filesystem portable

exist-core/src/main/java/org/exist/repo/ClasspathHelper.java

@@ -39,6 +39,7 @@
 import java.net.URI;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.Collection;
 import java.util.Optional;
 import java.util.Set;
@@ -74,7 +75,7 @@ public static void updateClasspath(BrokerPool pool, org.expath.pkg.repo.Package
  final Path packageDir = resolver.resolveResourceAsFile(".");
  final Classpath cp = new Classpath();
  try {
- scanPackageDir(cp, packageDir);
+ scanPackageDir(pkg, cp, packageDir);
  ((EXistClassLoader)loader).addURLs(cp);
  } catch (final IOException e) {
  LOG.warn("An error occurred while updating classpath for package {}", pkg.getName(), e);
@@ -93,7 +94,7 @@ private static void scanPackages(BrokerPool pool, Classpath classpath) {
  try {
  final FileSystemStorage.FileSystemResolver resolver = (FileSystemStorage.FileSystemResolver) pkg.getResolver();
  final Path packageDir = resolver.resolveResourceAsFile(".");
- scanPackageDir(classpath, packageDir);
+ scanPackageDir(pkg, classpath, packageDir);
  } catch (final IOException e) {
  LOG.warn("An error occurred while updating classpath for package {}", pkg.getName(), e);
  }
@@ -157,7 +158,7 @@ private static boolean isCompatible(final Package pkg) throws PackageException {
  }
  }
 
- private static void scanPackageDir(Classpath classpath, Path module) throws IOException {
+ private static void scanPackageDir(Package pkg, Classpath classpath, Path module) throws IOException {
  final Path dotExist = module.resolve(".exist");
  if (Files.exists(dotExist)) {
  if (!Files.isDirectory(dotExist)) {
@@ -169,7 +170,18 @@ private static void scanPackageDir(Classpath classpath, Path module) throws IOEx
  try (final BufferedReader reader = Files.newBufferedReader(cp)) {
  String line;
  while ((line = reader.readLine()) != null) {
- classpath.addComponent(line);
+ Path p = Paths.get(line);
+ if (!p.isAbsolute()) {
+ final FileSystemStorage.FileSystemResolver res = (FileSystemStorage.FileSystemResolver) pkg.getResolver();
+ p = res.resolveComponentAsFile(line);
+ }
+ p = p.normalize().toAbsolutePath();
+
+ if (Files.exists(p)) {
+ classpath.addComponent(p.toString());
+ } else {
+ LOG.warn("Unable to add '" + p + "' to the classpath for EXPath package: " + pkg.getName() + ", as the file does not exist!");
+ }
  }
  }
  }

exist-core/src/main/java/org/exist/repo/ExistPkgExtension.java

@@ -32,15 +32,12 @@
 import javax.xml.stream.XMLStreamConstants;
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamReader;
-import javax.xml.transform.stream.StreamSource;
 import java.io.IOException;
 import java.io.Writer;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.Set;
 
 /**
  * Handle the exist.xml descriptor in an EXPath package.
@@ -158,23 +155,22 @@ private void setupPackage(Package pkg, ExistPkgInfo info)
  throw new PackageException("Impossible to create directory: " + exist);
  }
  }
- final Set<String> jars = info.getJars();
+
  try(final Writer out = Files.newBufferedWriter(classpath)) {
- for (final String jar : jars) {
- StreamSource jar_src;
+ for (final String jar : info.getJars()) {
+
  try {
- jar_src = res.resolveComponent(jar);
+ res.resolveComponent(jar);
  } catch (final NotExistException ex) {
- final String msg = "Inconsistent package descriptor, the JAR file is not in the package: ";
+ final String msg = "Inconsistent package descriptor, the JAR file is not in the EXPath package: ";
  throw new PackageException(msg + jar, ex);
  }
- final URI uri = URI.create(jar_src.getSystemId());
- final Path file = Paths.get(uri);
- out.write(file.normalize().toString());
- out.write("\n");
+
+ out.write(jar);
+ out.write('\n');
  }
  } catch (final IOException ex) {
- throw new PackageException("Error writing the eXist classpath file: " + classpath, ex);
+ throw new PackageException("Error writing the eXist classpath file '" + classpath + "' for the EXPath package: " + pkg.getName(), ex);
  }
  }