Return-Path: 
 <commits-return-59772-apmail-harmony-commits-archive=harmony.apache.org@harmony.apache.org>
Delivered-To: apmail-harmony-commits-archive@www.apache.org
Received: (qmail 86462 invoked from network); 11 Aug 2009 11:16:30 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3)
  by minotaur.apache.org with SMTP; 11 Aug 2009 11:16:30 -0000
Received: (qmail 56528 invoked by uid 500); 11 Aug 2009 11:16:37 -0000
Delivered-To: apmail-harmony-commits-archive@harmony.apache.org
Received: (qmail 56464 invoked by uid 500); 11 Aug 2009 11:16:37 -0000
Mailing-List: contact commits-help@harmony.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@harmony.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@harmony.apache.org>
List-Post: <mailto:commits@harmony.apache.org>
List-Id: <commits.harmony.apache.org>
Reply-To: dev@harmony.apache.org
Delivered-To: mailing list commits@harmony.apache.org
Received: (qmail 56454 invoked by uid 99); 11 Aug 2009 11:16:37 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 11 Aug 2009 11:16:37 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 11 Aug 2009 11:16:32 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 00B4323888D7; Tue, 11 Aug 2009 11:16:11 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r803063 - in /harmony/enhanced/jdktools/branches/java6:
 ./ make/
 modules/jdktools/src/main/java/org/apache/harmony/tools/jar/
 modules/jretools/ modules/jretools/.settings/ modules/jretools/META-INF/
 modules/jretools/make/ modules/jretools/s...
Date: Tue, 11 Aug 2009 11:16:09 -0000
To: commits@harmony.apache.org
From: hindessm@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20090811111611.00B4323888D7@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: hindessm
Date: Tue Aug 11 11:16:08 2009
New Revision: 803063

URL: http://svn.apache.org/viewvc?rev=803063&view=rev
Log:
Merged trunk changes up to r803040.

Modified:
    harmony/enhanced/jdktools/branches/java6/   (props changed)
    harmony/enhanced/jdktools/branches/java6/make/depends.xml
    harmony/enhanced/jdktools/branches/java6/modules/jdktools/src/main/java/org/apache/harmony/tools/jar/Main.java
    harmony/enhanced/jdktools/branches/java6/modules/jretools/.classpath   (props changed)
    harmony/enhanced/jdktools/branches/java6/modules/jretools/.project   (props changed)
    harmony/enhanced/jdktools/branches/java6/modules/jretools/.settings/org.eclipse.jdt.core.prefs   (props changed)
    harmony/enhanced/jdktools/branches/java6/modules/jretools/.settings/org.eclipse.jdt.ui.prefs   (props changed)
    harmony/enhanced/jdktools/branches/java6/modules/jretools/META-INF/MANIFEST.MF   (props changed)
    harmony/enhanced/jdktools/branches/java6/modules/jretools/build.properties   (props changed)
    harmony/enhanced/jdktools/branches/java6/modules/jretools/build.xml   (props changed)
    harmony/enhanced/jdktools/branches/java6/modules/jretools/make/hyproperties.xml   (props changed)
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/internal/nls/Messages.java   (props changed)
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/internal/nls/messages.properties   (props changed)
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/ArgumentsParser.java   (props changed)
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CRLManager.java   (props changed)
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CSRGenerator.java   (props changed)
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertChainVerifier.java   (props changed)
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertExporter.java   (props changed)
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertImporter.java   (props changed)
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertReader.java   (props changed)
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/Command.java   (props changed)
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/EntryManager.java   (props changed)
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/HelpPrinter.java   (props changed)
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyCertGenerator.java   (props changed)
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyStoreCertPrinter.java   (props changed)
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyStoreConverter.java   (props changed)
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolException.java   (props changed)
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolKSLoaderSaver.java   (props changed)
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolParameters.java   (props changed)
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/Main.java   (props changed)
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/toolutils/KeyStoreLoaderSaver.java   (props changed)
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/test/java/org/apache/harmony/jretools/tests/keytool/GenKeyTest.java   (props changed)
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/test/java/org/apache/harmony/jretools/tests/keytool/TestUtils.java   (props changed)
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/test/java/org/apache/harmony/jretools/tests/toolutils/KeyStoreLoaderSaverTest.java   (props changed)

