< prev index next >
test/lib/testlibrary/jdk/testlibrary/JarUtils.java
Print this page
rev 15874 : 8163304: jarsigner -verbose -verify should print the algorithms used to sign the jar
*** 22,31 ****
--- 22,32 ----
*/
package jdk.testlibrary;
import java.io.FileInputStream;
+ import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Enumeration;
import java.util.List;
*** 38,48 ****
* Common library for various test jar file utility functions.
*/
public final class JarUtils {
/**
! * Create jar file with specified files.
*/
public static void createJar(String dest, String... files)
throws IOException {
try (JarOutputStream jos = new JarOutputStream(
new FileOutputStream(dest), new Manifest())) {
--- 39,50 ----
* Common library for various test jar file utility functions.
*/
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, String... files)
throws IOException {
try (JarOutputStream jos = new JarOutputStream(
new FileOutputStream(dest), new Manifest())) {
*** 52,69 ****
// add an archive entry, and write a file
jos.putNextEntry(new JarEntry(file));
try (FileInputStream fis = new FileInputStream(file)) {
fis.transferTo(jos);
}
}
}
System.out.println();
}
/**
! * 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))) {
--- 54,83 ----
// add an archive entry, and write a file
jos.putNextEntry(new JarEntry(file));
try (FileInputStream fis = new FileInputStream(file)) {
fis.transferTo(jos);
+ } catch (FileNotFoundException e) {
+ jos.write(file.getBytes());
}
}
}
System.out.println();
}
/**
! * 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))) {
*** 75,98 ****
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)) {
fis.transferTo(jos);
}
} else {
System.out.println(String.format("Copying %s to %s",
name, dest));
jos.putNextEntry(entry);
--- 89,122 ----
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)) {
fis.transferTo(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);
*** 101,116 ****
--- 125,145 ----
}
}
// 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)) {
fis.transferTo(jos);
+ } catch (FileNotFoundException e) {
+ jos.write(file.getBytes());
}
}
}
}
System.out.println();
< prev index next >