*** old/agent/src/share/classes/sun/jvm/hotspot/tools/jcore/ClassDump.java	Fri Sep  9 14:16:02 2011
--- new/agent/src/share/classes/sun/jvm/hotspot/tools/jcore/ClassDump.java	Fri Sep  9 14:16:02 2011

*** 1,7 ****
--- 1,7 ----
  /*
!  * Copyright (c) 2002, 2009, Oracle and/or its affiliates. All rights reserved.
!  * Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.

*** 23,62 ****
--- 23,71 ----
   */
  
  package sun.jvm.hotspot.tools.jcore;
  
  import java.io.*;
+ import java.util.jar.JarOutputStream;
+ import java.util.jar.JarEntry;
+ import java.util.jar.Manifest;
  import sun.jvm.hotspot.memory.*;
  import sun.jvm.hotspot.oops.*;
  import sun.jvm.hotspot.debugger.*;
  import sun.jvm.hotspot.runtime.*;
  import sun.jvm.hotspot.tools.*;
  
  public class ClassDump extends Tool {
      private ClassFilter classFilter;
      private String      outputDirectory;
+     private JarOutputStream jarStream;
  
!     public void run() {
          // Ready to go with the database...
          try {
!     public void setClassFilter(ClassFilter cf) {
+         classFilter = cf;
+     }
  
              // load class filters
  
              String filterClassName = System.getProperty("sun.jvm.hotspot.tools.jcore.filter");
              if (filterClassName != null) {
+     public void setOutputDirectory(String od) {
+         outputDirectory = od;
+         if (jarStream != null) {
              try {
!                     Class filterClass = Class.forName(filterClassName);
                      classFilter = (ClassFilter) filterClass.newInstance();
                  } catch(Exception exp) {
                      System.err.println("Warning: Can not create class filter!");
!                 jarStream.close();
+             } catch (IOException ioe) {
+                 ioe.printStackTrace();
              }
          }
+         jarStream = null;
+     }
  
              outputDirectory = System.getProperty("sun.jvm.hotspot.tools.jcore.outputDir");
              if (outputDirectory == null)
!                 outputDirectory = ".";
+     public void setJarOutput(String jarFileName) throws IOException {
+         jarStream = new JarOutputStream(new FileOutputStream(jarFileName), new Manifest());
!         outputDirectory = null;
+     }
  
+     public void run() {
+         // Ready to go with the database...
+         try {
+ 
              // walk through the system dictionary
              SystemDictionary dict = VM.getVM().getSystemDictionary();
              dict.classesDo(new SystemDictionary.ClassVisitor() {
                      public void visit(Klass k) {
                          if (k instanceof InstanceKlass) {

*** 73,83 ****
--- 82,100 ----
          catch (AddressException e) {
              System.err.println("Error accessing address 0x"
                                 + Long.toHexString(e.getAddress()));
              e.printStackTrace();
          }
+         if (jarStream != null) {
+             try {
+                 jarStream.close();
+             } catch (IOException ioe) {
+                 ioe.printStackTrace();
              }
+             jarStream = null;
+         }
+     }
  
      public String getName() {
          return "jcore";
      }
  

*** 86,95 ****
--- 103,118 ----
              return;
          }
  
          String klassName = kls.getName().asString();
          klassName = klassName.replace('/', File.separatorChar);
+         try {
+             OutputStream os = null;
+             if (jarStream != null) {
+                 jarStream.putNextEntry(new JarEntry(klassName + ".class"));
+                 os = jarStream;
+             } else {
                  int index = klassName.lastIndexOf(File.separatorChar);
                  File dir = null;
                  if (index != -1) {
                      String dirName = klassName.substring(0, index);
                      dir = new File(outputDirectory,  dirName);

*** 96,122 ****
--- 119,165 ----
                  } else {
                      dir = new File(outputDirectory);
                  }
  
                  dir.mkdirs();
          File f = new File(dir, klassName.substring(klassName.lastIndexOf(File.separatorChar) + 1)
                            + ".class");
          try {
+                 File f = new File(dir, klassName.substring(index + 1) + ".class");
                  f.createNewFile();
!             OutputStream os = new BufferedOutputStream(new FileOutputStream(f));
!                 os = new BufferedOutputStream(new FileOutputStream(f));
+             }
              try {
                  ClassWriter cw = new ClassWriter(kls, os);
                  cw.write();
              } finally {
+                 if (os != jarStream) {
                      os.close();
                  }
+             }
          } catch(IOException exp) {
              exp.printStackTrace();
          }
      }
  
      public static void main(String[] args) {
+         // load class filters
+         ClassFilter classFilter = null;
+         String filterClassName = System.getProperty("sun.jvm.hotspot.tools.jcore.filter");
+         if (filterClassName != null) {
+             try {
+                 Class filterClass = Class.forName(filterClassName);
+                 classFilter = (ClassFilter) filterClass.newInstance();
+             } catch(Exception exp) {
+                 System.err.println("Warning: Can not create class filter!");
+             }
+         }
+ 
+         String outputDirectory = System.getProperty("sun.jvm.hotspot.tools.jcore.outputDir");
+         if (outputDirectory == null)
+             outputDirectory = ".";
+ 
+ 
          ClassDump cd = new ClassDump();
+         cd.setClassFilter(classFilter);
+         cd.setOutputDirectory(outputDirectory);
          cd.start(args);
          cd.stop();
      }
  }