harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r926703 - in /harmony/enhanced/branches/java6: ./ classlib/ classlib/depends/libs/ classlib/make/ classlib/modules/concurrent/src/main/java/java/util/concurrent/atomic/ classlib/modules/concurrent/src/main/java/java/util/concurrent/locks/ c...
Date Tue, 23 Mar 2010 18:19:46 GMT
Author: hindessm
Date: Tue Mar 23 18:19:45 2010
New Revision: 926703

URL: http://svn.apache.org/viewvc?rev=926703&view=rev
Log:
Merging changes from trunk@926569 to java6 branch.

Modified:
    harmony/enhanced/branches/java6/   (props changed)
    harmony/enhanced/branches/java6/classlib/   (props changed)
    harmony/enhanced/branches/java6/classlib/depends/libs/   (props changed)
    harmony/enhanced/branches/java6/classlib/make/depends-common.xml   (props changed)
    harmony/enhanced/branches/java6/classlib/modules/concurrent/src/main/java/java/util/concurrent/atomic/
  (props changed)
    harmony/enhanced/branches/java6/classlib/modules/concurrent/src/main/java/java/util/concurrent/locks/
  (props changed)
    harmony/enhanced/branches/java6/classlib/modules/jmx/META-INF/   (props changed)
    harmony/enhanced/branches/java6/classlib/modules/luni/src/main/native/include/fdlibm.h
  (props changed)
    harmony/enhanced/branches/java6/classlib/modules/luni/src/main/native/include/gp.h   (props
changed)
    harmony/enhanced/branches/java6/classlib/modules/luni/src/main/native/include/hymagic.h
  (props changed)
    harmony/enhanced/branches/java6/classlib/modules/luni/src/main/native/include/hysocket.h
  (props changed)
    harmony/enhanced/branches/java6/classlib/modules/luni/src/main/native/include/hyvmls.h
  (props changed)
    harmony/enhanced/branches/java6/classlib/modules/luni/src/main/native/include/jni.h  
(props changed)
    harmony/enhanced/branches/java6/classlib/modules/luni/src/main/native/include/jvmpi.h
  (props changed)
    harmony/enhanced/branches/java6/classlib/modules/luni/src/main/native/include/jvmri.h
  (props changed)
    harmony/enhanced/branches/java6/classlib/modules/luni/src/main/native/include/jvmti.h
  (props changed)
    harmony/enhanced/branches/java6/classlib/modules/luni/src/main/native/include/vmi.h  
