harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r927401 [3/3] - in /harmony/enhanced/branches/java6: ./ classlib/ classlib/depends/libs/ classlib/make/ classlib/modules/archive/src/main/java/java/util/jar/ classlib/modules/archive/src/main/java/java/util/zip/ classlib/modules/archive/src...
Date Thu, 25 Mar 2010 13:48:26 GMT
Modified: harmony/enhanced/branches/java6/classlib/modules/lang-management/src/main/java/org/apache/harmony/lang/management/ManagementUtils.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/branches/java6/classlib/modules/lang-management/src/main/java/org/apache/harmony/lang/management/ManagementUtils.java?rev=927401&r1=927400&r2=927401&view=diff
==============================================================================
--- harmony/enhanced/branches/java6/classlib/modules/lang-management/src/main/java/org/apache/harmony/lang/management/ManagementUtils.java (original)
+++ harmony/enhanced/branches/java6/classlib/modules/lang-management/src/main/java/org/apache/harmony/lang/management/ManagementUtils.java Thu Mar 25 13:48:22 2010
@@ -1508,7 +1508,7 @@ public class ManagementUtils {
 
     /**
      * Convenience method that returns a boolean indication of whether or not
-     * concrete instances of the the supplied interface type
+     * concrete instances of the supplied interface type
      * <code>mxbeanInterface</code> should also be implementors of the
      * interface <code>javax.management.NotificationEmitter</code>.
      * 

Propchange: harmony/enhanced/branches/java6/classlib/modules/lang-management/src/test/api/java/org/apache/harmony/lang/management/tests/java/util/logging/
            ('svn:mergeinfo' removed)

Modified: harmony/enhanced/branches/java6/classlib/modules/luni/make/findbugs-exclude-filter.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/branches/java6/classlib/modules/luni/make/findbugs-exclude-filter.xml?rev=927401&r1=927400&r2=927401&view=diff
==============================================================================
--- harmony/enhanced/branches/java6/classlib/modules/luni/make/findbugs-exclude-filter.xml (original)
+++ harmony/enhanced/branches/java6/classlib/modules/luni/make/findbugs-exclude-filter.xml Thu Mar 25 13:48:22 2010
@@ -84,7 +84,7 @@
     </Match>
 
     <!--
-        OK to compare Strings using using == or != in the String class itself
+        OK to compare Strings using == or != in the String class itself
     -->
     <Match>
         <Class name="java.lang.String" />

Modified: harmony/enhanced/branches/java6/classlib/modules/luni/src/main/java/java/io/CharArrayReader.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/branches/java6/classlib/modules/luni/src/main/java/java/io/CharArrayReader.java?rev=927401&r1=927400&r2=927401&view=diff
==============================================================================
--- harmony/enhanced/branches/java6/classlib/modules/luni/src/main/java/java/io/CharArrayReader.java (original)
+++ harmony/enhanced/branches/java6/classlib/modules/luni/src/main/java/java/io/CharArrayReader.java Thu Mar 25 13:48:22 2010
@@ -47,7 +47,7 @@ public class CharArrayReader extends Rea
 
     /**
      * Constructs a CharArrayReader on the char array {@code buf}. The size of
-     * the reader is set to the length of the buffer and the object to to read
+     * the reader is set to the length of the buffer and the object to read
      * from is set to {@code buf}.
      * 
      * @param buf

Modified: harmony/enhanced/branches/java6/classlib/modules/luni/src/main/java/java/io/InvalidClassException.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/branches/java6/classlib/modules/luni/src/main/java/java/io/InvalidClassException.java?rev=927401&r1=927400&r2=927401&view=diff
==============================================================================
--- harmony/enhanced/branches/java6/classlib/modules/luni/src/main/java/java/io/InvalidClassException.java (original)
+++ harmony/enhanced/branches/java6/classlib/modules/luni/src/main/java/java/io/InvalidClassException.java Thu Mar 25 13:48:22 2010
@@ -18,7 +18,7 @@
 package java.io;
 
 /**
- * Signals a problem during the serialization or or deserialization of an
+ * Signals a problem during the serialization or deserialization of an
  * object. Possible reasons include:
  * <ul>
  * <li>The SUIDs of the class loaded by the VM and the serialized class info do

Modified: harmony/enhanced/branches/java6/classlib/modules/luni/src/main/java/java/io/ObjectStreamField.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/branches/java6/classlib/modules/luni/src/main/java/java/io/ObjectStreamField.java?rev=927401&r1=927400&r2=927401&view=diff
==============================================================================
--- harmony/enhanced/branches/java6/classlib/modules/luni/src/main/java/java/io/ObjectStreamField.java (original)
+++ harmony/enhanced/branches/java6/classlib/modules/luni/src/main/java/java/io/ObjectStreamField.java Thu Mar 25 13:48:22 2010
@@ -125,6 +125,7 @@ public class ObjectStreamField implement
         }
         this.name = name;
         this.typeString = signature.replace('.', '/').intern();
+        defaultResolve();
         this.isDeserialized = true;
     }
 
@@ -337,34 +338,13 @@ public class ObjectStreamField implement
             // primitive type declared in a serializable class
             typeString = String.valueOf(getTypeCode());
         }
+
         if (typeString.length() == 1) {
-            switch (typeString.charAt(0)) {
-                case 'I':
-                    type = Integer.TYPE;
-                    return;
-                case 'B':
-                    type = Byte.TYPE;
-                    return;
-                case 'C':
-                    type = Character.TYPE;
-                    return;
-                case 'S':
-                    type = Short.TYPE;
-                    return;
-                case 'Z':
-                    type = Boolean.TYPE;
-                    return;
-                case 'J':
-                    type = Long.TYPE;
-                    return;
-                case 'F':
-                    type = Float.TYPE;
-                    return;
-                case 'D':
-                    type = Double.TYPE;
-                    return;
+            if (defaultResolve()) {
+                return;
             }
         }
+
         String className = typeString.replace('/', '.');
         if (className.charAt(0) == 'L') {
             // remove L and ;
@@ -380,7 +360,7 @@ public class ObjectStreamField implement
     }
 
     /**
-     * Indicats whether this field is unshared.
+     * Indicates whether this field is unshared.
      * 
      * @return {@code true} if this field is unshared, {@code false} otherwise.
      */
@@ -391,4 +371,40 @@ public class ObjectStreamField implement
     void setUnshared(boolean unshared) {
         this.unshared = unshared;
     }
+
+    /**
+     * Resolves typeString into type. Returns true if the type is primitive
+     * and false otherwise.
+     */
+    private boolean defaultResolve() {
+        switch (typeString.charAt(0)) {
+            case 'I':
+                type = Integer.TYPE;
+                return true;
+            case 'B':
+                type = Byte.TYPE;
+                return true;
+            case 'C':
+                type = Character.TYPE;
+                return true;
+            case 'S':
+                type = Short.TYPE;
+                return true;
+            case 'Z':
+                type = Boolean.TYPE;
+                return true;
+            case 'J':
+                type = Long.TYPE;
+                return true;
+            case 'F':
+                type = Float.TYPE;
+                return true;
+            case 'D':
+                type = Double.TYPE;
+                return true;
+            default:
+                type = Object.class;
+                return false;
+        }
+    }
 }