Propchange: harmony/enhanced/jdktools/branches/java6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug 11 11:16:08 2009
@@ -1 +1 @@
-/harmony/enhanced/jdktools/trunk:630107-798901
+/harmony/enhanced/jdktools/trunk:630107-803040

Modified: harmony/enhanced/jdktools/branches/java6/make/depends.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/branches/java6/make/depends.xml?rev=803063&r1=803062&r2=803063&view=diff
==============================================================================
--- harmony/enhanced/jdktools/branches/java6/make/depends.xml (original)
+++ harmony/enhanced/jdktools/branches/java6/make/depends.xml Tue Aug 11 11:16:08 2009
@@ -31,6 +31,7 @@
     <target name="check">
         <check-one-file src="${ecj.jar.url}" dest="${ecj.jar}" />
         <check-one-file src="${junit.jar.url}" dest="${junit.jar}" />
+        <check-one-file src="${hamcrest-library.jar.url}" dest="${hamcrest-library.jar}" />
 
         <poll-modules target="check-depends" dir="${jdktools.base.dir}/modules"/>
 
@@ -55,6 +56,7 @@
         
     <target name="fetch">
         <fetch dep="junit.jar"/>
+        <fetch dep="hamcrest-library.jar"/>
         <fetch dep="ecj.jar"/>
         <poll-modules target="fetch-depends" dir="${jdktools.base.dir}/modules"/>
     </target>

Modified: harmony/enhanced/jdktools/branches/java6/modules/jdktools/src/main/java/org/apache/harmony/tools/jar/Main.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/branches/java6/modules/jdktools/src/main/java/org/apache/harmony/tools/jar/Main.java?rev=803063&r1=803062&r2=803063&view=diff
==============================================================================
--- harmony/enhanced/jdktools/branches/java6/modules/jdktools/src/main/java/org/apache/harmony/tools/jar/Main.java (original)
+++ harmony/enhanced/jdktools/branches/java6/modules/jdktools/src/main/java/org/apache/harmony/tools/jar/Main.java Tue Aug 11 11:16:08 2009
@@ -20,11 +20,13 @@
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
+import java.io.IOException;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
+import java.util.zip.ZipOutputStream;
 
 /**
  * This is a tool that allows you to create/unpack jar/zip 
@@ -94,8 +96,58 @@
     /**
      * Creates a jar file with the specified arguments
      */