(props changed)
    harmony/enhanced/branches/java6/classlib/modules/luni/src/test/resources/net.resources/
  (props changed)
    harmony/enhanced/branches/java6/common_resources/   (props changed)
    harmony/enhanced/branches/java6/drlvm/   (props changed)
    harmony/enhanced/branches/java6/drlvm/make/tests/kernel-test.xml
    harmony/enhanced/branches/java6/jdktools/   (props changed)
    harmony/enhanced/branches/java6/jdktools/modules/jretools/.classpath   (props changed)
    harmony/enhanced/branches/java6/jdktools/modules/jretools/.project   (props changed)
    harmony/enhanced/branches/java6/jdktools/modules/jretools/.settings/org.eclipse.jdt.core.prefs
  (props changed)
    harmony/enhanced/branches/java6/jdktools/modules/jretools/.settings/org.eclipse.jdt.ui.prefs
  (props changed)
    harmony/enhanced/branches/java6/jdktools/modules/jretools/META-INF/MANIFEST.MF   (props
changed)
    harmony/enhanced/branches/java6/jdktools/modules/jretools/build.xml   (props changed)
    harmony/enhanced/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/internal/nls/Messages.java
  (props changed)
    harmony/enhanced/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/internal/nls/messages.properties
  (props changed)
    harmony/enhanced/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/ArgumentsParser.java
  (props changed)
    harmony/enhanced/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CRLManager.java
  (props changed)
    harmony/enhanced/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CSRGenerator.java
  (props changed)
    harmony/enhanced/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertChainVerifier.java
  (props changed)
    harmony/enhanced/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertExporter.java
  (props changed)
    harmony/enhanced/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertImporter.java
  (props changed)
    harmony/enhanced/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertReader.java
  (props changed)
    harmony/enhanced/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/Command.java
  (props changed)
    harmony/enhanced/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/EntryManager.java
  (props changed)
    harmony/enhanced/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/HelpPrinter.java
  (props changed)
    harmony/enhanced/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyCertGenerator.java
  (props changed)
    harmony/enhanced/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyStoreCertPrinter.java
  (props changed)
    harmony/enhanced/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyStoreConverter.java
  (props changed)
    harmony/enhanced/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolException.java
  (props changed)
    harmony/enhanced/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolKSLoaderSaver.java
  (props changed)
    harmony/enhanced/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolParameters.java
  (props changed)
    harmony/enhanced/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/Main.java
  (props changed)
    harmony/enhanced/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/toolutils/KeyStoreLoaderSaver.java
  (props changed)
    harmony/enhanced/branches/java6/jdktools/modules/jretools/src/test/java/org/apache/harmony/jretools/tests/keytool/GenKeyTest.java
  (props changed)
    harmony/enhanced/branches/java6/jdktools/modules/jretools/src/test/java/org/apache/harmony/jretools/tests/keytool/TestUtils.java
  (props changed)
    harmony/enhanced/branches/java6/jdktools/modules/jretools/src/test/java/org/apache/harmony/jretools/tests/toolutils/KeyStoreLoaderSaverTest.java
  (props changed)

Propchange: harmony/enhanced/branches/java6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 18:19:45 2010
@@ -1 +1 @@
-/harmony/enhanced/trunk:810871-926505
+/harmony/enhanced/trunk:810871-926569

Propchange: harmony/enhanced/branches/java6/classlib/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 18:19:45 2010
@@ -1,5 +1,5 @@
 /harmony/enhanced/classlib/trunk:713674-735919,765923-926091
 /harmony/enhanced/classlib/trunk/working_classlib:884014-884286
-/harmony/enhanced/trunk/classlib:926318-926505
+/harmony/enhanced/trunk/classlib:926318-926569
 /harmony/enhanced/trunk/working_classlib:476396-920147
 /incubator/harmony/enhanced/trunk/working_classlib:423974-476394

Propchange: harmony/enhanced/branches/java6/classlib/depends/libs/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 18:19:45 2010
@@ -1,2 +1,2 @@
 /harmony/enhanced/classlib/trunk/depends/libs:544451-926091
-/harmony/enhanced/trunk/classlib/depends/libs:926318-926505
+/harmony/enhanced/trunk/classlib/depends/libs:926318-926569

Propchange: harmony/enhanced/branches/java6/classlib/make/depends-common.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 18:19:45 2010
@@ -1,2 +1,2 @@
 /harmony/enhanced/classlib/trunk/make/depends-common.xml:768152-926091
-/harmony/enhanced/trunk/classlib/make/depends-common.xml:926318-926505
+/harmony/enhanced/trunk/classlib/make/depends-common.xml:926318-926569

Propchange: harmony/enhanced/branches/java6/classlib/modules/concurrent/src/main/java/java/util/concurrent/atomic/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 18:19:45 2010
@@ -1,2 +1,2 @@
 /harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/atomic:765923-926091
-/harmony/enhanced/trunk/classlib/modules/concurrent/src/main/java/java/util/concurrent/atomic:926318-926505
+/harmony/enhanced/trunk/classlib/modules/concurrent/src/main/java/java/util/concurrent/atomic:926318-926569

Propchange: harmony/enhanced/branches/java6/classlib/modules/concurrent/src/main/java/java/util/concurrent/locks/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 18:19:45 2010
@@ -1,2 +1,2 @@
 /harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/locks:765923-926091
-/harmony/enhanced/trunk/classlib/modules/concurrent/src/main/java/java/util/concurrent/locks:926318-926505
+/harmony/enhanced/trunk/classlib/modules/concurrent/src/main/java/java/util/concurrent/locks:926318-926569

