test/lib/testlibrary/jdk/testlibrary/JarUtils.java

*** 23,32 ****
--- 23,33 ----
  
  package jdk.testlibrary;
  
  import java.io.File;
  import java.io.FileInputStream;
+ import java.io.FileNotFoundException;
  import java.io.FileOutputStream;
  import java.io.IOException;
  import java.nio.file.Path;
  import java.util.ArrayList;
  import java.util.Enumeration;
*** 41,51 ****
   */
  public final class JarUtils {
  
  
      /**
!      * Create jar file with specified files from specified location.
       */
      public static void createJar(String dest, Path filesLocation,
                                   String... fileNames) throws IOException {
          try (JarOutputStream jos = new JarOutputStream(
                  new FileOutputStream(dest), new Manifest())) {
--- 42,53 ----
   */
  public final class JarUtils {
  
  
      /**
!      * Create jar file with specified files. If a specified file does not exist,
!      * a new jar entry will be created with the file name itself as the content.
       */
      public static void createJar(String dest, Path filesLocation,
                                   String... fileNames) throws IOException {
          try (JarOutputStream jos = new JarOutputStream(
                  new FileOutputStream(dest), new Manifest())) {
*** 61,70 ****
--- 63,74 ----
                  } else {
                      file = new File(fileName);
                  }
                  try (FileInputStream fis = new FileInputStream(file)) {
                      Utils.transferBetweenStreams(fis, jos);
+                 } catch (FileNotFoundException e) {
+                     jos.write(fileName.getBytes());
                  }
              }
          }
          System.out.println();
      }
*** 76,86 ****
              throws IOException {
          createJar(dest, null, files);
      }
  
      /**
!      * Add specified files to existing jar file.
       */
      public static void updateJar(String src, String dest, String... files)
              throws IOException {
          try (JarOutputStream jos = new JarOutputStream(
                  new FileOutputStream(dest))) {
--- 80,100 ----
              throws IOException {
          createJar(dest, null, files);
      }
  
      /**
!      * Add or remove specified files to existing jar file. If a specified file
!      * to be updated or added does not exist, the jar entry will be created
!      * with the file name itself as the content.
!      *
!      * @param src the original jar file name
!      * @param dest the new jar file name
!      * @param files the files to update. The list is broken into 2 groups
!      *              by a "-" string. The files before in the 1st group will
!      *              be either updated or added. The files in the 2nd group
!      *              will be removed. If no "-" exists, all files belong to
!      *              the 1st group.
       */
      public static void updateJar(String src, String dest, String... files)
              throws IOException {
          try (JarOutputStream jos = new JarOutputStream(
                  new FileOutputStream(dest))) {
*** 92,117 ****
                  Enumeration<JarEntry> entries = srcJarFile.entries();
                  while (entries.hasMoreElements()) {
                      JarEntry entry = entries.nextElement();
                      String name = entry.getName();
                      boolean found = false;
                      for (String file : files) {
!                         if (name.equals(file)) {
                              updatedFiles.add(file);
                              found = true;
                              break;
                          }
                      }
  
                      if (found) {
                          System.out.println(String.format("Updating %s with %s",
                                  dest, name));
                          jos.putNextEntry(new JarEntry(name));
                          try (FileInputStream fis = new FileInputStream(name)) {
                              Utils.transferBetweenStreams(fis, jos);
                          }
                      } else {
                          System.out.println(String.format("Copying %s to %s",
                                  name, dest));
                          jos.putNextEntry(entry);
                          Utils.transferBetweenStreams(srcJarFile.
                                  getInputStream(entry), jos);
--- 106,141 ----
                  Enumeration<JarEntry> entries = srcJarFile.entries();
                  while (entries.hasMoreElements()) {
                      JarEntry entry = entries.nextElement();
                      String name = entry.getName();
                      boolean found = false;
+                     boolean update = true;
                      for (String file : files) {
!                         if (file.equals("-")) {
!                             update = false;
!                         } else if (name.equals(file)) {
                              updatedFiles.add(file);
                              found = true;
                              break;
                          }
                      }
  
                      if (found) {
+                         if (update) {
                          System.out.println(String.format("Updating %s with %s",
                                  dest, name));
                          jos.putNextEntry(new JarEntry(name));
                          try (FileInputStream fis = new FileInputStream(name)) {
                              Utils.transferBetweenStreams(fis, jos);
+                             } catch (FileNotFoundException e) {
+                                 jos.write(name.getBytes());
                              }
                          } else {
+                             System.out.println(String.format("Removing %s from %s",
+                                     name, dest));
+                         }
+                     } else {
                          System.out.println(String.format("Copying %s to %s",
                                  name, dest));
                          jos.putNextEntry(entry);
                          Utils.transferBetweenStreams(srcJarFile.
                                  getInputStream(entry), jos);
*** 119,134 ****
--- 143,163 ----
                  }
              }
  
              // append new files
              for (String file : files) {
+                 if (file.equals("-")) {
+                     break;
+                 }
                  if (!updatedFiles.contains(file)) {
                      System.out.println(String.format("Adding %s with %s",
                              dest, file));
                      jos.putNextEntry(new JarEntry(file));
                      try (FileInputStream fis = new FileInputStream(file)) {
                          Utils.transferBetweenStreams(fis, jos);
+                     } catch (FileNotFoundException e) {
+                         jos.write(file.getBytes());
                      }
                  }
              }
          }
          System.out.println();