Merge pull request #2284 from adamretter/refactor/prov-expath-pkg-fork-4.x.x

(4.x.x) Improve the provenance of our EXPath Pkg Repo fork dependency

Author: wolfgangmm

.classpath

@@ -26,7 +26,7 @@
         <classpathentry kind="lib" path="lib/core/lz4-java-1.5.0.jar"/>
 	<classpathentry kind="lib" path="lib/core/icu4j-59_1.jar"/>
 	<classpathentry kind="lib" path="lib/core/icu4j-localespi-59_1.jar"/>
-	<classpathentry kind="lib" path="lib/core/pkg-java-fork.jar"/>
+	<classpathentry kind="lib" path="lib/core/pkg-java-1.1.jar"/>
 	<classpathentry kind="lib" path="lib/core/caffeine-2.6.2.jar"/>
 	<classpathentry kind="lib" path="lib/core/jctools-core-2.1.2.jar"/>
 	<classpathentry kind="lib" path="lib/core/jsr305-3.0.2.jar"/>

extensions/modules/src/org/exist/xquery/modules/expathrepo/InstallFunction.java

@@ -105,7 +105,7 @@ public Sequence eval(Sequence[] args, Sequence contextSequence)
 			    doc = _getDocument(pkgOrPath);
 			    Path file = ((NativeBroker)context.getBroker()).getCollectionBinaryFileFsPath(doc.getURI());
 			    LOG.debug("Installing file: " + file.toAbsolutePath().toString());