Propchange: harmony/enhanced/branches/java6/classlib/modules/jmx/META-INF/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 18:19:45 2010
@@ -1,2 +1,2 @@
 /harmony/enhanced/classlib/trunk/modules/jmx/META-INF:768152-926091
-/harmony/enhanced/trunk/classlib/modules/jmx/META-INF:926318-926505
+/harmony/enhanced/trunk/classlib/modules/jmx/META-INF:926318-926569

Propchange: harmony/enhanced/branches/java6/classlib/modules/luni/src/main/native/include/fdlibm.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 18:19:45 2010
@@ -1,2 +1,2 @@
 /harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/fdlibm.h:803062-926091
-/harmony/enhanced/trunk/classlib/modules/luni/src/main/native/include/fdlibm.h:926318-926505
+/harmony/enhanced/trunk/classlib/modules/luni/src/main/native/include/fdlibm.h:926318-926569

Propchange: harmony/enhanced/branches/java6/classlib/modules/luni/src/main/native/include/gp.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 18:19:45 2010
@@ -1,2 +1,2 @@
 /harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/gp.h:803062-926091
-/harmony/enhanced/trunk/classlib/modules/luni/src/main/native/include/gp.h:926318-926505
+/harmony/enhanced/trunk/classlib/modules/luni/src/main/native/include/gp.h:926318-926569

Propchange: harmony/enhanced/branches/java6/classlib/modules/luni/src/main/native/include/hymagic.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 18:19:45 2010
@@ -1,2 +1,2 @@
 /harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/hymagic.h:803062-926091
-/harmony/enhanced/trunk/classlib/modules/luni/src/main/native/include/hymagic.h:926318-926505
+/harmony/enhanced/trunk/classlib/modules/luni/src/main/native/include/hymagic.h:926318-926569

Propchange: harmony/enhanced/branches/java6/classlib/modules/luni/src/main/native/include/hysocket.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 18:19:45 2010
@@ -1,2 +1,2 @@
 /harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/hysocket.h:803062-926091
-/harmony/enhanced/trunk/classlib/modules/luni/src/main/native/include/hysocket.h:926318-926505
+/harmony/enhanced/trunk/classlib/modules/luni/src/main/native/include/hysocket.h:926318-926569

Propchange: harmony/enhanced/branches/java6/classlib/modules/luni/src/main/native/include/hyvmls.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 18:19:45 2010
@@ -1,2 +1,2 @@
 /harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/hyvmls.h:803062-926091
-/harmony/enhanced/trunk/classlib/modules/luni/src/main/native/include/hyvmls.h:926318-926505
+/harmony/enhanced/trunk/classlib/modules/luni/src/main/native/include/hyvmls.h:926318-926569

Propchange: harmony/enhanced/branches/java6/classlib/modules/luni/src/main/native/include/jni.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 18:19:45 2010
@@ -1,2 +1,2 @@
 /harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/jni.h:803062-926091
-/harmony/enhanced/trunk/classlib/modules/luni/src/main/native/include/jni.h:926318-926505
+/harmony/enhanced/trunk/classlib/modules/luni/src/main/native/include/jni.h:926318-926569

Propchange: harmony/enhanced/branches/java6/classlib/modules/luni/src/main/native/include/jvmpi.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 18:19:45 2010
@@ -1,2 +1,2 @@
 /harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/jvmpi.h:803062-926091
-/harmony/enhanced/trunk/classlib/modules/luni/src/main/native/include/jvmpi.h:926318-926505
+/harmony/enhanced/trunk/classlib/modules/luni/src/main/native/include/jvmpi.h:926318-926569

Propchange: harmony/enhanced/branches/java6/classlib/modules/luni/src/main/native/include/jvmri.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 18:19:45 2010
@@ -1,2 +1,2 @@
 /harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/jvmri.h:803062-926091