-    private static void createJar(String[] args) {
-        System.out.println("Error: Jar creation not yet implemented");
+    private static void createJar(String[] args) throws Exception {
+        boolean verboseFlag = false, fileFlag = false, manifestFlag = false;
+
+        // Check for expected and unexpected flags
+        for (int i=1; i<args[0].length(); i++) {
+            switch (args[0].charAt(i)) {
+            case 'v':
+                verboseFlag = true;
+                break;
+            case 'f':
+                fileFlag = true;
+                break;
+            case 'm':
+                manifestFlag = true;
+                break;
+            default:
+                System.out.println("Error: Illegal option for -c: '"+args[0].charAt(i)+"'");
+                return;
+            }
+        }
+
+        ZipOutputStream zos;
+        if (!fileFlag) {
+            // Write to stdout
+            if (verboseFlag) System.out.println("Writing to stdout");
+            zos = new ZipOutputStream(System.out);
+        } else {
+            // Write to the specified file
+            if (verboseFlag) System.out.println("Creating jar file: "+args[1]);
+            zos = new ZipOutputStream(new FileOutputStream(new File(args[1])));
+        }
+
+        String workingDir = System.getProperty("user.dir");
+        int firstFileIndex = 0;
+        if (manifestFlag) {
+            firstFileIndex = 3;
+        } else {
+            firstFileIndex = 2;
+        }
+
+        // Assume that all the args following the manifest (if provided) are the name of files to add to the archive
+        for (int i=firstFileIndex; i < args.length; i++) {
+            // attempt to add the file to the output stream
+            File f = new File(workingDir + File.separator + args[i]);
+            if (f.isDirectory()) {
+                processDir(f, zos, workingDir, verboseFlag);
+            } else {
+                processFile(f, zos, workingDir, verboseFlag);
+            }
+        }
+        
+        zos.close();
     }
 
     /**
@@ -131,8 +183,8 @@
             System.out.println("Error: No file name specified for 'f' option");
             return;
         }
-    	
-    	ZipInputStream zis;
+    
+        ZipInputStream zis;
         if (!fileFlag) {
             // Read from stdin
             if (verboseFlag) System.out.println("Reading input from stdin");
@@ -148,35 +200,35 @@
         String workingDir = System.getProperty("user.dir");
         
         while ((ze = zis.getNextEntry()) != null) {
-        	if (ze.isDirectory()) {
-        		// create a new directory of the same name
-       			File newDir = new File(ze.getName());
-    			if (! newDir.exists()) {
-    				newDir.mkdirs();        				
-    			}
-    	        if (verboseFlag) {
-    	        	System.out.println("created: " + ze.getName());
-    	        }
-        	} else {
-        		// extract the file to the appropriate directory
-        		File f = new File(workingDir + File.separator + ze.getName());
-        		f.createNewFile();
-        		FileOutputStream fos = new FileOutputStream(f);
-        		int i;
-        		while ((i = zis.read()) != -1) {
-        			fos.write(i);
-        		}
-            	fos.close();
-            	if (verboseFlag) {
-            		System.out.println("inflated: " + ze.getName());
-            	}
-        	}           
+            if (ze.isDirectory()) {
+                // create a new directory of the same name
+                File newDir = new File(ze.getName());
+                if (! newDir.exists()) {
+                    newDir.mkdirs();
+                }
+                if (verboseFlag) {
+                    System.out.println("created: " + ze.getName());
+                }
+            } else {
+                // extract the file to the appropriate directory
+                File f = new File(workingDir + File.separator + ze.getName());
+                f.createNewFile();
+                FileOutputStream fos = new FileOutputStream(f);
+                int i;
+                while ((i = zis.read()) != -1) {
+                    fos.write(i);
+                }
+                fos.close();
+                if (verboseFlag) {
+                    System.out.println("inflated: " + ze.getName());
+                }
+            }
             zis.closeEntry();
         }
 
         zis.close();
     }
-    	
+
     /**
      * Lists contents of jar file with the specified arguments
      */
@@ -222,6 +274,7 @@
             Date date = new Date(ze.getTime());
             DateFormat dateFormat = new SimpleDateFormat("EEE MMM dd HH:mm:ss z yyy");
             String formattedDate = dateFormat.format(date);
+            zis.closeEntry();
             System.out.printf("%6d %s %s\n", ze.getSize(), formattedDate, ze.getName());
         }
 
@@ -234,5 +287,43 @@
     private static void indexJar(String[] args) {
         System.out.println("Error: Jar indexing not yet implemented");
     }