-			    pkg = parent_repo.installPackage(file, force, interact);
+			    pkg = parent_repo.installPackage(new XarFileSource(file), force, interact);
 			    repo.get().reportAction(ExistRepository.Action.INSTALL, pkg.getName());
 			} finally {
 			    if (doc != null)

lib/core/pkg-java-1.1.jar

@@ -35,7 +35,7 @@ file.reference.lucene-queries-4.10.4.jar=extensions/indexes/lucene/lib/lucene-qu
 file.reference.lucene-queryparser-4.10.4.jar=extensions/indexes/lucene/lib/lucene-queryparser-4.10.4.jar
 file.reference.nekohtml-1.9.22.jar=lib/user/nekohtml-1.9.22.jar
 file.reference.objenesis-2.2.jar=lib/test/objenesis-2.2.jar
-file.reference.pkg-java-fork.jar=lib/core/pkg-java-fork.jar
+file.reference.pkg-java-1.1.jar=lib/core/pkg-java-1.1.jar
 file.reference.quartz-2.3.0.jar=lib/core/quartz-2.3.0.jar
 file.reference.Saxon-HE-9.6.0-7.jar=lib/endorsed/Saxon-HE-9.6.0-7.jar
 file.reference.slf4j-api-1.7.25.jar=lib/core/slf4j-api-1.7.25.jar
@@ -400,7 +400,7 @@ javac.classpath=\
     ${file.reference.wrapper.jar}:\
     ${file.reference.wrapperApp.jar}:\
     ${file.reference.jargo-0.4.14.jar}:\
-    ${file.reference.pkg-java-fork.jar}:\
+    ${file.reference.pkg-java-1.1.jar}:\
     ${file.reference.jna-4.2.2.jar}:\
     ${file.reference.jna-platform-4.2.2.jar}
 javadoc.additionalparam=-J-Xmx320m

lib/core/pkg-java-fork.jar

@@ -20,7 +20,8 @@
  */
 package org.exist.repo;
 
-import java.io.*;
+import java.io.BufferedReader;
+import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.Collection;
@@ -70,7 +71,7 @@ public static void updateClasspath(BrokerPool pool, org.expath.pkg.repo.Package
             return;
         }
         final FileSystemStorage.FileSystemResolver resolver = (FileSystemStorage.FileSystemResolver) pkg.getResolver();
-        final File packageDir = resolver.resolveResourceAsFile(".");
+        final Path packageDir = resolver.resolveResourceAsFile(".");
         final Classpath cp = new Classpath();
         try {
             scanPackageDir(cp, packageDir);
@@ -92,7 +93,7 @@ private static void scanPackages(BrokerPool pool, Classpath classpath) {
                 } else {
                     try {
                         final FileSystemStorage.FileSystemResolver resolver = (FileSystemStorage.FileSystemResolver) pkg.getResolver();
-                        final File packageDir = resolver.resolveResourceAsFile(".");
+                        final Path packageDir = resolver.resolveResourceAsFile(".");
                         scanPackageDir(classpath, packageDir);
                     } catch (final IOException e) {
                         LOG.warn("An error occurred while updating classpath for package " + pkg.getName(), e);
@@ -125,8 +126,8 @@ private static boolean isCompatible(Package pkg) throws PackageException {
         return processorVersion.getDependencyVersion().isCompatible(procVersion);
     }
 
-    private static void scanPackageDir(Classpath classpath, File module) throws IOException {
-        final Path dotExist =  module.toPath().resolve(".exist");
+    private static void scanPackageDir(Classpath classpath, Path module) throws IOException {
+        final Path dotExist =  module.resolve(".exist");
         if (Files.exists(dotExist)) {
             if (!Files.isDirectory(dotExist)) {
                 throw new IOException("The .exist config dir is not a dir: " + dotExist);

nbproject/project.properties

@@ -132,7 +132,7 @@ protected Optional<Path> getPackageDir(final String pkgName, final Optional<Exis
 
     protected Path getPackageDir(final Package pkg) {
         final FileSystemStorage.FileSystemResolver resolver = (FileSystemStorage.FileSystemResolver) pkg.getResolver();
-        return resolver.resolveResourceAsFile("").toPath();
+        return resolver.resolveResourceAsFile("");
     }
 
     protected Optional<org.expath.pkg.repo.Package> getPackage(final String pkgName, final Optional<ExistRepository> repo) throws PackageException {
@@ -267,7 +267,7 @@ public Optional<String> installAndDeploy(final Path xar, final PackageLoader loa
             // installing the xar into the expath repo
             LOG.info("Installing package " + xar.toAbsolutePath().toString());
             final UserInteractionStrategy interact = new BatchUserInteraction();
-            final org.expath.pkg.repo.Package pkg = repo.get().getParentRepo().installPackage(xar, true, interact);
+            final org.expath.pkg.repo.Package pkg = repo.get().getParentRepo().installPackage(new XarFileSource(xar), true, interact);
             final ExistPkgInfo info = (ExistPkgInfo) pkg.getInfo("exist");
             if (info != null && !info.getJars().isEmpty()) {
                 ClasspathHelper.updateClasspath(broker.getBrokerPool(), pkg);

src/org/exist/repo/ClasspathHelper.java

@@ -135,7 +135,7 @@ private void setupPackage(Package pkg, ExistPkgInfo info)
         // TODO: FIXME: Bad, BAD design!  But will be resolved naturally by moving the
         // install code within the storage class (because we are writing on disk)...
         final FileSystemResolver res = (FileSystemResolver) pkg.getResolver();
-        final Path classpath = res.resolveResourceAsFile(".exist/classpath.txt").toPath();
+        final Path classpath = res.resolveResourceAsFile(".exist/classpath.txt");
 
         // create [pkg_dir]/.exist/classpath.txt if not already
         final Path exist = classpath.getParent();

src/org/exist/repo/Deployment.java

@@ -85,7 +85,7 @@ public void prepare(final BrokerPool brokerPool) throws BrokerPoolServiceExcepti
         LOG.info("Using directory " + expathDir.toAbsolutePath().toString() + " for expath package repository");
 
         try {
-            final FileSystemStorage storage = new FileSystemStorage(expathDir.toFile());
+            final FileSystemStorage storage = new FileSystemStorage(expathDir);
             storage.setErrorIfNoContentDir(false);
             this.myParent = new Repository(storage);
             myParent.registerExtension(new ExistPkgExtension());
@@ -197,7 +197,7 @@ public Path resolveXQueryModule(final String namespace) throws XPathException {
             if (info != null) {
                 final String f = info.getXQuery(uri);
                 if (f != null) {
-                    return resolver.resolveComponentAsFile(f).toPath();
+                    return resolver.resolveComponentAsFile(f);
                 }
             }
             String sysid = null; // declared here to be used in catch

src/org/exist/repo/ExistPkgExtension.java

@@ -52,7 +52,7 @@ lib/core/log4j-core-%latest%.jar                   always
 lib/core/log4j-jul-%latest%.jar                    always
 lib/core/log4j-slf4j-impl-%latest%.jar             always
 lib/core/slf4j-api-%latest%.jar                    always
-lib/core/pkg-java-fork.jar                         always
+lib/core/pkg-java-%latest%.jar                     always
 lib/core/quartz-%latest%.jar                       always
 lib/core/ws-commons-util-%latest%.jar              always
 lib/core/xmldb-api-%latest%.jar                    always