-/harmony/enhanced/trunk/classlib/modules/luni/src/main/native/include/jvmri.h:926318-926505
+/harmony/enhanced/trunk/classlib/modules/luni/src/main/native/include/jvmri.h:926318-926569

Propchange: harmony/enhanced/branches/java6/classlib/modules/luni/src/main/native/include/jvmti.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 18:19:45 2010
@@ -1,2 +1,2 @@
 /harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/jvmti.h:803062-926091
-/harmony/enhanced/trunk/classlib/modules/luni/src/main/native/include/jvmti.h:926318-926505
+/harmony/enhanced/trunk/classlib/modules/luni/src/main/native/include/jvmti.h:926318-926569

Propchange: harmony/enhanced/branches/java6/classlib/modules/luni/src/main/native/include/vmi.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 18:19:45 2010
@@ -1,2 +1,2 @@
 /harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/vmi.h:803062-926091
-/harmony/enhanced/trunk/classlib/modules/luni/src/main/native/include/vmi.h:926318-926505
+/harmony/enhanced/trunk/classlib/modules/luni/src/main/native/include/vmi.h:926318-926569

Propchange: harmony/enhanced/branches/java6/classlib/modules/luni/src/test/resources/net.resources/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 18:19:45 2010
@@ -1,2 +1,2 @@
 /harmony/enhanced/classlib/trunk/modules/luni/src/test/resources/net.resources:790472-926091
-/harmony/enhanced/trunk/classlib/modules/luni/src/test/resources/net.resources:926318-926505
+/harmony/enhanced/trunk/classlib/modules/luni/src/test/resources/net.resources:926318-926569

Propchange: harmony/enhanced/branches/java6/common_resources/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 18:19:45 2010
@@ -1,2 +1,2 @@
-/harmony/enhanced/trunk/common_resources:476396-920147,921783-926505
+/harmony/enhanced/trunk/common_resources:476396-920147,921783-926569
 /incubator/harmony/enhanced/trunk/common_resources:423974-476394

Propchange: harmony/enhanced/branches/java6/drlvm/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 18:19:45 2010
@@ -1,3 +1,3 @@
-/harmony/enhanced/trunk/drlvm:810871-926505
+/harmony/enhanced/trunk/drlvm:810871-926569
 /harmony/enhanced/trunk/working_vm:476396-920147
 /incubator/harmony/enhanced/trunk/working_vm:423974-476394

Modified: harmony/enhanced/branches/java6/drlvm/make/tests/kernel-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/branches/java6/drlvm/make/tests/kernel-test.xml?rev=926703&r1=926702&r2=926703&view=diff
==============================================================================
--- harmony/enhanced/branches/java6/drlvm/make/tests/kernel-test.xml (original)
+++ harmony/enhanced/branches/java6/drlvm/make/tests/kernel-test.xml Tue Mar 23 18:19:45 2010
@@ -89,7 +89,9 @@
 
     <target name="compile-kernel-test">
         <compile-java src="${kernel.test.javasrc}" 
-            dest="${test.class.path}"/>
+                      dest="${test.class.path}">
+            <classpath location="${junit.jar}" />
+        </compile-java>
         <compile-java src="${kernel.test.javasrc}/../kernel_resources" 
             dest="${test.resource.path}">
             <classpath path="${test.class.path}"/>

Propchange: harmony/enhanced/branches/java6/jdktools/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 18:19:45 2010
@@ -1,4 +1,4 @@
 /harmony/enhanced/jdktools/trunk:630107-925933
-/harmony/enhanced/trunk/jdktools:926309-926505
+/harmony/enhanced/trunk/jdktools:926309-926569
 /harmony/enhanced/trunk/working_jdktools:476396-920147
 /incubator/harmony/enhanced/trunk/working_jdktools:423974-476394

Propchange: harmony/enhanced/branches/java6/jdktools/modules/jretools/.classpath
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 18:19:45 2010
@@ -1,3 +1,3 @@
 /harmony/enhanced/jdktools/trunk/modules/jretools/.classpath:702140-925933