+    
+    private static void processDir(File dir, ZipOutputStream zos, String workingDir, boolean verboseFlag) throws IOException {	
+        // First add the dir to the ZipOutputStream
+        String relativePath = dir.getAbsolutePath().substring(workingDir.length() + 1);		
+        ZipEntry zEntry = new ZipEntry(relativePath);
+        if (verboseFlag) {
+            System.out.println("adding: " + relativePath);
+        }
+        zos.putNextEntry(zEntry);
+
+        // Add all files in this directory
+        File[] filesInDir = dir.listFiles();
+        for (int i=0; i < filesInDir.length; i++) {
+            File curFile = filesInDir[i];
+            if (curFile.isDirectory()) {
+                processDir(curFile, zos, workingDir, verboseFlag);
+            } else {
+                processFile(curFile, zos, workingDir, verboseFlag);
+            }
+        }
+
+        zos.closeEntry();
+    }
+
+    private static void processFile(File file, ZipOutputStream zos, String workingDir, boolean verboseFlag) throws IOException {
+        String relativePath = file.getAbsolutePath().substring(workingDir.length() + 1);
+        if (verboseFlag) {
+            System.out.println("adding: " + relativePath);
+        }
 
+        ZipEntry zEntry = new ZipEntry(relativePath);
+        zos.putNextEntry(zEntry);
+        // now write the data
+        FileInputStream fis = new FileInputStream(file);
+        byte fileContent[] = new byte[(int)file.length()];
+        fis.read(fileContent);
+        zos.write(fileContent);
+        zos.closeEntry();
+    }    
 }

Propchange: harmony/enhanced/jdktools/branches/java6/modules/jretools/.classpath
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug 11 11:16:08 2009
@@ -1,2 +1,2 @@
-/harmony/enhanced/jdktools/trunk/modules/jretools/.classpath:748417-798901
+/harmony/enhanced/jdktools/trunk/modules/jretools/.classpath:748417-803040
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/.classpath:467609-476394

Propchange: harmony/enhanced/jdktools/branches/java6/modules/jretools/.project
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug 11 11:16:08 2009
@@ -1,2 +1,2 @@
-/harmony/enhanced/jdktools/trunk/modules/jretools/.project:748417-798901
+/harmony/enhanced/jdktools/trunk/modules/jretools/.project:748417-803040
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/.project:467609-476394

Propchange: harmony/enhanced/jdktools/branches/java6/modules/jretools/.settings/org.eclipse.jdt.core.prefs
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug 11 11:16:08 2009
@@ -1,2 +1,2 @@
-/harmony/enhanced/jdktools/trunk/modules/jretools/.settings/org.eclipse.jdt.core.prefs:748417-798901
+/harmony/enhanced/jdktools/trunk/modules/jretools/.settings/org.eclipse.jdt.core.prefs:748417-803040
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/.settings/org.eclipse.jdt.core.prefs:467609-476394

Propchange: harmony/enhanced/jdktools/branches/java6/modules/jretools/.settings/org.eclipse.jdt.ui.prefs
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug 11 11:16:08 2009
@@ -1,2 +1,2 @@
-/harmony/enhanced/jdktools/trunk/modules/jretools/.settings/org.eclipse.jdt.ui.prefs:748417-798901
+/harmony/enhanced/jdktools/trunk/modules/jretools/.settings/org.eclipse.jdt.ui.prefs:748417-803040
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/.settings/org.eclipse.jdt.ui.prefs:467609-476394

Propchange: harmony/enhanced/jdktools/branches/java6/modules/jretools/META-INF/MANIFEST.MF
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug 11 11:16:08 2009
@@ -1,2 +1,2 @@
-/harmony/enhanced/jdktools/trunk/modules/jretools/META-INF/MANIFEST.MF:748417-798901
+/harmony/enhanced/jdktools/trunk/modules/jretools/META-INF/MANIFEST.MF:748417-803040
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/META-INF/MANIFEST.MF:467609-476394

Propchange: harmony/enhanced/jdktools/branches/java6/modules/jretools/build.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug 11 11:16:08 2009
@@ -1,2 +1,2 @@
-/harmony/enhanced/jdktools/trunk/modules/jretools/build.properties:748417-798901
+/harmony/enhanced/jdktools/trunk/modules/jretools/build.properties:748417-803040
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/build.properties:467609-476394

Propchange: harmony/enhanced/jdktools/branches/java6/modules/jretools/build.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug 11 11:16:08 2009
@@ -1,2 +1,2 @@
-/harmony/enhanced/jdktools/trunk/modules/jretools/build.xml:748417-798901
+/harmony/enhanced/jdktools/trunk/modules/jretools/build.xml:748417-803040
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/build.xml:467609-476394