Modified: harmony/enhanced/branches/java6/classlib/modules/luni/src/main/java/java/lang/Math.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/branches/java6/classlib/modules/luni/src/main/java/java/lang/Math.java?rev=927401&r1=927400&r2=927401&view=diff
==============================================================================
--- harmony/enhanced/branches/java6/classlib/modules/luni/src/main/java/java/lang/Math.java (original)
+++ harmony/enhanced/branches/java6/classlib/modules/luni/src/main/java/java/lang/Math.java Thu Mar 25 13:48:22 2010
@@ -421,7 +421,7 @@ public final class Math {
      *            the numerator of the operation.
      * @param y
      *            the denominator of the operation.
-     * @return the IEEE754 floating point reminder of of {@code x/y}.
+     * @return the IEEE754 floating point reminder of {@code x/y}.
      */
     public static native double IEEEremainder(double x, double y);
 

Modified: harmony/enhanced/branches/java6/classlib/modules/luni/src/main/java/java/lang/StrictMath.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/branches/java6/classlib/modules/luni/src/main/java/java/lang/StrictMath.java?rev=927401&r1=927400&r2=927401&view=diff
==============================================================================
--- harmony/enhanced/branches/java6/classlib/modules/luni/src/main/java/java/lang/StrictMath.java (original)
+++ harmony/enhanced/branches/java6/classlib/modules/luni/src/main/java/java/lang/StrictMath.java Thu Mar 25 13:48:22 2010
@@ -423,7 +423,7 @@ public final class StrictMath {
      *            the numerator of the operation.
      * @param y
      *            the denominator of the operation.
-     * @return the IEEE754 floating point reminder of of {@code x/y}.
+     * @return the IEEE754 floating point reminder of {@code x/y}.
      */
     public static native double IEEEremainder(double x, double y);
 

Modified: harmony/enhanced/branches/java6/classlib/modules/luni/src/main/java/java/net/URI.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/branches/java6/classlib/modules/luni/src/main/java/java/net/URI.java?rev=927401&r1=927400&r2=927401&view=diff
==============================================================================
--- harmony/enhanced/branches/java6/classlib/modules/luni/src/main/java/java/net/URI.java (original)
+++ harmony/enhanced/branches/java6/classlib/modules/luni/src/main/java/java/net/URI.java Thu Mar 25 13:48:22 2010
@@ -1011,8 +1011,8 @@ public final class URI implements Compar
 
     /*
      * Takes two strings that may contain hex sequences like %F1 or %2b and
-     * compares them, ignoring case for the hex values hex values must always
-     * occur in pairs like above
+     * compares them, ignoring case for the hex values. Hex values must always
+     * occur in pairs as above
      */
     private boolean equalsHexCaseInsensitive(String first, String second) {
         if (first.indexOf('%') != second.indexOf('%')) {

Modified: harmony/enhanced/branches/java6/classlib/modules/luni/src/main/java/java/util/Currency.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/branches/java6/classlib/modules/luni/src/main/java/java/util/Currency.java?rev=927401&r1=927400&r2=927401&view=diff
==============================================================================
--- harmony/enhanced/branches/java6/classlib/modules/luni/src/main/java/java/util/Currency.java (original)
+++ harmony/enhanced/branches/java6/classlib/modules/luni/src/main/java/java/util/Currency.java Thu Mar 25 13:48:22 2010
@@ -115,7 +115,7 @@ public final class Currency implements S
      * Returns the symbol for this currency in the given {@code Locale}.
      * <p>
      * If the locale doesn't have any countries (e.g.
-     * {@code Locale.JAPANESE, new Locale("en","")}), the the ISO
+     * {@code Locale.JAPANESE, new Locale("en","")}), then the ISO
      * 4217 currency code is returned.
      * <p>
      * First the locale's resource bundle is checked, if the locale has the same currency,

Modified: harmony/enhanced/branches/java6/classlib/modules/luni/src/main/java/org/apache/harmony/luni/net/PlainDatagramSocketImpl.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/branches/java6/classlib/modules/luni/src/main/java/org/apache/harmony/luni/net/PlainDatagramSocketImpl.java?rev=927401&r1=927400&r2=927401&view=diff
==============================================================================
--- harmony/enhanced/branches/java6/classlib/modules/luni/src/main/java/org/apache/harmony/luni/net/PlainDatagramSocketImpl.java (original)
+++ harmony/enhanced/branches/java6/classlib/modules/luni/src/main/java/org/apache/harmony/luni/net/PlainDatagramSocketImpl.java Thu Mar 25 13:48:22 2010
@@ -287,7 +287,7 @@ public class PlainDatagramSocketImpl ext
     public void setOption(int optID, Object val) throws SocketException {
         /*
          * for datagram sockets on some platforms we have to set both the
-         * REUSEADDR AND REUSEPORT so for REUSEADDR set this option option which
+         * REUSEADDR AND REUSEPORT so for REUSEADDR set this option which
          * tells the VM to set the two values as appropriate for the platform
          */
         if (optID == SocketOptions.SO_REUSEADDR) {

Modified: harmony/enhanced/branches/java6/classlib/modules/luni/src/main/java/org/apache/harmony/luni/util/FloatingPointParser.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/branches/java6/classlib/modules/luni/src/main/java/org/apache/harmony/luni/util/FloatingPointParser.java?rev=927401&r1=927400&r2=927401&view=diff
==============================================================================
--- harmony/enhanced/branches/java6/classlib/modules/luni/src/main/java/org/apache/harmony/luni/util/FloatingPointParser.java (original)
+++ harmony/enhanced/branches/java6/classlib/modules/luni/src/main/java/org/apache/harmony/luni/util/FloatingPointParser.java Thu Mar 25 13:48:22 2010
@@ -42,7 +42,7 @@ public final class FloatingPointParser {
 	 * Takes a String and an integer exponent. The String should hold a positive
 	 * integer value (or zero). The exponent will be used to calculate the
 	 * floating point number by taking the positive integer the String
-	 * represents and multiplying by 10 raised to the power of the of the
+	 * represents and multiplying by 10 raised to the power of the
 	 * exponent. Returns the closest double value to the real number
 	 * 
 	 * @param s
@@ -60,7 +60,7 @@ public final class FloatingPointParser {
 	 * Takes a String and an integer exponent. The String should hold a positive
 	 * integer value (or zero). The exponent will be used to calculate the
 	 * floating point number by taking the positive integer the String
-	 * represents and multiplying by 10 raised to the power of the of the
+	 * represents and multiplying by 10 raised to the power of the
 	 * exponent. Returns the closest float value to the real number
 	 * 
 	 * @param s
@@ -80,7 +80,7 @@ public final class FloatingPointParser {
 	 * space and trailing zeroes eliminated. The exponent of the
 	 * StringExponentPair will be used to calculate the floating point number by
 	 * taking the positive integer the String represents and multiplying by 10
-	 * raised to the power of the of the exponent.
+	 * raised to the power of the exponent.
 	 * 
 	 * @param s
 	 *            the String that will be parsed to a floating point

Propchange: harmony/enhanced/branches/java6/classlib/modules/luni/src/main/native/include/fdlibm.h
            ('svn:mergeinfo' removed)

Propchange: harmony/enhanced/branches/java6/classlib/modules/luni/src/main/native/include/gp.h
            ('svn:mergeinfo' removed)

Propchange: harmony/enhanced/branches/java6/classlib/modules/luni/src/main/native/include/hymagic.h
            ('svn:mergeinfo' removed)

Propchange: harmony/enhanced/branches/java6/classlib/modules/luni/src/main/native/include/hysocket.h
            ('svn:mergeinfo' removed)

Propchange: harmony/enhanced/branches/java6/classlib/modules/luni/src/main/native/include/hyvmls.h
            ('svn:mergeinfo' removed)

Propchange: harmony/enhanced/branches/java6/classlib/modules/luni/src/main/native/include/jni.h
            ('svn:mergeinfo' removed)

Propchange: harmony/enhanced/branches/java6/classlib/modules/luni/src/main/native/include/jni_types.h
            ('svn:mergeinfo' removed)

Propchange: harmony/enhanced/branches/java6/classlib/modules/luni/src/main/native/include/jvmpi.h
            ('svn:mergeinfo' removed)

Propchange: harmony/enhanced/branches/java6/classlib/modules/luni/src/main/native/include/jvmri.h
            ('svn:mergeinfo' removed)

Propchange: harmony/enhanced/branches/java6/classlib/modules/luni/src/main/native/include/jvmti.h
            ('svn:mergeinfo' removed)

Propchange: harmony/enhanced/branches/java6/classlib/modules/luni/src/main/native/include/jvmti_types.h
            ('svn:mergeinfo' removed)

Propchange: harmony/enhanced/branches/java6/classlib/modules/luni/src/main/native/include/vmi.h
            ('svn:mergeinfo' removed)

Propchange: harmony/enhanced/branches/java6/classlib/modules/luni/src/main/native/include/vmizip.h
            ('svn:mergeinfo' removed)

Modified: harmony/enhanced/branches/java6/classlib/modules/luni/src/main/native/launcher/shared/main.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/branches/java6/classlib/modules/luni/src/main/native/launcher/shared/main.c?rev=927401&r1=927400&r2=927401&view=diff
==============================================================================
--- harmony/enhanced/branches/java6/classlib/modules/luni/src/main/native/launcher/shared/main.c (original)
+++ harmony/enhanced/branches/java6/classlib/modules/luni/src/main/native/launcher/shared/main.c Thu Mar 25 13:48:22 2010
@@ -1152,7 +1152,7 @@ addDirsToPath (int count, char *newPathT
    *  now set the new path, and in case of !Windows, execv() to 
    *  restart.  Don't free newPath, as the docs say that the 
    *  string becomes part of the environment, which sounds nutty
-   *  but at worst, it's a leak of of one string under windows
+   *  but at worst, it's a leak of one string under windows
    */
      
 #if defined(WIN32)

Modified: harmony/enhanced/branches/java6/classlib/modules/luni/src/main/native/luni/shared/cbigint.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/branches/java6/classlib/modules/luni/src/main/native/luni/shared/cbigint.c?rev=927401&r1=927400&r2=927401&view=diff
==============================================================================
--- harmony/enhanced/branches/java6/classlib/modules/luni/src/main/native/luni/shared/cbigint.c (original)
+++ harmony/enhanced/branches/java6/classlib/modules/luni/src/main/native/luni/shared/cbigint.c Thu Mar 25 13:48:22 2010
@@ -718,7 +718,7 @@ timesTenToTheEHighPrecision (U_64 * resu
      result[length++] = overflow;
      } while (--e);
    */
-  /* Replace the current implementaion which performs a
+  /* Replace the current implementation which performs a
    * "multiplication" by 10 e number of times with an actual
    * multiplication. 10e19 is the largest exponent to the power of ten
    * that will fit in a 64-bit integer, and 10e9 is the largest exponent to

Modified: harmony/enhanced/branches/java6/classlib/modules/luni/src/main/native/luni/shared/netif.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/branches/java6/classlib/modules/luni/src/main/native/luni/shared/netif.c?rev=927401&r1=927400&r2=927401&view=diff
==============================================================================
--- harmony/enhanced/branches/java6/classlib/modules/luni/src/main/native/luni/shared/netif.c (original)
+++ harmony/enhanced/branches/java6/classlib/modules/luni/src/main/native/luni/shared/netif.c Thu Mar 25 13:48:22 2010
@@ -190,7 +190,8 @@ Java_java_net_NetworkInterface_getNetwor
             }
         }
 
-      /* now  create the NetworkInterface object for this interface and then add it it ot the arrary that will be returned */
+      /* now create the NetworkInterface object for this interface and
+         then add it to the array that will be returned */
       currentInterface =
         (*env)->NewObject (env, networkInterfaceClass, methodID, name,
                            displayName, addresses,

Modified: harmony/enhanced/branches/java6/classlib/modules/luni/src/main/native/luni/shared/socket.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/branches/java6/classlib/modules/luni/src/main/native/luni/shared/socket.c?rev=927401&r1=927400&r2=927401&view=diff
==============================================================================
--- harmony/enhanced/branches/java6/classlib/modules/luni/src/main/native/luni/shared/socket.c (original)
+++ harmony/enhanced/branches/java6/classlib/modules/luni/src/main/native/luni/shared/socket.c Thu Mar 25 13:48:22 2010
@@ -890,7 +890,7 @@ setByteSocketOption (JNIEnv * env, hysoc
  * @param	env			pointer to the JNI library
  * @param	socketP		pointer to the hysocket to query
  *
- * @return	the index for the interface interface bound to the multicast socket
+ * @return	the index for the interface bound to the multicast socket
  * @exception	SocketException	if an error occurs during the call
  */
 

Modified: harmony/enhanced/branches/java6/classlib/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/lang/reflect/FieldTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/branches/java6/classlib/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/lang/reflect/FieldTest.java?rev=927401&r1=927400&r2=927401&view=diff
==============================================================================
--- harmony/enhanced/branches/java6/classlib/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/lang/reflect/FieldTest.java (original)
+++ harmony/enhanced/branches/java6/classlib/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/lang/reflect/FieldTest.java Thu Mar 25 13:48:22 2010
@@ -315,7 +315,7 @@ public class FieldTest extends junit.fra
 
 		// The test will attempt to use pass an object to set for object, byte,
 		// short, ..., float and double fields
-		// and pass a byte to to setByte for byte, short, ..., float and double
+		// and pass a byte to setByte for byte, short, ..., float and double
 		// fields and so on.
 		// It will also test if IllegalArgumentException is thrown when the
 		// field does not exist in the given object and that

Modified: harmony/enhanced/branches/java6/classlib/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/ProxySelectorTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/branches/java6/classlib/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/ProxySelectorTest.java?rev=927401&r1=927400&r2=927401&view=diff
==============================================================================
--- harmony/enhanced/branches/java6/classlib/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/ProxySelectorTest.java (original)
+++ harmony/enhanced/branches/java6/classlib/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/ProxySelectorTest.java Thu Mar 25 13:48:22 2010
@@ -506,7 +506,7 @@ public class ProxySelectorTest extends T
 		assertNotNull(proxyList2);
 		assertEquals(1, proxyList2.size());
 		Proxy proxy2 = (Proxy) proxyList2.get(0);
-		// Default implemention doesn't change the proxy list
+		// Default implementation doesn't change the proxy list
 		assertEquals(proxy1, proxy2);
 	}
 

Modified: harmony/enhanced/branches/java6/classlib/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/ServerSocketTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/branches/java6/classlib/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/ServerSocketTest.java?rev=927401&r1=927400&r2=927401&view=diff
==============================================================================
--- harmony/enhanced/branches/java6/classlib/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/ServerSocketTest.java (original)
+++ harmony/enhanced/branches/java6/classlib/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/ServerSocketTest.java Thu Mar 25 13:48:22 2010
@@ -542,7 +542,7 @@ public class ServerSocketTest extends So
         // checks if it is a least a certain number as some platforms make
         // it higher than we request. Unfortunately non-server versions of
         // windows artificially limit the backlog to 5 and 5 is the
-        // historical default so it it not a great test.
+        // historical default so it is not a great test.
         theSocket = new ServerSocket();
         theAddress = new InetSocketAddress(InetAddress.getLocalHost(), 0);
         theSocket.bind(theAddress, 4);

Modified: harmony/enhanced/branches/java6/classlib/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/PropertyResourceBundleTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/branches/java6/classlib/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/PropertyResourceBundleTest.java?rev=927401&r1=927400&r2=927401&view=diff
==============================================================================
--- harmony/enhanced/branches/java6/classlib/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/PropertyResourceBundleTest.java (original)
+++ harmony/enhanced/branches/java6/classlib/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/PropertyResourceBundleTest.java Thu Mar 25 13:48:22 2010
@@ -167,7 +167,7 @@ public class PropertyResourceBundleTest 
     /**
      * @add tests {@link java.util.PropertyResourceBundle#Enumeration}
      */
-    public void test_access$0_Enumberation() throws IOException {
+    public void test_access$0_Enumeration() throws IOException {
         class MockResourceBundle extends PropertyResourceBundle {
             MockResourceBundle(java.io.InputStream stream) throws IOException {
                 super(stream);

Propchange: harmony/enhanced/branches/java6/classlib/modules/luni/src/test/resources/net.resources/
            ('svn:mergeinfo' removed)

Modified: harmony/enhanced/branches/java6/classlib/modules/luni/src/test/resources/net.resources/README.txt
URL: http://svn.apache.org/viewvc/harmony/enhanced/branches/java6/classlib/modules/luni/src/test/resources/net.resources/README.txt?rev=927401&r1=927400&r2=927401&view=diff
==============================================================================
--- harmony/enhanced/branches/java6/classlib/modules/luni/src/test/resources/net.resources/README.txt (original)
+++ harmony/enhanced/branches/java6/classlib/modules/luni/src/test/resources/net.resources/README.txt Thu Mar 25 13:48:22 2010
@@ -96,8 +96,7 @@ The key properties required by the java.
 * WebName : The unqualified name of the host where the HTTP server is running.
 
 * TestResourcesDir : the name of the folder on the HTTP server beneath the
-                     document root where the where the web resources have been
-                     deployed. 
+                     document root where the web resources have been deployed. 
 
 * HomeAddressResponse : the expected response returned from a successful get 
                         from the HTTP server.

Propchange: harmony/enhanced/branches/java6/classlib/modules/pack200/depends/manifests/asm-3.1/
            ('svn:mergeinfo' removed)

Modified: harmony/enhanced/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/ClassBands.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/ClassBands.java?rev=927401&r1=927400&r2=927401&view=diff
==============================================================================
--- harmony/enhanced/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/ClassBands.java (original)
+++ harmony/enhanced/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/ClassBands.java Thu Mar 25 13:48:22 2010
@@ -1313,7 +1313,7 @@ public class ClassBands extends BandSet 
     }
 
     /**
-     * Answer an ArrayList of ArrayLists which hold the the code attributes
+     * Answer an ArrayList of ArrayLists which hold the code attributes
      * corresponding to all classes in order.
      *
      * If a class doesn't have any attributes, the corresponding element in this

Propchange: harmony/enhanced/branches/java6/classlib/modules/pack200/src/main/java5/org/apache/harmony/pack200/Pack200Adapter.java
            ('svn:mergeinfo' removed)

Propchange: harmony/enhanced/branches/java6/classlib/modules/pack200/src/main/java5/org/apache/harmony/pack200/Pack200PackerAdapter.java
            ('svn:mergeinfo' removed)

Propchange: harmony/enhanced/branches/java6/classlib/modules/swing/src/test/api/java.injected/javax/swing/BasicSwingTestCase.java
            ('svn:mergeinfo' removed)

Propchange: harmony/enhanced/branches/java6/classlib/modules/swing/src/test/api/java.injected/javax/swing/SwingTestCase.java
            ('svn:mergeinfo' removed)

Propchange: harmony/enhanced/branches/java6/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/parser/
            ('svn:mergeinfo' removed)

Modified: harmony/enhanced/branches/java6/classlib/modules/text/src/main/java/java/text/NumberFormat.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/branches/java6/classlib/modules/text/src/main/java/java/text/NumberFormat.java?rev=927401&r1=927400&r2=927401&view=diff
==============================================================================
--- harmony/enhanced/branches/java6/classlib/modules/text/src/main/java/java/text/NumberFormat.java (original)
+++ harmony/enhanced/branches/java6/classlib/modules/text/src/main/java/java/text/NumberFormat.java Thu Mar 25 13:48:22 2010
@@ -521,7 +521,7 @@ public abstract class NumberFormat exten
      * stops if a decimal separator is encountered.
      * 
      * @return {@code true} if this number format only parses integers,
-     *         {@code false} if if parsese integers as well as fractions.
+     *         {@code false} if it parses integers as well as fractions.
      */
     public boolean isParseIntegerOnly() {
         return parseIntegerOnly;

Propchange: harmony/enhanced/branches/java6/common_resources/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 25 13:48:22 2010
@@ -1,2 +1,2 @@
-/harmony/enhanced/trunk/common_resources:476396-920147,921783-926569
+/harmony/enhanced/trunk/common_resources:476396-920147,921783-927388
 /incubator/harmony/enhanced/trunk/common_resources:423974-476394

Propchange: harmony/enhanced/branches/java6/drlvm/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 25 13:48:22 2010
@@ -1,3 +1,3 @@
-/harmony/enhanced/trunk/drlvm:810871-926569
+/harmony/enhanced/trunk/drlvm:810871-927388
 /harmony/enhanced/trunk/working_vm:476396-920147
 /incubator/harmony/enhanced/trunk/working_vm:423974-476394

Propchange: harmony/enhanced/branches/java6/jdktools/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 25 13:48:22 2010
@@ -1,4 +1,4 @@
 /harmony/enhanced/jdktools/trunk:630107-925933
-/harmony/enhanced/trunk/jdktools:926309-926569
+/harmony/enhanced/trunk/jdktools:926309-927388
 /harmony/enhanced/trunk/working_jdktools:476396-920147
 /incubator/harmony/enhanced/trunk/working_jdktools:423974-476394

Modified: harmony/enhanced/branches/java6/jdktools/modules/jdktools/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/branches/java6/jdktools/modules/jdktools/build.xml?rev=927401&r1=927400&r2=927401&view=diff
==============================================================================
--- harmony/enhanced/branches/java6/jdktools/modules/jdktools/build.xml (original)
+++ harmony/enhanced/branches/java6/jdktools/modules/jdktools/build.xml Thu Mar 25 13:48:22 2010
@@ -106,7 +106,7 @@
             <classpath>
                 <pathelement path="${jdt.jdi.jar}"/>
                 <pathelement path="${ecj.jar}" />
-                <pathelement path="${ant.core.lib}" />
+                <pathelement path="${ant.library.dir}/ant.jar" />
                 <pathelement path="${ant.library.dir}/ant-launcher.jar" />
                 <pathelement path="${ant.library.dir}/ant-nodeps.jar" />
             </classpath>

Propchange: harmony/enhanced/branches/java6/jdktools/modules/jretools/.classpath
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 25 13:48:22 2010
@@ -1,3 +1,3 @@
 /harmony/enhanced/jdktools/trunk/modules/jretools/.classpath:702140-925933
-/harmony/enhanced/trunk/jdktools/modules/jretools/.classpath:926309-926569
+/harmony/enhanced/trunk/jdktools/modules/jretools/.classpath:926309-927388
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/.classpath:467609-476394

Propchange: harmony/enhanced/branches/java6/jdktools/modules/jretools/.project
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 25 13:48:22 2010
@@ -1,3 +1,3 @@
 /harmony/enhanced/jdktools/trunk/modules/jretools/.project:702140-925933
-/harmony/enhanced/trunk/jdktools/modules/jretools/.project:926309-926569
+/harmony/enhanced/trunk/jdktools/modules/jretools/.project:926309-927388
 /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 Thu Mar 25 13:48:22 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-926569
+/harmony/enhanced/trunk/jdktools/modules/jretools/.settings/org.eclipse.jdt.core.prefs:926309-927388
 /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 Thu Mar 25 13:48:22 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-926569
+/harmony/enhanced/trunk/jdktools/modules/jretools/.settings/org.eclipse.jdt.ui.prefs:926309-927388
 /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 Thu Mar 25 13:48:22 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-926569
+/harmony/enhanced/trunk/jdktools/modules/jretools/META-INF/MANIFEST.MF:926309-927388
 /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 Thu Mar 25 13:48:22 2010
@@ -1,3 +1,3 @@
 /harmony/enhanced/jdktools/trunk/modules/jretools/build.xml:702140-925933
-/harmony/enhanced/trunk/jdktools/modules/jretools/build.xml:926309-926569
+/harmony/enhanced/trunk/jdktools/modules/jretools/build.xml:926309-927388
 /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 Thu Mar 25 13:48:22 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-926569
+/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/internal/nls/Messages.java:926309-927388
 /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 Thu Mar 25 13:48:22 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-926569
+/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/internal/nls/messages.properties:926309-927388
 /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 Thu Mar 25 13:48:22 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-926569
+/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/ArgumentsParser.java:926309-927388
 /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 Thu Mar 25 13:48:22 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-926569
+/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CRLManager.java:926309-927388
 /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 Thu Mar 25 13:48:22 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-926569
+/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CSRGenerator.java:926309-927388
 /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 Thu Mar 25 13:48:22 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-926569
+/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertChainVerifier.java:926309-927388
 /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 Thu Mar 25 13:48:22 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-926569
+/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertExporter.java:926309-927388
 /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 Thu Mar 25 13:48:22 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-926569
+/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertImporter.java:926309-927388
 /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 Thu Mar 25 13:48:22 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-926569
+/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertReader.java:926309-927388
 /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 Thu Mar 25 13:48:22 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-926569
+/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/Command.java:926309-927388
 /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 Thu Mar 25 13:48:22 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-926569
+/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/EntryManager.java:926309-927388
 /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 Thu Mar 25 13:48:22 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-926569
+/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/HelpPrinter.java:926309-927388
 /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 Thu Mar 25 13:48:22 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-926569
+/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyCertGenerator.java:926309-927388
 /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 Thu Mar 25 13:48:22 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-926569
+/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyStoreCertPrinter.java:926309-927388
 /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 Thu Mar 25 13:48:22 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-926569
+/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyStoreConverter.java:926309-927388
 /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 Thu Mar 25 13:48:22 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-926569
+/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolException.java:926309-927388
 /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 Thu Mar 25 13:48:22 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-926569
+/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolKSLoaderSaver.java:926309-927388
 /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 Thu Mar 25 13:48:22 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-926569
+/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolParameters.java:926309-927388
 /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 Thu Mar 25 13:48:22 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-926569
+/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/Main.java:926309-927388
 /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 Thu Mar 25 13:48:22 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-926569
+/harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/toolutils/KeyStoreLoaderSaver.java:926309-927388
 /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 Thu Mar 25 13:48:22 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-926569
+/harmony/enhanced/trunk/jdktools/modules/jretools/src/test/java/org/apache/harmony/jretools/tests/keytool/GenKeyTest.java:926309-927388
 /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 Thu Mar 25 13:48:22 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-926569
+/harmony/enhanced/trunk/jdktools/modules/jretools/src/test/java/org/apache/harmony/jretools/tests/keytool/TestUtils.java:926309-927388
 /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 Thu Mar 25 13:48:22 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-926569
+/harmony/enhanced/trunk/jdktools/modules/jretools/src/test/java/org/apache/harmony/jretools/tests/toolutils/KeyStoreLoaderSaverTest.java:926309-927388
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/test/java/org/apache/harmony/jretools/tests/toolutils/KeyStoreLoaderSaverTest.java:467609-476394



Mime
View raw message