-/harmony/enhanced/trunk/jdktools/modules/jretools/.classpath:926309-926505
+/harmony/enhanced/trunk/jdktools/modules/jretools/.classpath:926309-926569
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/.classpath:467609-476394

Propchange: harmony/enhanced/branches/java6/jdktools/modules/jretools/.project
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 18:19:45 2010
@@ -1,3 +1,3 @@
 /harmony/enhanced/jdktools/trunk/modules/jretools/.project:702140-925933
-/harmony/enhanced/trunk/jdktools/modules/jretools/.project:926309-926505
+/harmony/enhanced/trunk/jdktools/modules/jretools/.project:926309-926569
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/.project:467609-476394

Propchange: harmony/enhanced/branches/java6/jdktools/modules/jretools/.settings/org.eclipse.jdt.core.prefs
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 18:19:45 2010
@@ -1,3 +1,3 @@
 /harmony/enhanced/jdktools/trunk/modules/jretools/.settings/org.eclipse.jdt.core.prefs:702140-925933
-/harmony/enhanced/trunk/jdktools/modules/jretools/.settings/org.eclipse.jdt.core.prefs:926309-926505
+/harmony/enhanced/trunk/jdktools/modules/jretools/.settings/org.eclipse.jdt.core.prefs:926309-926569
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/.settings/org.eclipse.jdt.core.prefs:467609-476394

Propchange: harmony/enhanced/branches/java6/jdktools/modules/jretools/.settings/org.eclipse.jdt.ui.prefs
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 18:19:45 2010
@@ -1,3 +1,3 @@
 /harmony/enhanced/jdktools/trunk/modules/jretools/.settings/org.eclipse.jdt.ui.prefs:702140-925933
-/harmony/enhanced/trunk/jdktools/modules/jretools/.settings/org.eclipse.jdt.ui.prefs:926309-926505
+/harmony/enhanced/trunk/jdktools/modules/jretools/.settings/org.eclipse.jdt.ui.prefs:926309-926569
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/.settings/org.eclipse.jdt.ui.prefs:467609-476394

Propchange: harmony/enhanced/branches/java6/jdktools/modules/jretools/META-INF/MANIFEST.MF
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 18:19:45 2010
@@ -1,3 +1,3 @@
 /harmony/enhanced/jdktools/trunk/modules/jretools/META-INF/MANIFEST.MF:702140-925933
-/harmony/enhanced/trunk/jdktools/modules/jretools/META-INF/MANIFEST.MF:926309-926505
+/harmony/enhanced/trunk/jdktools/modules/jretools/META-INF/MANIFEST.MF:926309-926569
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/META-INF/MANIFEST.MF:467609-476394

Propchange: harmony/enhanced/branches/java6/jdktools/modules/jretools/build.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 18:19:45 2010
@@ -1,3 +1,3 @@
 /harmony/enhanced/jdktools/trunk/modules/jretools/build.xml:702140-925933
-/harmony/enhanced/trunk/jdktools/modules/jretools/build.xml:926309-926505
+/harmony/enhanced/trunk/jdktools/modules/jretools/build.xml:926309-926569
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/build.xml:467609-476394

Propchange: harmony/enhanced/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/internal/nls/Messages.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 18:19:45 2010
@@ -1,3 +1,3 @@
 /harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/internal/nls/Messages.java:702140-925933
-/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/internal/nls/Messages.java:926309-926505
+/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/internal/nls/Messages.java:926309-926569
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/internal/nls/Messages.java:467609-476394

Propchange: harmony/enhanced/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/internal/nls/messages.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 18:19:45 2010
@@ -1,3 +1,3 @@
 /harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/internal/nls/messages.properties:702140-925933
-/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/internal/nls/messages.properties:926309-926505
+/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/internal/nls/messages.properties:926309-926569
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/internal/nls/messages.properties:467609-476394

Propchange: harmony/enhanced/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/ArgumentsParser.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 18:19:45 2010
@@ -1,3 +1,3 @@
 /harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/ArgumentsParser.java:702140-925933