Propchange: harmony/enhanced/jdktools/branches/java6/modules/jretools/make/hyproperties.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug 11 11:16:08 2009
@@ -1,2 +1,2 @@
-/harmony/enhanced/jdktools/trunk/modules/jretools/make/hyproperties.xml:748417-798901
+/harmony/enhanced/jdktools/trunk/modules/jretools/make/hyproperties.xml:748417-803040
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/make/hyproperties.xml:467609-476394

Propchange: harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/internal/nls/Messages.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug 11 11:16:08 2009
@@ -1,2 +1,2 @@
-/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/internal/nls/Messages.java:748417-798901
+/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/internal/nls/Messages.java:748417-803040
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/internal/nls/Messages.java:467609-476394

Propchange: harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/internal/nls/messages.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug 11 11:16:08 2009
@@ -1,2 +1,2 @@
-/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/internal/nls/messages.properties:748417-798901
+/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/internal/nls/messages.properties:748417-803040
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/internal/nls/messages.properties:467609-476394

Propchange: harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/ArgumentsParser.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug 11 11:16:08 2009
@@ -1,2 +1,2 @@
-/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/ArgumentsParser.java:748417-798901
+/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/ArgumentsParser.java:748417-803040
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/ArgumentsParser.java:467609-476394

Propchange: harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CRLManager.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug 11 11:16:08 2009
@@ -1,2 +1,2 @@
-/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CRLManager.java:748417-798901
+/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CRLManager.java:748417-803040
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CRLManager.java:467609-476394

Propchange: harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CSRGenerator.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug 11 11:16:08 2009
@@ -1,2 +1,2 @@
-/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CSRGenerator.java:748417-798901
+/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CSRGenerator.java:748417-803040
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CSRGenerator.java:467609-476394

Propchange: harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertChainVerifier.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug 11 11:16:08 2009
@@ -1,2 +1,2 @@
-/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertChainVerifier.java:748417-798901
+/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertChainVerifier.java:748417-803040
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertChainVerifier.java:467609-476394

Propchange: harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertExporter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug 11 11:16:08 2009
@@ -1,2 +1,2 @@
-/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertExporter.java:748417-798901
+/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertExporter.java:748417-803040
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertExporter.java:467609-476394

Propchange: harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertImporter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug 11 11:16:08 2009
@@ -1,2 +1,2 @@
-/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertImporter.java:748417-798901
+/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertImporter.java:748417-803040
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertImporter.java:467609-476394

Propchange: harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertReader.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug 11 11:16:08 2009
@@ -1,2 +1,2 @@
-/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertReader.java:748417-798901
+/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertReader.java:748417-803040
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertReader.java:467609-476394

Propchange: harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/Command.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug 11 11:16:08 2009
@@ -1,2 +1,2 @@
-/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/Command.java:748417-798901
+/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/Command.java:748417-803040
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/Command.java:467609-476394

Propchange: harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/EntryManager.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug 11 11:16:08 2009
@@ -1,2 +1,2 @@
-/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/EntryManager.java:748417-798901
+/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/EntryManager.java:748417-803040
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/EntryManager.java:467609-476394

Propchange: harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/HelpPrinter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug 11 11:16:08 2009
@@ -1,2 +1,2 @@
-/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/HelpPrinter.java:748417-798901
+/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/HelpPrinter.java:748417-803040
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/HelpPrinter.java:467609-476394

Propchange: harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyCertGenerator.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug 11 11:16:08 2009
@@ -1,2 +1,2 @@
-/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyCertGenerator.java:748417-798901
+/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyCertGenerator.java:748417-803040
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyCertGenerator.java:467609-476394

