more

Author: aloubyansky

core/deployment/src/main/java/io/quarkus/deployment/mutability/DevModeTask.java

@@ -39,7 +39,6 @@ public class DevModeTask {
 
     public static Closeable main(Path appRoot) throws Exception {
 
-        System.out.println("DevModeTask.main " + appRoot);
         try (ObjectInputStream in = new ObjectInputStream(
                 Files.newInputStream(appRoot.resolve(LIB).resolve(DEPLOYMENT_LIB).resolve(JarResultBuildStep.APPMODEL_DAT)))) {
             Properties buildSystemProperties = new Properties();

core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/JarResultBuildStep.java

@@ -922,8 +922,7 @@ private void copyDependency(Set<ArtifactKey> parentFirstArtifacts, OutputTargetB
         for (Path resolvedDep : appDep.getResolvedPaths()) {
             final boolean isDirectory = Files.isDirectory(resolvedDep);
             // we don't use getFileName() for directories, since directories would often be "classes" ending up merging content from multiple dependencies in the same package
-            final String fileName = appDep.getGroupId() + "."
-                    + (isDirectory ? appDep.getArtifactId() : resolvedDep.getFileName());
+            final String fileName = isDirectory ? getFileName(appDep) : appDep.getGroupId() + "." + resolvedDep.getFileName();
             final Path targetPath;
 
             if (allowParentFirst && parentFirstArtifacts.contains(appDep.getKey())) {
@@ -975,6 +974,15 @@ private void copyDependency(Set<ArtifactKey> parentFirstArtifacts, OutputTargetB
         }
     }
 
+    private static String getFileName(ResolvedDependency d) {
+        final StringBuilder sb = new StringBuilder();
+        sb.append(d.getGroupId()).append(".").append(d.getArtifactId()).append("-");
+        if (!d.getClassifier().isEmpty()) {
+            sb.append(d.getClassifier()).append("-");
+        }
+        return sb.append(d.getVersion()).append(".").append(d.getType()).toString();
+    }
+
     private void packageClasses(Path resolvedDep, final Path targetPath, PackageConfig packageConfig) throws IOException {
         try (FileSystem runnerZipFs = createNewZip(targetPath, packageConfig)) {
             Files.walkFileTree(resolvedDep, EnumSet.of(FileVisitOption.FOLLOW_LINKS), Integer.MAX_VALUE,

independent-projects/bootstrap/app-model/src/main/java/io/quarkus/paths/SharedArchivePathTree.java

@@ -19,7 +19,7 @@
 public class SharedArchivePathTree extends ArchivePathTree {
 
     public static void logState() {
-        System.out.println("SharedArchivePathTree.logState");
+        System.out.println("SharedArchivePathTree.logState " + CACHE.size());
         for (var pt : CACHE.values()) {
             if (pt.openCount.get() > 0) {
                 System.out.println("- " + pt.getRoots() + " " + pt.openCount);

independent-projects/bootstrap/runner/src/main/java/io/quarkus/bootstrap/runner/DevModeMediator.java

@@ -176,20 +176,23 @@ public void run() {
                     System.out.println("ChangeDetector.run about to remove files");
                     synchronized (removedFiles) {
                         System.out.println("ChangeDetector.run files to remove " + removedFiles);
-                        for (Path p : removedFiles) {
-                            var sb = new StringBuilder().append("Deleting ").append(p);
+                        var removedFilesIterator = removedFiles.iterator();
+                        while (removedFilesIterator.hasNext()) {
+                            Path removedFile = removedFilesIterator.next();
+                            removedFilesIterator.remove();
+                            var sb = new StringBuilder().append("Deleting ").append(removedFile);
                             System.out.println("ChangeDetector.run " + sb);
                             if (WINDOWS) {
-                                var moved = p.getParent().resolve(p.getFileName() + "-moved");
+                                var moved = removedFile.getParent().resolve(removedFile.getFileName() + "-moved");
                                 try {
-                                    Files.move(p, moved);
-                                    p = moved;
-                                    Files.delete(p);
+                                    Files.move(removedFile, moved);
+                                    removedFile = moved;
+                                    Files.delete(removedFile);
                                 } catch (IOException e) {
-                                    System.out.println("ChangeDetector.run failed to move " + p + " " + moved);
+                                    System.out.println("ChangeDetector.run failed to move " + removedFile + " " + moved);
                                     e.printStackTrace();
                                 }
-                            } else if (!Files.deleteIfExists(p)) {
+                            } else if (!Files.deleteIfExists(removedFile)) {
                                 sb.append(" didn't succeed");
                                 System.out.println("ChangeDetector.run " + sb);
                             }