-/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/ArgumentsParser.java:926309-926505
+/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/ArgumentsParser.java:926309-926569
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/ArgumentsParser.java:467609-476394

Propchange: harmony/enhanced/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CRLManager.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 18:19:45 2010
@@ -1,3 +1,3 @@
 /harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CRLManager.java:702140-925933
-/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CRLManager.java:926309-926505
+/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CRLManager.java:926309-926569
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CRLManager.java:467609-476394

Propchange: harmony/enhanced/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CSRGenerator.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 18:19:45 2010
@@ -1,3 +1,3 @@
 /harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CSRGenerator.java:702140-925933
-/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CSRGenerator.java:926309-926505
+/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CSRGenerator.java:926309-926569
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CSRGenerator.java:467609-476394

Propchange: harmony/enhanced/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertChainVerifier.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 18:19:45 2010
@@ -1,3 +1,3 @@
 /harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertChainVerifier.java:702140-925933
-/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertChainVerifier.java:926309-926505
+/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertChainVerifier.java:926309-926569
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertChainVerifier.java:467609-476394

Propchange: harmony/enhanced/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertExporter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 18:19:45 2010
@@ -1,3 +1,3 @@
 /harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertExporter.java:702140-925933
-/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertExporter.java:926309-926505
+/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertExporter.java:926309-926569
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertExporter.java:467609-476394

Propchange: harmony/enhanced/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertImporter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 18:19:45 2010
@@ -1,3 +1,3 @@
 /harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertImporter.java:702140-925933
-/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertImporter.java:926309-926505
+/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertImporter.java:926309-926569
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertImporter.java:467609-476394

Propchange: harmony/enhanced/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertReader.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 18:19:45 2010
@@ -1,3 +1,3 @@
 /harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertReader.java:702140-925933
-/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertReader.java:926309-926505
+/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertReader.java:926309-926569
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertReader.java:467609-476394

Propchange: harmony/enhanced/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/Command.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 18:19:45 2010
@@ -1,3 +1,3 @@
 /harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/Command.java:702140-925933
-/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/Command.java:926309-926505
+/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/Command.java:926309-926569
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/Command.java:467609-476394

Propchange: harmony/enhanced/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/EntryManager.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 18:19:45 2010
@@ -1,3 +1,3 @@
 /harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/EntryManager.java:702140-925933
-/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/EntryManager.java:926309-926505
+/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/EntryManager.java:926309-926569
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/EntryManager.java:467609-476394

Propchange: harmony/enhanced/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/HelpPrinter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 18:19:45 2010
@@ -1,3 +1,3 @@
 /harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/HelpPrinter.java:702140-925933
-/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/HelpPrinter.java:926309-926505
+/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/HelpPrinter.java:926309-926569
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/HelpPrinter.java:467609-476394

Propchange: harmony/enhanced/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyCertGenerator.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 18:19:45 2010
@@ -1,3 +1,3 @@
 /harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyCertGenerator.java:702140-925933
-/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyCertGenerator.java:926309-926505
+/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyCertGenerator.java:926309-926569
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyCertGenerator.java:467609-476394

Propchange: harmony/enhanced/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyStoreCertPrinter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 18:19:45 2010
@@ -1,3 +1,3 @@
 /harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyStoreCertPrinter.java:702140-925933
-/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyStoreCertPrinter.java:926309-926505
+/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyStoreCertPrinter.java:926309-926569
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyStoreCertPrinter.java:467609-476394

Propchange: harmony/enhanced/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyStoreConverter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 18:19:45 2010
@@ -1,3 +1,3 @@
 /harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyStoreConverter.java:702140-925933
-/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyStoreConverter.java:926309-926505
+/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyStoreConverter.java:926309-926569
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyStoreConverter.java:467609-476394

Propchange: harmony/enhanced/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolException.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 18:19:45 2010
@@ -1,3 +1,3 @@
 /harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolException.java:702140-925933
-/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolException.java:926309-926505
+/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolException.java:926309-926569
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolException.java:467609-476394