Propchange: harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyStoreCertPrinter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug 11 11:16:08 2009
@@ -1,2 +1,2 @@
-/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyStoreCertPrinter.java:748417-798901
+/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyStoreCertPrinter.java:748417-803040
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyStoreCertPrinter.java:467609-476394

Propchange: harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyStoreConverter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug 11 11:16:08 2009
@@ -1,2 +1,2 @@
-/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyStoreConverter.java:748417-798901
+/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyStoreConverter.java:748417-803040
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyStoreConverter.java:467609-476394

Propchange: harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolException.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug 11 11:16:08 2009
@@ -1,2 +1,2 @@
-/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolException.java:748417-798901
+/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolException.java:748417-803040
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolException.java:467609-476394

Propchange: harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolKSLoaderSaver.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug 11 11:16:08 2009
@@ -1,2 +1,2 @@
-/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolKSLoaderSaver.java:748417-798901
+/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolKSLoaderSaver.java:748417-803040
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolKSLoaderSaver.java:467609-476394

Propchange: harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolParameters.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug 11 11:16:08 2009
@@ -1,2 +1,2 @@
-/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolParameters.java:748417-798901
+/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolParameters.java:748417-803040
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolParameters.java:467609-476394

Propchange: harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/Main.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug 11 11:16:08 2009
@@ -1,2 +1,2 @@
-/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/Main.java:748417-798901
+/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/Main.java:748417-803040
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/Main.java:467609-476394

Propchange: harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/toolutils/KeyStoreLoaderSaver.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug 11 11:16:08 2009
@@ -1,2 +1,2 @@
-/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/toolutils/KeyStoreLoaderSaver.java:748417-798901
+/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/toolutils/KeyStoreLoaderSaver.java:748417-803040
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/toolutils/KeyStoreLoaderSaver.java:467609-476394

Propchange: harmony/enhanced/jdktools/branches/java6/modules/jretools/src/test/java/org/apache/harmony/jretools/tests/keytool/GenKeyTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug 11 11:16:08 2009
@@ -1,2 +1,2 @@
-/harmony/enhanced/jdktools/trunk/modules/jretools/src/test/java/org/apache/harmony/jretools/tests/keytool/GenKeyTest.java:748417-798901
+/harmony/enhanced/jdktools/trunk/modules/jretools/src/test/java/org/apache/harmony/jretools/tests/keytool/GenKeyTest.java:748417-803040
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/test/java/org/apache/harmony/jretools/tests/keytool/GenKeyTest.java:467609-476394

Propchange: harmony/enhanced/jdktools/branches/java6/modules/jretools/src/test/java/org/apache/harmony/jretools/tests/keytool/TestUtils.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug 11 11:16:08 2009
@@ -1,2 +1,2 @@
-/harmony/enhanced/jdktools/trunk/modules/jretools/src/test/java/org/apache/harmony/jretools/tests/keytool/TestUtils.java:748417-798901
+/harmony/enhanced/jdktools/trunk/modules/jretools/src/test/java/org/apache/harmony/jretools/tests/keytool/TestUtils.java:748417-803040
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/test/java/org/apache/harmony/jretools/tests/keytool/TestUtils.java:467609-476394

Propchange: harmony/enhanced/jdktools/branches/java6/modules/jretools/src/test/java/org/apache/harmony/jretools/tests/toolutils/KeyStoreLoaderSaverTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug 11 11:16:08 2009
@@ -1,2 +1,2 @@
-/harmony/enhanced/jdktools/trunk/modules/jretools/src/test/java/org/apache/harmony/jretools/tests/toolutils/KeyStoreLoaderSaverTest.java:748417-798901
+/harmony/enhanced/jdktools/trunk/modules/jretools/src/test/java/org/apache/harmony/jretools/tests/toolutils/KeyStoreLoaderSaverTest.java:748417-803040
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/test/java/org/apache/harmony/jretools/tests/toolutils/KeyStoreLoaderSaverTest.java:467609-476394