Propchange: harmony/enhanced/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolKSLoaderSaver.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 18:19:45 2010
@@ -1,3 +1,3 @@
 /harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolKSLoaderSaver.java:702140-925933
-/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolKSLoaderSaver.java:926309-926505
+/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolKSLoaderSaver.java:926309-926569
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolKSLoaderSaver.java:467609-476394

Propchange: harmony/enhanced/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolParameters.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 18:19:45 2010
@@ -1,3 +1,3 @@
 /harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolParameters.java:702140-925933
-/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolParameters.java:926309-926505
+/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolParameters.java:926309-926569
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolParameters.java:467609-476394

Propchange: harmony/enhanced/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/Main.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 18:19:45 2010
@@ -1,3 +1,3 @@
 /harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/Main.java:702140-925933
-/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/Main.java:926309-926505
+/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/Main.java:926309-926569
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/Main.java:467609-476394

Propchange: harmony/enhanced/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/toolutils/KeyStoreLoaderSaver.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 18:19:45 2010
@@ -1,3 +1,3 @@
 /harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/toolutils/KeyStoreLoaderSaver.java:702140-925933
-/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/toolutils/KeyStoreLoaderSaver.java:926309-926505
+/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/toolutils/KeyStoreLoaderSaver.java:926309-926569
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/toolutils/KeyStoreLoaderSaver.java:467609-476394

Propchange: harmony/enhanced/branches/java6/jdktools/modules/jretools/src/test/java/org/apache/harmony/jretools/tests/keytool/GenKeyTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 18:19:45 2010
@@ -1,3 +1,3 @@
 /harmony/enhanced/jdktools/trunk/modules/jretools/src/test/java/org/apache/harmony/jretools/tests/keytool/GenKeyTest.java:702140-925933
-/harmony/enhanced/trunk/jdktools/modules/jretools/src/test/java/org/apache/harmony/jretools/tests/keytool/GenKeyTest.java:926309-926505
+/harmony/enhanced/trunk/jdktools/modules/jretools/src/test/java/org/apache/harmony/jretools/tests/keytool/GenKeyTest.java:926309-926569
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/test/java/org/apache/harmony/jretools/tests/keytool/GenKeyTest.java:467609-476394

Propchange: harmony/enhanced/branches/java6/jdktools/modules/jretools/src/test/java/org/apache/harmony/jretools/tests/keytool/TestUtils.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 18:19:45 2010
@@ -1,3 +1,3 @@
 /harmony/enhanced/jdktools/trunk/modules/jretools/src/test/java/org/apache/harmony/jretools/tests/keytool/TestUtils.java:702140-925933
-/harmony/enhanced/trunk/jdktools/modules/jretools/src/test/java/org/apache/harmony/jretools/tests/keytool/TestUtils.java:926309-926505
+/harmony/enhanced/trunk/jdktools/modules/jretools/src/test/java/org/apache/harmony/jretools/tests/keytool/TestUtils.java:926309-926569
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/test/java/org/apache/harmony/jretools/tests/keytool/TestUtils.java:467609-476394

Propchange: harmony/enhanced/branches/java6/jdktools/modules/jretools/src/test/java/org/apache/harmony/jretools/tests/toolutils/KeyStoreLoaderSaverTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 18:19:45 2010
@@ -1,3 +1,3 @@
 /harmony/enhanced/jdktools/trunk/modules/jretools/src/test/java/org/apache/harmony/jretools/tests/toolutils/KeyStoreLoaderSaverTest.java:702140-925933
-/harmony/enhanced/trunk/jdktools/modules/jretools/src/test/java/org/apache/harmony/jretools/tests/toolutils/KeyStoreLoaderSaverTest.java:926309-926505
+/harmony/enhanced/trunk/jdktools/modules/jretools/src/test/java/org/apache/harmony/jretools/tests/toolutils/KeyStoreLoaderSaverTest.java:926309-926569
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/test/java/org/apache/harmony/jretools/tests/toolutils/KeyStoreLoaderSaverTest.java:467609-476394



Mime
View raw message