diff --git a/benchmarks/src/benchmarks/regression/MessageDigestBenchmark.java b/benchmarks/src/benchmarks/regression/MessageDigestBenchmark.java
index a986434..40819f8 100644
--- a/benchmarks/src/benchmarks/regression/MessageDigestBenchmark.java
+++ b/benchmarks/src/benchmarks/regression/MessageDigestBenchmark.java
@@ -17,6 +17,7 @@
 package benchmarks.regression;
 
 import com.google.caliper.Param;
+import java.nio.ByteBuffer;
 import java.security.MessageDigest;
 
 public class MessageDigestBenchmark {
@@ -29,6 +30,29 @@
         }
     }
 
+    private static final int LARGE_DATA_SIZE = 256 * 1024;
+    private static final byte[] LARGE_DATA = new byte[LARGE_DATA_SIZE];
+    static {
+        for (int i = 0; i < LARGE_DATA_SIZE; i++) {
+            LARGE_DATA[i] = (byte)i;
+        }
+    }
+
+    private static final ByteBuffer SMALL_BUFFER = ByteBuffer.wrap(DATA);
+    private static final ByteBuffer SMALL_DIRECT_BUFFER = ByteBuffer.allocateDirect(DATA_SIZE);
+    static {
+        SMALL_DIRECT_BUFFER.put(DATA);
+        SMALL_DIRECT_BUFFER.flip();
+    }
+
+    private static final ByteBuffer LARGE_BUFFER = ByteBuffer.wrap(LARGE_DATA);
+    private static final ByteBuffer LARGE_DIRECT_BUFFER =
+            ByteBuffer.allocateDirect(LARGE_DATA_SIZE);
+    static {
+        LARGE_DIRECT_BUFFER.put(LARGE_DATA);
+        LARGE_DIRECT_BUFFER.flip();
+    }
+
     @Param private Algorithm algorithm;
 
     public enum Algorithm { MD5, SHA1, SHA256,  SHA384, SHA512 };
@@ -45,4 +69,88 @@
             digest.digest();
         }
     }
+
+    public void timeLargeArray(int reps) throws Exception {
+        for (int i = 0; i < reps; ++i) {
+            MessageDigest digest = MessageDigest.getInstance(algorithm.toString(),
+                                                             provider.toString());
+            digest.update(LARGE_DATA, 0, LARGE_DATA_SIZE);
+            digest.digest();
+        }
+    }
+
+    public void timeSmallChunkOfLargeArray(int reps) throws Exception {
+        for (int i = 0; i < reps; ++i) {
+            MessageDigest digest = MessageDigest.getInstance(algorithm.toString(),
+                                                             provider.toString());
+            digest.update(LARGE_DATA, LARGE_DATA_SIZE / 2, DATA_SIZE);
+            digest.digest();
+        }
+    }
+
+    public void timeSmallByteBuffer(int reps) throws Exception {
+        for (int i = 0; i < reps; ++i) {
+            MessageDigest digest = MessageDigest.getInstance(algorithm.toString(),
+                                                             provider.toString());
+            SMALL_BUFFER.position(0);
+            SMALL_BUFFER.limit(SMALL_BUFFER.capacity());
+            digest.update(SMALL_BUFFER);
+            digest.digest();
+        }
+    }
+
+    public void timeSmallDirectByteBuffer(int reps) throws Exception {
+        for (int i = 0; i < reps; ++i) {
+            MessageDigest digest = MessageDigest.getInstance(algorithm.toString(),
+                                                             provider.toString());
+            SMALL_DIRECT_BUFFER.position(0);
+            SMALL_DIRECT_BUFFER.limit(SMALL_DIRECT_BUFFER.capacity());
+            digest.update(SMALL_DIRECT_BUFFER);
+            digest.digest();
+        }
+    }
+
+    public void timeLargeByteBuffer(int reps) throws Exception {
+        for (int i = 0; i < reps; ++i) {
+            MessageDigest digest = MessageDigest.getInstance(algorithm.toString(),
+                                                             provider.toString());
+            LARGE_BUFFER.position(0);
+            LARGE_BUFFER.limit(LARGE_BUFFER.capacity());
+            digest.update(LARGE_BUFFER);
+            digest.digest();
+        }
+    }
+
+    public void timeLargeDirectByteBuffer(int reps) throws Exception {
+        for (int i = 0; i < reps; ++i) {
+            MessageDigest digest = MessageDigest.getInstance(algorithm.toString(),
+                                                             provider.toString());
+            LARGE_DIRECT_BUFFER.position(0);
+            LARGE_DIRECT_BUFFER.limit(LARGE_DIRECT_BUFFER.capacity());
+            digest.update(LARGE_DIRECT_BUFFER);
+            digest.digest();
+        }
+    }
+
+    public void timeSmallChunkOfLargeByteBuffer(int reps) throws Exception {
+        for (int i = 0; i < reps; ++i) {
+            MessageDigest digest = MessageDigest.getInstance(algorithm.toString(),
+                                                             provider.toString());
+            LARGE_BUFFER.position(LARGE_BUFFER.capacity() / 2);
+            LARGE_BUFFER.limit(LARGE_BUFFER.position() + DATA_SIZE);
+            digest.update(LARGE_BUFFER);
+            digest.digest();
+        }
+    }
+
+    public void timeSmallChunkOfLargeDirectByteBuffer(int reps) throws Exception {
+        for (int i = 0; i < reps; ++i) {
+            MessageDigest digest = MessageDigest.getInstance(algorithm.toString(),
+                                                             provider.toString());
+            LARGE_DIRECT_BUFFER.position(LARGE_DIRECT_BUFFER.capacity() / 2);
+            LARGE_DIRECT_BUFFER.limit(LARGE_DIRECT_BUFFER.position() + DATA_SIZE);
+            digest.update(LARGE_DIRECT_BUFFER);
+            digest.digest();
+        }
+    }
 }
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/ObjectInputStream2Test.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/ObjectInputStream2Test.java
index af5fce5..e81224a 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/ObjectInputStream2Test.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/ObjectInputStream2Test.java
@@ -17,8 +17,10 @@
 
 package org.apache.harmony.tests.java.io;
 
+import dalvik.system.DexFile;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
+import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InvalidClassException;
@@ -27,6 +29,9 @@
 import java.io.ObjectStreamClass;
 import java.io.ObjectStreamException;
 import java.io.Serializable;
+import java.lang.reflect.Field;
+import java.nio.file.Files;
+import java.nio.file.StandardCopyOption;
 import java.util.ArrayList;
 
 import junit.framework.TestCase;
@@ -210,4 +215,54 @@
             // Excpected
         }
     }
+
+    // http://b/29721023
+    public void test_sameName() throws Exception {
+        // Load class from dex, it's not possible to create a class with same-named
+        // fields in java (but it's allowed in dex).
+        File sameFieldNames = File.createTempFile("sameFieldNames", ".dex");
+        InputStream dexIs = this.getClass().getClassLoader().
+            getResourceAsStream("tests/api/java/io/sameFieldNames.dex");
+        assertNotNull(dexIs);
+
+        Class<?> clazz = null;
+
+        // Get the class object
+        try {
+            Files.copy(dexIs, sameFieldNames.toPath(), StandardCopyOption.REPLACE_EXISTING);
+            DexFile dexFile = new DexFile(sameFieldNames);
+            clazz = dexFile.loadClass("sameFieldNames", getClass().getClassLoader());
+            dexFile.close();
+        } finally {
+            if (sameFieldNames.exists()) {
+                sameFieldNames.delete();
+            }
+        }
+
+        // Create class instance, fill it with content
+        Object o1 = clazz.getConstructor().newInstance();
+        int v = 123;
+        for(Field f : clazz.getFields()) {
+            if (f.getType() == Integer.class) {
+                f.set(o1, new Integer(v++));
+            } else if (f.getType() == Long.class) {
+                f.set(o1, new Long(v++));
+            }
+        }
+
+        // Serialize and deserialize
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        ObjectOutputStream oos = new ObjectOutputStream(baos);
+        oos.writeObject(o1);
+        oos.close();
+        ObjectInputStream ois = new ObjectInputStream(new ByteArrayInputStream(
+                baos.toByteArray()));
+        Object o2 = ois.readObject();
+        ois.close();
+
+        // Compare content
+        for(Field f : clazz.getFields()) {
+            assertEquals(f.get(o1), f.get(o2));
+        }
+    }
 }
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/ObjectStreamClassTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/ObjectStreamClassTest.java
index 7ae4617..948059b 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/ObjectStreamClassTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/ObjectStreamClassTest.java
@@ -17,16 +17,22 @@
 
 package org.apache.harmony.tests.java.io;
 
-import junit.framework.TestCase;
+import dalvik.system.DexFile;
 import java.io.Externalizable;
+import java.io.File;
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.ObjectInput;
 import java.io.ObjectOutput;
 import java.io.ObjectStreamClass;
 import java.io.ObjectStreamField;
 import java.io.Serializable;
+import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.lang.reflect.Proxy;
+import java.nio.file.Files;
+import java.nio.file.StandardCopyOption;
+import junit.framework.TestCase;
 
 public class ObjectStreamClassTest extends TestCase {
 
@@ -294,4 +300,27 @@
                     hasStaticInitializer.invoke(null, NoClinitChildWithNoClinitParent.class,
                                                 true /* checkSuperclass */));
     }
+
+    // http://b/29721023
+    public void testClassWithSameFieldName() throws Exception {
+        // Load class from dex, it's not possible to create a class with same-named
+        // fields in java (but it's allowed in dex).
+        File sameFieldNames = File.createTempFile("sameFieldNames", ".dex");
+        InputStream dexIs = this.getClass().getClassLoader().
+            getResourceAsStream("tests/api/java/io/sameFieldNames.dex");
+        assertNotNull(dexIs);
+
+        try {
+            Files.copy(dexIs, sameFieldNames.toPath(), StandardCopyOption.REPLACE_EXISTING);
+            DexFile dexFile = new DexFile(sameFieldNames);
+            Class<?> clazz = dexFile.loadClass("sameFieldNames", getClass().getClassLoader());
+            ObjectStreamClass osc = ObjectStreamClass.lookup(clazz);
+            assertEquals(4, osc.getFields().length);
+            dexFile.close();
+        } finally {
+            if (sameFieldNames.exists()) {
+                sameFieldNames.delete();
+            }
+        }
+    }
 }
diff --git a/luni/src/main/java/java/math/BigDecimal.java b/luni/src/main/java/java/math/BigDecimal.java
index 4bc8dae..d03b66f 100644
--- a/luni/src/main/java/java/math/BigDecimal.java
+++ b/luni/src/main/java/java/math/BigDecimal.java
@@ -937,8 +937,14 @@
         }
         /* Let be: this = [u1,s1] and multiplicand = [u2,s2] so:
          * this x multiplicand = [ s1 * s2 , s1 + s2 ] */
-        if(this.bitLength + multiplicand.bitLength < 64) {
-            return valueOf(this.smallValue*multiplicand.smallValue, safeLongToInt(newScale));
+        if (this.bitLength + multiplicand.bitLength < 64) {
+            long unscaledValue = this.smallValue * multiplicand.smallValue;
+            // b/19185440 Case where result should be +2^63 but unscaledValue overflowed to -2^63
+            boolean longMultiplicationOverflowed = (unscaledValue == Long.MIN_VALUE) &&
+                    (Math.signum(smallValue) * Math.signum(multiplicand.smallValue) > 0);
+            if (!longMultiplicationOverflowed) {
+                return valueOf(unscaledValue, safeLongToInt(newScale));
+            }
         }
         return new BigDecimal(this.getUnscaledValue().multiply(
                 multiplicand.getUnscaledValue()), safeLongToInt(newScale));
diff --git a/luni/src/test/java/libcore/java/io/InterruptedStreamTest.java b/luni/src/test/java/libcore/java/io/InterruptedStreamTest.java
old mode 100755
new mode 100644
diff --git a/luni/src/test/java/libcore/java/lang/OldAndroidMathTest.java b/luni/src/test/java/libcore/java/lang/OldAndroidMathTest.java
index c18f2bd..ab6cfe6 100644
--- a/luni/src/test/java/libcore/java/lang/OldAndroidMathTest.java
+++ b/luni/src/test/java/libcore/java/lang/OldAndroidMathTest.java
@@ -20,6 +20,8 @@
 import junit.framework.Assert;
 import junit.framework.TestCase;
 
+import static java.lang.Math.PI;
+
 public class OldAndroidMathTest extends TestCase {
 
     private static final double HYP = Math.sqrt(2.0);
@@ -101,13 +103,51 @@
         double answer = Math.tan(Math.atan(1.0));
         assertTrue("Returned incorrect arc tangent: " + answer, answer <= 1.0
                 && answer >= 9.9999999999999983E-1);
+
+        assertEquals("wrong atan(1)", PI / 4, Math.atan(1d), 0);
+        assertEquals("wrong atan(-1)", -PI / 4, Math.atan(-1), 0);
+        assertEquals("wrong atan(+INF)", PI / 2, Math.atan(Double.POSITIVE_INFINITY), 0);
+        assertEquals("wrong atan(-INF)", -PI / 2, Math.atan(Double.NEGATIVE_INFINITY), 0);
+    }
+
+    public void testAtanDZeroValues() {
+        double negativeZero = Math.copySign(0d, -1d);
+        assertEquals("wrong value for atan(0)", 0, Math.atan(0d), 0);
+        assertTrue("Wrong sign for atan(0)", Math.copySign(1, Math.atan(0d)) == 1);
+
+        assertEquals("wrong value for atan(-0)", negativeZero, Math.atan(negativeZero), 0);
+        assertTrue("Wrong sign for atan(-0)", Math.copySign(1, Math.atan(negativeZero)) == -1);
     }
 
     public void testAtan2DD() {
-        // Test for method double java.lang.Math.atan2(double, double)
-        double answer = Math.atan(Math.tan(1.0));
-        assertTrue("Returned incorrect arc tangent: " + answer, answer <= 1.0
-                && answer >= 9.9999999999999983E-1);
+        // Verify values are put in the correct quadrants.
+        assertEquals("wrong atan2(0, 1)", 0, Math.atan2(0, 1), 0);
+        assertEquals("wrong atan2(1, 1)", PI / 4, Math.atan2(1, 1), 0);
+        assertEquals("wrong atan2(1, 0)", PI / 2, Math.atan2(1, 0), 0);
+        assertEquals("wrong atan2(1, -1)", 3 * PI / 4, Math.atan2(1, -1), 0);
+        assertEquals("wrong atan2(0, -1)", PI, Math.atan2(0, -1), 0);
+        assertEquals("wrong atan2(-1, -1)", -3 * PI / 4, Math.atan2(-1, -1), 0);
+        assertEquals("wrong atan2(-1, 0)", -PI / 2, Math.atan2(-1, 0), 0);
+        assertEquals("wrong atan2(-1, 1)", -PI / 4, Math.atan2(-1, 1), 0);
+
+        // Check numeric values.
+        assertEquals("atan2(42, 42) != atan2(1, 1)", Math.atan2(1, 1), Math.atan2(42, 42), 0);
+        assertEquals("wrong atan2(2, 1)", Math.atan(2), Math.atan2(2, 1), 0);
+        assertEquals("wrong atan2(5, 3)", Math.atan(5d / 3), Math.atan2(5, 3), 0);
+        assertEquals("wrong atan2(9, 10)", Math.atan(9d / 10), Math.atan2(9, 10), 0);
+        assertEquals("wrong atan2(-10, 5)", Math.atan(-10d / 5), Math.atan2(-10, 5), 0);
+    }
+
+    public void testAtan2DDZeroValues() {
+        double negativeZero = Math.copySign(0d, -1d);
+        assertEquals("wrong atan2(+0, +0)", 0, Math.atan2(+0, +0), 0);
+        assertTrue("Wrong sign for atan2(+0, +0)",
+                Math.copySign(1, Math.atan2(+0, +0)) == 1);;
+        assertEquals("wrong atan2(+0, -0)", PI, Math.atan2(+0, negativeZero), 0);
+        assertEquals("wrong atan2(-0, +0)", -0, Math.atan2(negativeZero, +0), 0);
+        assertTrue("Wrong sign for atan2(-0, +0)",
+                Math.copySign(1, Math.atan2(negativeZero, +0)) == -1);
+        assertEquals("wrong atan2(-0, -0)", -PI, Math.atan2(negativeZero, negativeZero), 0);
     }
 
     public void testCbrtD() {
@@ -560,7 +600,7 @@
         assertEquals("Wrong value E",
                 4613303445314885481L, Double.doubleToLongBits(Math.E));
         assertEquals("Wrong value PI",
-                4614256656552045848L, Double.doubleToLongBits(Math.PI));
+                4614256656552045848L, Double.doubleToLongBits(PI));
 
         for (int i = 500; i >= 0; i--) {
             double d = Math.random();
diff --git a/luni/src/test/java/libcore/java/lang/OldAndroidMonitorTest.java b/luni/src/test/java/libcore/java/lang/OldAndroidMonitorTest.java
old mode 100755
new mode 100644
diff --git a/luni/src/test/java/libcore/java/math/BigDecimalTest.java b/luni/src/test/java/libcore/java/math/BigDecimalTest.java
index a9a796c..9f55272 100644
--- a/luni/src/test/java/libcore/java/math/BigDecimalTest.java
+++ b/luni/src/test/java/libcore/java/math/BigDecimalTest.java
@@ -24,6 +24,8 @@
 
 import junit.framework.TestCase;
 
+import static java.math.BigDecimal.valueOf;
+
 public final class BigDecimalTest extends TestCase {
 
     public void testGetPrecision() {
@@ -115,7 +117,7 @@
         BigDecimal zero = BigDecimal.ZERO;
         zero = zero.setScale(2, RoundingMode.HALF_EVEN);
 
-        BigDecimal other = BigDecimal.valueOf(999999998000000001.00);
+        BigDecimal other = valueOf(999999998000000001.00);
         other = other.setScale(2, RoundingMode.HALF_EVEN);
 
         assertFalse(zero.equals(other));
@@ -203,6 +205,62 @@
         }
     }
 
+    public void testNegate() {
+        checkNegate(valueOf(0), valueOf(0));
+        checkNegate(valueOf(1), valueOf(-1));
+        checkNegate(valueOf(43), valueOf(-43));
+        checkNegate(valueOf(Long.MAX_VALUE), valueOf(-Long.MAX_VALUE));
+        checkNegate(new BigDecimal("9223372036854775808"), valueOf(Long.MIN_VALUE));
+        // arbitrary large decimal
+        checkNegate(new BigDecimal("342343243546465623424321423112321.43243434343412321"),
+                new BigDecimal("-342343243546465623424321423112321.43243434343412321"));
+    }
+
+    private static void checkNegate(BigDecimal a, BigDecimal b) {
+        if (!a.toString().equals("0")) {
+            assertFalse(a.equals(b));
+        }
+        assertEquals(a.negate(), b);
+        assertEquals(a, b.negate());
+        assertEquals(a, a.negate().negate());
+    }
+
+    public void testAddAndSubtract_near64BitOverflow() throws Exception {
+        // Check that the test is set up correctly - these values should be MIN_VALUE and MAX_VALUE
+        assertEquals("-9223372036854775808", Long.toString(Long.MIN_VALUE));
+        assertEquals("9223372036854775807", Long.toString(Long.MAX_VALUE));
+
+        // Exactly MIN_VALUE and MAX_VALUE
+        assertSum("-9223372036854775808", -(1L << 62L), -(1L << 62L));
+        assertSum("9223372036854775807", (1L << 62L) - 1L, 1L << 62L);
+
+        // One beyond MIN_VALUE and MAX_VALUE
+        assertSum("-9223372036854775809", -(1L << 62L), -(1L << 62L) - 1);
+        assertSum("-9223372036854775809", Long.MIN_VALUE + 1, -2);
+        assertSum("9223372036854775808", 1L << 62L, 1L << 62L);
+        assertSum("9223372036854775808", Long.MAX_VALUE, 1);
+    }
+
+    /**
+     * Assert that {@code (a + b), (b + a), (a - (-b)) and (b - (-a))} all have the same
+     * expected result in BigDecimal arithmetic.
+     */
+    private static void assertSum(String expectedSumAsString, long a, long b) {
+        if (a == Long.MIN_VALUE || b == Long.MIN_VALUE) {
+            // - (Long.MIN_VALUE) can't be represented as a long, so don't allow it here.
+            throw new IllegalArgumentException("Long.MIN_VALUE not allowed");
+        }
+        BigDecimal bigA = valueOf(a);
+        BigDecimal bigB = valueOf(b);
+        BigDecimal bigMinusB = valueOf(-b);
+        BigDecimal bigMinusA = valueOf(-a);
+
+        assertEquals("a + b", expectedSumAsString, bigA.add(bigB).toString());
+        assertEquals("b + a", expectedSumAsString, bigB.add(bigA).toString());
+        assertEquals("a - (-b)", expectedSumAsString, bigA.subtract(bigMinusB).toString());
+        assertEquals("b - (-a)", expectedSumAsString, bigB.subtract(bigMinusA).toString());
+    }
+
     /**
      * Tests that Long.MIN_VALUE / -1 doesn't overflow back to Long.MIN_VALUE,
      * like it would in long arithmetic.
@@ -248,7 +306,119 @@
                 new BigDecimal("9223372036854775808"),
                 new BigDecimal("-4611686018427387904").divide(
                         new BigDecimal("-5E-1"), /* scale = */ 0, RoundingMode.UNNECESSARY));
+    }
 
+    /**
+     * Tests addition, subtraction, multiplication and division involving a range of
+     * even long values and 1/2 of that value.
+     */
+    public void testCommonOperations_halfOfEvenLongValue() {
+        checkCommonOperations(0);
+        checkCommonOperations(2);
+        checkCommonOperations(-2);
+        checkCommonOperations(Long.MIN_VALUE);
+        checkCommonOperations(1L << 62L);
+        checkCommonOperations(-(1L << 62L));
+        checkCommonOperations(1L << 62L + 1 << 30 + 1 << 10);
+        checkCommonOperations(Long.MAX_VALUE - 1);
+    }
+
+    private static void checkCommonOperations(long value) {
+        if (value % 2 != 0) {
+            throw new IllegalArgumentException("Expected even value, got " + value);
+        }
+        BigDecimal bigHalfValue = valueOf(value / 2);
+        BigDecimal bigValue = valueOf(value);
+        BigDecimal two = valueOf(2);
+
+        assertEquals(bigValue, bigHalfValue.multiply(two));
+        assertEquals(bigValue, bigHalfValue.add(bigHalfValue));
+        assertEquals(bigHalfValue, bigValue.subtract(bigHalfValue));
+        assertEquals(bigHalfValue, bigValue.divide(two, RoundingMode.UNNECESSARY));
+        if (value != 0) {
+            assertEquals(two, bigValue.divide(bigHalfValue, RoundingMode.UNNECESSARY));
+        }
+    }
+
+    /**
+     * Tests that when long multiplication doesn't overflow, its result is consistent with
+     * BigDecimal multiplication.
+     */
+    public void testMultiply_consistentWithLong() {
+        checkMultiply_consistentWithLong(0, 0);
+        checkMultiply_consistentWithLong(0, 1);
+        checkMultiply_consistentWithLong(1, 1);
+        checkMultiply_consistentWithLong(2, 3);
+        checkMultiply_consistentWithLong(123, 456);
+        checkMultiply_consistentWithLong(9, 9);
+        checkMultiply_consistentWithLong(34545, 3423421);
+        checkMultiply_consistentWithLong(5465653, 342343234568L);
+        checkMultiply_consistentWithLong(Integer.MAX_VALUE, Integer.MAX_VALUE);
+        checkMultiply_consistentWithLong((1L << 40) + 454L, 34324);
+    }
+
+    private void checkMultiply_consistentWithLong(long a, long b) {
+        // Guard against the test using examples that overflow. This condition here is
+        // not meant to be exact, it'll reject some values that wouldn't overflow.
+        if (a != 0 && b != 0 && Math.abs(Long.MAX_VALUE / a) <= Math.abs(b)) {
+            throw new IllegalArgumentException("Multiplication might overflow: " + a + " * " + b);
+        }
+        long expectedResult = a * b;
+        // check the easy case with no decimals
+        assertEquals(Long.toString(expectedResult),
+                valueOf(a).multiply(valueOf(b)).toString());
+        // number with 2 decimals * number with 3 decimals => number with 5 decimals
+        // E.g. 9E-2 * 2E-3 == 18E-5 == 0.00018
+        // valueOf(unscaledValue, scale) corresponds to {@code unscaledValue * 10<sup>-scale</sup>}
+        assertEquals(valueOf(expectedResult, 5), valueOf(a, 2).multiply(valueOf(b, 3)));
+    }
+
+    public void testMultiply_near64BitOverflow_scaled() {
+        // -((2^31) / 100) * (-2/10) == (2^64)/1000
+        assertEquals("9223372036854775.808",
+                valueOf(-(1L << 62L), 2).multiply(valueOf(-2, 1)).toString());
+
+        // -((2^31) / 100) * (2/10) == -(2^64)/1000
+        assertEquals("-9223372036854775.808",
+                valueOf(-(1L << 62L), 2).multiply(valueOf(2, 1)).toString());
+
+        // -((2^31) * 100) * (-2/10) == (2^64) * 10
+        assertEquals(new BigDecimal("9223372036854775808E1"),
+                valueOf(-(1L << 62L), -2).multiply(valueOf(-2, 1)));
+    }
+
+    /** Tests multiplications whose result is near 2^63 (= Long.MAX_VALUE + 1). */
+    public void testMultiply_near64BitOverflow_positive() {
+        // Results of exactly +2^63, which doesn't fit into a long even though -2^63 does
+        assertEquals("9223372036854775808", bigMultiply(Long.MIN_VALUE, -1).toString());
+        assertEquals("9223372036854775808", bigMultiply(Long.MIN_VALUE / 2, -2).toString());
+        assertEquals("9223372036854775808", bigMultiply(-(Long.MIN_VALUE / 2), 2).toString());
+        assertEquals("9223372036854775808", bigMultiply(1L << 31, 1L << 32).toString());
+        assertEquals("9223372036854775808", bigMultiply(-(1L << 31), -(1L << 32)).toString());
+
+        // Results near but not exactly +2^63
+        assertEquals("9223372036854775806", bigMultiply(2147483647, 4294967298L).toString());
+        assertEquals("9223372036854775807", bigMultiply(Long.MAX_VALUE, 1).toString());
+        assertEquals("9223372036854775807", bigMultiply(42128471623L, 218934409L).toString());
+        assertEquals("9223372036854775809", bigMultiply(77158673929L, 119537721L).toString());
+        assertEquals("9223372036854775810", bigMultiply((1L << 62L) + 1, 2).toString());
+    }
+
+    /** Tests multiplications whose result is near -2^63 (= Long.MIN_VALUE). */
+    public void testMultiply_near64BitOverflow_negative() {
+        assertEquals("-9223372036854775808", bigMultiply(Long.MIN_VALUE, 1).toString());
+        assertEquals("-9223372036854775808", bigMultiply(Long.MIN_VALUE / 2, 2).toString());
+        assertEquals("-9223372036854775808", bigMultiply(-(1L << 31), 1L << 32).toString());
+        assertEquals("-9223372036854775807", bigMultiply(-42128471623L, 218934409L).toString());
+        assertEquals("-9223372036854775810", bigMultiply(-(Long.MIN_VALUE / 2) + 1, -2).toString());
+    }
+
+    private static BigDecimal bigMultiply(long a, long b) {
+        BigDecimal bigA = valueOf(a);
+        BigDecimal bigB = valueOf(b);
+        BigDecimal result = bigA.multiply(bigB);
+        assertEquals("Multiplication should be commutative", result, bigB.multiply(bigA));
+        return result;
     }
 
 }
diff --git a/luni/src/test/java/libcore/java/net/URITest.java b/luni/src/test/java/libcore/java/net/URITest.java
index edc6577..67504d4 100644
--- a/luni/src/test/java/libcore/java/net/URITest.java
+++ b/luni/src/test/java/libcore/java/net/URITest.java
@@ -738,5 +738,18 @@
         assertNull(new URI("http://example..com/").getHost());
     }
 
+    public void test_JDK7171415() {
+        URI lower, mixed;
+        lower = URI.create("http://www.example.com/%2b");
+        mixed = URI.create("http://wWw.ExAmPlE.com/%2B");
+        assertTrue(lower.equals(mixed));
+        assertEquals(lower.hashCode(), mixed.hashCode());
+
+        lower = URI.create("http://www.example.com/%2bbb");
+        mixed = URI.create("http://wWw.ExAmPlE.com/%2BbB");
+        assertFalse(lower.equals(mixed));
+        assertFalse(lower.hashCode() == mixed.hashCode());
+    }
+
     // Adding a new test? Consider adding an equivalent test to URLTest.java
 }
diff --git a/luni/src/test/java/libcore/java/sql/OldConnectionTest.java b/luni/src/test/java/libcore/java/sql/OldConnectionTest.java
old mode 100755
new mode 100644
diff --git a/luni/src/test/java/libcore/java/sql/OldPreparedStatementTest.java b/luni/src/test/java/libcore/java/sql/OldPreparedStatementTest.java
old mode 100755
new mode 100644
diff --git a/luni/src/test/java/libcore/java/sql/OldResultSetMetaDataTest.java b/luni/src/test/java/libcore/java/sql/OldResultSetMetaDataTest.java
old mode 100755
new mode 100644
diff --git a/luni/src/test/java/libcore/java/sql/OldSQLTest.java b/luni/src/test/java/libcore/java/sql/OldSQLTest.java
old mode 100755
new mode 100644
diff --git a/luni/src/test/java/libcore/java/sql/OldStatementTest.java b/luni/src/test/java/libcore/java/sql/OldStatementTest.java
old mode 100755
new mode 100644
diff --git a/luni/src/test/java/tests/java/sql/DatabaseMetaDataTest.java b/luni/src/test/java/tests/java/sql/DatabaseMetaDataTest.java
old mode 100755
new mode 100644
diff --git a/luni/src/test/java/tests/java/sql/DeleteFunctionalityTest.java b/luni/src/test/java/tests/java/sql/DeleteFunctionalityTest.java
old mode 100755
new mode 100644
diff --git a/luni/src/test/java/tests/java/sql/InsertFunctionalityTest.java b/luni/src/test/java/tests/java/sql/InsertFunctionalityTest.java
old mode 100755
new mode 100644
diff --git a/luni/src/test/java/tests/java/sql/MultiThreadAccessTest.java b/luni/src/test/java/tests/java/sql/MultiThreadAccessTest.java
old mode 100755
new mode 100644
diff --git a/luni/src/test/java/tests/java/sql/SelectFunctionalityTest.java b/luni/src/test/java/tests/java/sql/SelectFunctionalityTest.java
old mode 100755
new mode 100644
diff --git a/luni/src/test/java/tests/java/sql/StressTest.java b/luni/src/test/java/tests/java/sql/StressTest.java
old mode 100755
new mode 100644
diff --git a/luni/src/test/java/tests/java/sql/UpdateFunctionalityTest.java b/luni/src/test/java/tests/java/sql/UpdateFunctionalityTest.java
old mode 100755
new mode 100644
diff --git a/luni/src/test/java/tests/java/sql/UpdateFunctionalityTest2.java b/luni/src/test/java/tests/java/sql/UpdateFunctionalityTest2.java
old mode 100755
new mode 100644
diff --git a/luni/src/test/java/tests/support/DatabaseCreator.java b/luni/src/test/java/tests/support/DatabaseCreator.java
old mode 100755
new mode 100644
diff --git a/luni/src/test/resources/tests/api/java/io/sameFieldNames.dex b/luni/src/test/resources/tests/api/java/io/sameFieldNames.dex
new file mode 100644
index 0000000..ada4935
--- /dev/null
+++ b/luni/src/test/resources/tests/api/java/io/sameFieldNames.dex
Binary files differ
diff --git a/luni/src/test/resources/tests/api/java/io/sameFieldNames.smali b/luni/src/test/resources/tests/api/java/io/sameFieldNames.smali
new file mode 100644
index 0000000..657b965
--- /dev/null
+++ b/luni/src/test/resources/tests/api/java/io/sameFieldNames.smali
@@ -0,0 +1,17 @@
+# Source for sameFieldNames.dex
+.class public LsameFieldNames;
+.super Ljava/lang/Object;
+.implements Ljava/io/Serializable;
+
+# Test multiple fields with the same name and different types.
+# (Invalid in Java language but valid in bytecode.)
+.field public a:J
+.field public a:I
+.field public a:Ljava/lang/Integer;
+.field public a:Ljava/lang/Long;
+
+.method public constructor <init>()V
+    .registers 2
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+    return-void
+.end method
diff --git a/ojluni/src/main/java/com/sun/net/ssl/internal/ssl/X509ExtendedTrustManager.java b/ojluni/src/main/java/com/sun/net/ssl/internal/ssl/X509ExtendedTrustManager.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/com/sun/security/cert/internal/x509/X509V1CertImpl.java b/ojluni/src/main/java/com/sun/security/cert/internal/x509/X509V1CertImpl.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/awt/font/NumericShaper.java b/ojluni/src/main/java/java/awt/font/NumericShaper.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/awt/font/TextAttribute.java b/ojluni/src/main/java/java/awt/font/TextAttribute.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/beans/ChangeListenerMap.java b/ojluni/src/main/java/java/beans/ChangeListenerMap.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/beans/IndexedPropertyChangeEvent.java b/ojluni/src/main/java/java/beans/IndexedPropertyChangeEvent.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/beans/PropertyChangeEvent.java b/ojluni/src/main/java/java/beans/PropertyChangeEvent.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/beans/PropertyChangeListener.java b/ojluni/src/main/java/java/beans/PropertyChangeListener.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/beans/PropertyChangeListenerProxy.java b/ojluni/src/main/java/java/beans/PropertyChangeListenerProxy.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/beans/PropertyChangeSupport.java b/ojluni/src/main/java/java/beans/PropertyChangeSupport.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/io/Bits.java b/ojluni/src/main/java/java/io/Bits.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/io/BufferedInputStream.java b/ojluni/src/main/java/java/io/BufferedInputStream.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/io/BufferedOutputStream.java b/ojluni/src/main/java/java/io/BufferedOutputStream.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/io/BufferedReader.java b/ojluni/src/main/java/java/io/BufferedReader.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/io/BufferedWriter.java b/ojluni/src/main/java/java/io/BufferedWriter.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/io/ByteArrayInputStream.java b/ojluni/src/main/java/java/io/ByteArrayInputStream.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/io/ByteArrayOutputStream.java b/ojluni/src/main/java/java/io/ByteArrayOutputStream.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/io/CharArrayReader.java b/ojluni/src/main/java/java/io/CharArrayReader.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/io/CharArrayWriter.java b/ojluni/src/main/java/java/io/CharArrayWriter.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/io/CharConversionException.java b/ojluni/src/main/java/java/io/CharConversionException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/io/Closeable.java b/ojluni/src/main/java/java/io/Closeable.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/io/Console.java b/ojluni/src/main/java/java/io/Console.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/io/DataInput.java b/ojluni/src/main/java/java/io/DataInput.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/io/DataInputStream.java b/ojluni/src/main/java/java/io/DataInputStream.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/io/DataOutput.java b/ojluni/src/main/java/java/io/DataOutput.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/io/DataOutputStream.java b/ojluni/src/main/java/java/io/DataOutputStream.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/io/DeleteOnExitHook.java b/ojluni/src/main/java/java/io/DeleteOnExitHook.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/io/EOFException.java b/ojluni/src/main/java/java/io/EOFException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/io/ExpiringCache.java b/ojluni/src/main/java/java/io/ExpiringCache.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/io/Externalizable.java b/ojluni/src/main/java/java/io/Externalizable.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/io/File.java b/ojluni/src/main/java/java/io/File.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/io/FileDescriptor.java b/ojluni/src/main/java/java/io/FileDescriptor.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/io/FileFilter.java b/ojluni/src/main/java/java/io/FileFilter.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/io/FileInputStream.java b/ojluni/src/main/java/java/io/FileInputStream.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/io/FileNotFoundException.java b/ojluni/src/main/java/java/io/FileNotFoundException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/io/FileOutputStream.java b/ojluni/src/main/java/java/io/FileOutputStream.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/io/FilePermission.java b/ojluni/src/main/java/java/io/FilePermission.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/io/FileReader.java b/ojluni/src/main/java/java/io/FileReader.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/io/FileSystem.java b/ojluni/src/main/java/java/io/FileSystem.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/io/FileWriter.java b/ojluni/src/main/java/java/io/FileWriter.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/io/FilenameFilter.java b/ojluni/src/main/java/java/io/FilenameFilter.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/io/FilterInputStream.java b/ojluni/src/main/java/java/io/FilterInputStream.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/io/FilterOutputStream.java b/ojluni/src/main/java/java/io/FilterOutputStream.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/io/FilterReader.java b/ojluni/src/main/java/java/io/FilterReader.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/io/FilterWriter.java b/ojluni/src/main/java/java/io/FilterWriter.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/io/Flushable.java b/ojluni/src/main/java/java/io/Flushable.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/io/IOError.java b/ojluni/src/main/java/java/io/IOError.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/io/IOException.java b/ojluni/src/main/java/java/io/IOException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/io/InputStream.java b/ojluni/src/main/java/java/io/InputStream.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/io/InputStreamReader.java b/ojluni/src/main/java/java/io/InputStreamReader.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/io/InterruptedIOException.java b/ojluni/src/main/java/java/io/InterruptedIOException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/io/InvalidClassException.java b/ojluni/src/main/java/java/io/InvalidClassException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/io/InvalidObjectException.java b/ojluni/src/main/java/java/io/InvalidObjectException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/io/LineNumberInputStream.java b/ojluni/src/main/java/java/io/LineNumberInputStream.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/io/LineNumberReader.java b/ojluni/src/main/java/java/io/LineNumberReader.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/io/NotActiveException.java b/ojluni/src/main/java/java/io/NotActiveException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/io/NotSerializableException.java b/ojluni/src/main/java/java/io/NotSerializableException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/io/ObjectInput.java b/ojluni/src/main/java/java/io/ObjectInput.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/io/ObjectInputStream.java b/ojluni/src/main/java/java/io/ObjectInputStream.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/io/ObjectInputValidation.java b/ojluni/src/main/java/java/io/ObjectInputValidation.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/io/ObjectOutput.java b/ojluni/src/main/java/java/io/ObjectOutput.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/io/ObjectOutputStream.java b/ojluni/src/main/java/java/io/ObjectOutputStream.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/io/ObjectStreamClass.java b/ojluni/src/main/java/java/io/ObjectStreamClass.java
old mode 100755
new mode 100644
index a157f4d..ffbde98e
--- a/ojluni/src/main/java/java/io/ObjectStreamClass.java
+++ b/ojluni/src/main/java/java/io/ObjectStreamClass.java
@@ -2246,13 +2246,9 @@
             ObjectStreamField f = fields[i], m = null;
             for (int j = 0; j < localFields.length; j++) {
                 ObjectStreamField lf = localFields[j];
-                if (f.getName().equals(lf.getName())) {
-                    if ((f.isPrimitive() || lf.isPrimitive()) &&
-                        f.getTypeCode() != lf.getTypeCode())
-                    {
-                        throw new InvalidClassException(localDesc.name,
-                            "incompatible types for field " + f.getName());
-                    }
+                // Android-changed: We can have fields with a same name and a different type.
+                if (f.getName().equals(lf.getName()) &&
+                    f.getSignature().equals(lf.getSignature())) {
                     if (lf.getField() != null) {
                         m = new ObjectStreamField(
                             lf.getField(), lf.isUnshared(), false);
diff --git a/ojluni/src/main/java/java/io/ObjectStreamConstants.java b/ojluni/src/main/java/java/io/ObjectStreamConstants.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/io/ObjectStreamException.java b/ojluni/src/main/java/java/io/ObjectStreamException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/io/ObjectStreamField.java b/ojluni/src/main/java/java/io/ObjectStreamField.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/io/OptionalDataException.java b/ojluni/src/main/java/java/io/OptionalDataException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/io/OutputStream.java b/ojluni/src/main/java/java/io/OutputStream.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/io/OutputStreamWriter.java b/ojluni/src/main/java/java/io/OutputStreamWriter.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/io/PipedInputStream.java b/ojluni/src/main/java/java/io/PipedInputStream.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/io/PipedOutputStream.java b/ojluni/src/main/java/java/io/PipedOutputStream.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/io/PipedReader.java b/ojluni/src/main/java/java/io/PipedReader.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/io/PipedWriter.java b/ojluni/src/main/java/java/io/PipedWriter.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/io/PrintStream.java b/ojluni/src/main/java/java/io/PrintStream.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/io/PrintWriter.java b/ojluni/src/main/java/java/io/PrintWriter.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/io/PushbackInputStream.java b/ojluni/src/main/java/java/io/PushbackInputStream.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/io/PushbackReader.java b/ojluni/src/main/java/java/io/PushbackReader.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/io/RandomAccessFile.java b/ojluni/src/main/java/java/io/RandomAccessFile.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/io/Reader.java b/ojluni/src/main/java/java/io/Reader.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/io/SequenceInputStream.java b/ojluni/src/main/java/java/io/SequenceInputStream.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/io/SerialCallbackContext.java b/ojluni/src/main/java/java/io/SerialCallbackContext.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/io/Serializable.java b/ojluni/src/main/java/java/io/Serializable.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/io/SerializablePermission.java b/ojluni/src/main/java/java/io/SerializablePermission.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/io/StreamCorruptedException.java b/ojluni/src/main/java/java/io/StreamCorruptedException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/io/StreamTokenizer.java b/ojluni/src/main/java/java/io/StreamTokenizer.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/io/StringBufferInputStream.java b/ojluni/src/main/java/java/io/StringBufferInputStream.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/io/StringReader.java b/ojluni/src/main/java/java/io/StringReader.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/io/StringWriter.java b/ojluni/src/main/java/java/io/StringWriter.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/io/SyncFailedException.java b/ojluni/src/main/java/java/io/SyncFailedException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/io/UTFDataFormatException.java b/ojluni/src/main/java/java/io/UTFDataFormatException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/io/UnixFileSystem.java b/ojluni/src/main/java/java/io/UnixFileSystem.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/io/UnsupportedEncodingException.java b/ojluni/src/main/java/java/io/UnsupportedEncodingException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/io/WriteAbortedException.java b/ojluni/src/main/java/java/io/WriteAbortedException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/io/Writer.java b/ojluni/src/main/java/java/io/Writer.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/lang/AbstractMethodError.java b/ojluni/src/main/java/java/lang/AbstractMethodError.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/lang/Appendable.java b/ojluni/src/main/java/java/lang/Appendable.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/lang/ArithmeticException.java b/ojluni/src/main/java/java/lang/ArithmeticException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/lang/ArrayIndexOutOfBoundsException.java b/ojluni/src/main/java/java/lang/ArrayIndexOutOfBoundsException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/lang/Class.java b/ojluni/src/main/java/java/lang/Class.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/lang/ClassCircularityError.java b/ojluni/src/main/java/java/lang/ClassCircularityError.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/lang/ClassFormatError.java b/ojluni/src/main/java/java/lang/ClassFormatError.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/lang/ClassLoader.java b/ojluni/src/main/java/java/lang/ClassLoader.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/lang/ClassNotFoundException.java b/ojluni/src/main/java/java/lang/ClassNotFoundException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/lang/CloneNotSupportedException.java b/ojluni/src/main/java/java/lang/CloneNotSupportedException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/lang/Cloneable.java b/ojluni/src/main/java/java/lang/Cloneable.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/lang/Compiler.java b/ojluni/src/main/java/java/lang/Compiler.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/lang/Error.java b/ojluni/src/main/java/java/lang/Error.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/lang/Exception.java b/ojluni/src/main/java/java/lang/Exception.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/lang/ExceptionInInitializerError.java b/ojluni/src/main/java/java/lang/ExceptionInInitializerError.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/lang/IllegalAccessError.java b/ojluni/src/main/java/java/lang/IllegalAccessError.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/lang/IllegalAccessException.java b/ojluni/src/main/java/java/lang/IllegalAccessException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/lang/IllegalMonitorStateException.java b/ojluni/src/main/java/java/lang/IllegalMonitorStateException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/lang/IllegalStateException.java b/ojluni/src/main/java/java/lang/IllegalStateException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/lang/IllegalThreadStateException.java b/ojluni/src/main/java/java/lang/IllegalThreadStateException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/lang/IncompatibleClassChangeError.java b/ojluni/src/main/java/java/lang/IncompatibleClassChangeError.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/lang/IndexOutOfBoundsException.java b/ojluni/src/main/java/java/lang/IndexOutOfBoundsException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/lang/InstantiationError.java b/ojluni/src/main/java/java/lang/InstantiationError.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/lang/InstantiationException.java b/ojluni/src/main/java/java/lang/InstantiationException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/lang/InternalError.java b/ojluni/src/main/java/java/lang/InternalError.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/lang/InterruptedException.java b/ojluni/src/main/java/java/lang/InterruptedException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/lang/LinkageError.java b/ojluni/src/main/java/java/lang/LinkageError.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/lang/NegativeArraySizeException.java b/ojluni/src/main/java/java/lang/NegativeArraySizeException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/lang/NoSuchFieldError.java b/ojluni/src/main/java/java/lang/NoSuchFieldError.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/lang/NoSuchFieldException.java b/ojluni/src/main/java/java/lang/NoSuchFieldException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/lang/NoSuchMethodError.java b/ojluni/src/main/java/java/lang/NoSuchMethodError.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/lang/NoSuchMethodException.java b/ojluni/src/main/java/java/lang/NoSuchMethodException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/lang/NullPointerException.java b/ojluni/src/main/java/java/lang/NullPointerException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/lang/OutOfMemoryError.java b/ojluni/src/main/java/java/lang/OutOfMemoryError.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/lang/Override.java b/ojluni/src/main/java/java/lang/Override.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/lang/ProcessImpl.java b/ojluni/src/main/java/java/lang/ProcessImpl.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/lang/ReflectiveOperationException.java b/ojluni/src/main/java/java/lang/ReflectiveOperationException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/lang/RuntimeException.java b/ojluni/src/main/java/java/lang/RuntimeException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/lang/SecurityException.java b/ojluni/src/main/java/java/lang/SecurityException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/lang/SecurityManager.java b/ojluni/src/main/java/java/lang/SecurityManager.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/lang/StackOverflowError.java b/ojluni/src/main/java/java/lang/StackOverflowError.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/lang/String.java b/ojluni/src/main/java/java/lang/String.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/lang/StringCoding.java b/ojluni/src/main/java/java/lang/StringCoding.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/lang/StringIndexOutOfBoundsException.java b/ojluni/src/main/java/java/lang/StringIndexOutOfBoundsException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/lang/SuppressWarnings.java b/ojluni/src/main/java/java/lang/SuppressWarnings.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/lang/System.java b/ojluni/src/main/java/java/lang/System.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/lang/Thread.java b/ojluni/src/main/java/java/lang/Thread.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/lang/ThreadDeath.java b/ojluni/src/main/java/java/lang/ThreadDeath.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/lang/ThreadGroup.java b/ojluni/src/main/java/java/lang/ThreadGroup.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/lang/ThreadLocal.java b/ojluni/src/main/java/java/lang/ThreadLocal.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/lang/Throwable.java b/ojluni/src/main/java/java/lang/Throwable.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/lang/TypeNotPresentException.java b/ojluni/src/main/java/java/lang/TypeNotPresentException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/lang/UnknownError.java b/ojluni/src/main/java/java/lang/UnknownError.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/lang/UnsatisfiedLinkError.java b/ojluni/src/main/java/java/lang/UnsatisfiedLinkError.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/lang/UnsupportedClassVersionError.java b/ojluni/src/main/java/java/lang/UnsupportedClassVersionError.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/lang/UnsupportedOperationException.java b/ojluni/src/main/java/java/lang/UnsupportedOperationException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/lang/VerifyError.java b/ojluni/src/main/java/java/lang/VerifyError.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/lang/VirtualMachineError.java b/ojluni/src/main/java/java/lang/VirtualMachineError.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/lang/Void.java b/ojluni/src/main/java/java/lang/Void.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/lang/annotation/AnnotationFormatError.java b/ojluni/src/main/java/java/lang/annotation/AnnotationFormatError.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/lang/annotation/AnnotationTypeMismatchException.java b/ojluni/src/main/java/java/lang/annotation/AnnotationTypeMismatchException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/lang/annotation/Documented.java b/ojluni/src/main/java/java/lang/annotation/Documented.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/lang/annotation/ElementType.java b/ojluni/src/main/java/java/lang/annotation/ElementType.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/lang/annotation/RetentionPolicy.java b/ojluni/src/main/java/java/lang/annotation/RetentionPolicy.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/lang/ref/PhantomReference.java b/ojluni/src/main/java/java/lang/ref/PhantomReference.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/lang/ref/Reference.java b/ojluni/src/main/java/java/lang/ref/Reference.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/lang/ref/ReferenceQueue.java b/ojluni/src/main/java/java/lang/ref/ReferenceQueue.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/lang/ref/SoftReference.java b/ojluni/src/main/java/java/lang/ref/SoftReference.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/lang/ref/WeakReference.java b/ojluni/src/main/java/java/lang/ref/WeakReference.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/lang/reflect/AccessibleObject.java b/ojluni/src/main/java/java/lang/reflect/AccessibleObject.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/lang/reflect/AnnotatedElement.java b/ojluni/src/main/java/java/lang/reflect/AnnotatedElement.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/lang/reflect/Array.java b/ojluni/src/main/java/java/lang/reflect/Array.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/lang/reflect/Constructor.java b/ojluni/src/main/java/java/lang/reflect/Constructor.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/lang/reflect/Field.java b/ojluni/src/main/java/java/lang/reflect/Field.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/lang/reflect/GenericArrayType.java b/ojluni/src/main/java/java/lang/reflect/GenericArrayType.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/lang/reflect/GenericDeclaration.java b/ojluni/src/main/java/java/lang/reflect/GenericDeclaration.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/lang/reflect/GenericSignatureFormatError.java b/ojluni/src/main/java/java/lang/reflect/GenericSignatureFormatError.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/lang/reflect/InvocationHandler.java b/ojluni/src/main/java/java/lang/reflect/InvocationHandler.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/lang/reflect/InvocationTargetException.java b/ojluni/src/main/java/java/lang/reflect/InvocationTargetException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/lang/reflect/MalformedParameterizedTypeException.java b/ojluni/src/main/java/java/lang/reflect/MalformedParameterizedTypeException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/lang/reflect/Member.java b/ojluni/src/main/java/java/lang/reflect/Member.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/lang/reflect/Method.java b/ojluni/src/main/java/java/lang/reflect/Method.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/lang/reflect/Modifier.java b/ojluni/src/main/java/java/lang/reflect/Modifier.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/lang/reflect/ParameterizedType.java b/ojluni/src/main/java/java/lang/reflect/ParameterizedType.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/lang/reflect/Proxy.java b/ojluni/src/main/java/java/lang/reflect/Proxy.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/lang/reflect/ReflectPermission.java b/ojluni/src/main/java/java/lang/reflect/ReflectPermission.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/lang/reflect/Type.java b/ojluni/src/main/java/java/lang/reflect/Type.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/lang/reflect/TypeVariable.java b/ojluni/src/main/java/java/lang/reflect/TypeVariable.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/lang/reflect/UndeclaredThrowableException.java b/ojluni/src/main/java/java/lang/reflect/UndeclaredThrowableException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/lang/reflect/WildcardType.java b/ojluni/src/main/java/java/lang/reflect/WildcardType.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/net/AbstractPlainDatagramSocketImpl.java b/ojluni/src/main/java/java/net/AbstractPlainDatagramSocketImpl.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/net/AbstractPlainSocketImpl.java b/ojluni/src/main/java/java/net/AbstractPlainSocketImpl.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/net/Authenticator.java b/ojluni/src/main/java/java/net/Authenticator.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/net/BindException.java b/ojluni/src/main/java/java/net/BindException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/net/CacheRequest.java b/ojluni/src/main/java/java/net/CacheRequest.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/net/CacheResponse.java b/ojluni/src/main/java/java/net/CacheResponse.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/net/ConnectException.java b/ojluni/src/main/java/java/net/ConnectException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/net/ContentHandler.java b/ojluni/src/main/java/java/net/ContentHandler.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/net/ContentHandlerFactory.java b/ojluni/src/main/java/java/net/ContentHandlerFactory.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/net/CookieHandler.java b/ojluni/src/main/java/java/net/CookieHandler.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/net/CookieManager.java b/ojluni/src/main/java/java/net/CookieManager.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/net/CookiePolicy.java b/ojluni/src/main/java/java/net/CookiePolicy.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/net/CookieStore.java b/ojluni/src/main/java/java/net/CookieStore.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/net/DatagramPacket.java b/ojluni/src/main/java/java/net/DatagramPacket.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/net/DatagramSocket.java b/ojluni/src/main/java/java/net/DatagramSocket.java
old mode 100755
new mode 100644
index 6925816..7577e63
--- a/ojluni/src/main/java/java/net/DatagramSocket.java
+++ b/ojluni/src/main/java/java/net/DatagramSocket.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2014 The Android Open Source Project
- * Copyright (c) 1995, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,6 @@
 
 import java.io.FileDescriptor;
 import java.io.IOException;
-import java.io.InterruptedIOException;
 import java.nio.channels.DatagramChannel;
 import java.security.AccessController;
 import java.security.PrivilegedExceptionAction;
@@ -802,6 +801,7 @@
                     } // end of while
                 }
             }
+            DatagramPacket tmp = null;
             if ((connectState == ST_CONNECTED_NO_IMPL) || explicitFilter) {
                 // We have to do the filtering the old fashioned way since
                 // the native impl doesn't support connect or the connect
@@ -826,11 +826,13 @@
                     if ((!connectedAddress.equals(peekAddress)) ||
                         (connectedPort != peekPort)) {
                         // throw the packet away and silently continue
-                        DatagramPacket tmp = new DatagramPacket(
+                        tmp = new DatagramPacket(
                                                 new byte[1024], 1024);
                         getImpl().receive(tmp);
                         if (explicitFilter) {
-                            bytesLeftToFilter -= tmp.getLength();
+                            if (checkFiltering(tmp)) {
+                                stop = true;
+                            }
                         }
                     } else {
                         stop = true;
@@ -840,18 +842,22 @@
             // If the security check succeeds, or the datagram is
             // connected then receive the packet
             getImpl().receive(p);
-            if (explicitFilter) {
-                bytesLeftToFilter -= p.getLength();
-                if (bytesLeftToFilter <= 0) {
-                    explicitFilter = false;
-                } else {
-                    // break out of filter, if there is no more data queued
-                    explicitFilter = getImpl().dataAvailable() > 0;
-                }
+            if (explicitFilter && tmp == null) {
+                // packet was not filtered, account for it here
+                checkFiltering(p);
             }
         }
     }
 
+    private boolean checkFiltering(DatagramPacket p) throws SocketException {
+        bytesLeftToFilter -= p.getLength();
+        if (bytesLeftToFilter <= 0 || getImpl().dataAvailable() <= 0) {
+            explicitFilter = false;
+            return true;
+        }
+        return false;
+    }
+
     /**
      * Gets the local address to which the socket is bound.
      *
diff --git a/ojluni/src/main/java/java/net/DatagramSocketImpl.java b/ojluni/src/main/java/java/net/DatagramSocketImpl.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/net/DatagramSocketImplFactory.java b/ojluni/src/main/java/java/net/DatagramSocketImplFactory.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/net/DefaultDatagramSocketImplFactory.java b/ojluni/src/main/java/java/net/DefaultDatagramSocketImplFactory.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/net/DefaultInterface.java b/ojluni/src/main/java/java/net/DefaultInterface.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/net/FileNameMap.java b/ojluni/src/main/java/java/net/FileNameMap.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/net/HttpCookie.java b/ojluni/src/main/java/java/net/HttpCookie.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/net/HttpRetryException.java b/ojluni/src/main/java/java/net/HttpRetryException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/net/HttpURLConnection.java b/ojluni/src/main/java/java/net/HttpURLConnection.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/net/IDN.java b/ojluni/src/main/java/java/net/IDN.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/net/InMemoryCookieStore.java b/ojluni/src/main/java/java/net/InMemoryCookieStore.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/net/Inet4Address.java b/ojluni/src/main/java/java/net/Inet4Address.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/net/Inet6Address.java b/ojluni/src/main/java/java/net/Inet6Address.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/net/Inet6AddressImpl.java b/ojluni/src/main/java/java/net/Inet6AddressImpl.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/net/InetAddress.java b/ojluni/src/main/java/java/net/InetAddress.java
old mode 100755
new mode 100644
index d837e98..edfdb00
--- a/ojluni/src/main/java/java/net/InetAddress.java
+++ b/ojluni/src/main/java/java/net/InetAddress.java
@@ -183,10 +183,26 @@
 class InetAddress implements java.io.Serializable {
 
     static class InetAddressHolder {
+        /**
+         * Reserve the original application specified hostname.
+         *
+         * The original hostname is useful for domain-based endpoint
+         * identification (see RFC 2818 and RFC 6125).  If an address
+         * was created with a raw IP address, a reverse name lookup
+         * may introduce endpoint identification security issue via
+         * DNS forging.
+         *
+         * Oracle JSSE provider is using this original hostname, via
+         * sun.misc.JavaNetAccess, for SSL/TLS endpoint identification.
+         *
+         * Note: May define a new public method in the future if necessary.
+         */
+        private String originalHostName;
 
         InetAddressHolder() {}
 
         InetAddressHolder(String hostName, int address, int family) {
+            this.originalHostName = hostName;
             this.hostName = hostName;
             this.address = address;
             this.family = family;
@@ -198,6 +214,10 @@
             return hostName;
         }
 
+        String getOriginalHostName() {
+            return originalHostName;
+        }
+
         /**
          * Holds a 32-bit IPv4 address.
          */
diff --git a/ojluni/src/main/java/java/net/InetAddressImpl.java b/ojluni/src/main/java/java/net/InetAddressImpl.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/net/InetSocketAddress.java b/ojluni/src/main/java/java/net/InetSocketAddress.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/net/InterfaceAddress.java b/ojluni/src/main/java/java/net/InterfaceAddress.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/net/JarURLConnection.java b/ojluni/src/main/java/java/net/JarURLConnection.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/net/MalformedURLException.java b/ojluni/src/main/java/java/net/MalformedURLException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/net/MulticastSocket.java b/ojluni/src/main/java/java/net/MulticastSocket.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/net/NetPermission.java b/ojluni/src/main/java/java/net/NetPermission.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/net/NetUtil.java b/ojluni/src/main/java/java/net/NetUtil.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/net/NetworkInterface.java b/ojluni/src/main/java/java/net/NetworkInterface.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/net/NoRouteToHostException.java b/ojluni/src/main/java/java/net/NoRouteToHostException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/net/PasswordAuthentication.java b/ojluni/src/main/java/java/net/PasswordAuthentication.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/net/PlainDatagramSocketImpl.java b/ojluni/src/main/java/java/net/PlainDatagramSocketImpl.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/net/PlainSocketImpl.java b/ojluni/src/main/java/java/net/PlainSocketImpl.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/net/PortUnreachableException.java b/ojluni/src/main/java/java/net/PortUnreachableException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/net/ProtocolException.java b/ojluni/src/main/java/java/net/ProtocolException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/net/ProtocolFamily.java b/ojluni/src/main/java/java/net/ProtocolFamily.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/net/Proxy.java b/ojluni/src/main/java/java/net/Proxy.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/net/ProxySelector.java b/ojluni/src/main/java/java/net/ProxySelector.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/net/ResponseCache.java b/ojluni/src/main/java/java/net/ResponseCache.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/net/SecureCacheResponse.java b/ojluni/src/main/java/java/net/SecureCacheResponse.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/net/ServerSocket.java b/ojluni/src/main/java/java/net/ServerSocket.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/net/Socket.java b/ojluni/src/main/java/java/net/Socket.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/net/SocketAddress.java b/ojluni/src/main/java/java/net/SocketAddress.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/net/SocketException.java b/ojluni/src/main/java/java/net/SocketException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/net/SocketImpl.java b/ojluni/src/main/java/java/net/SocketImpl.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/net/SocketImplFactory.java b/ojluni/src/main/java/java/net/SocketImplFactory.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/net/SocketInputStream.java b/ojluni/src/main/java/java/net/SocketInputStream.java
old mode 100755
new mode 100644
index ea849a0..2982ab5
--- a/ojluni/src/main/java/java/net/SocketInputStream.java
+++ b/ojluni/src/main/java/java/net/SocketInputStream.java
@@ -32,7 +32,6 @@
 import java.nio.channels.FileChannel;
 
 import dalvik.system.BlockGuard;
-import sun.misc.IoTrace;
 import sun.net.ConnectionResetException;
 
 /**
@@ -95,6 +94,26 @@
                                    int timeout)
         throws IOException;
 
+    // wrap native call to allow instrumentation
+    /**
+     * Reads into an array of bytes at the specified offset using
+     * the received socket primitive.
+     * @param fd the FileDescriptor
+     * @param b the buffer into which the data is read
+     * @param off the start offset of the data
+     * @param len the maximum number of bytes read
+     * @param timeout the read timeout in ms
+     * @return the actual number of bytes read, -1 is
+     *          returned when the end of the stream is reached.
+     * @exception IOException If an I/O error has occurred.
+     */
+    private int socketRead(FileDescriptor fd,
+                           byte b[], int off, int len,
+                           int timeout)
+        throws IOException {
+        return socketRead0(fd, b, off, len, timeout);
+    }
+
     /**
      * Reads into a byte array data from the socket.
      * @param b the buffer into which the data is read
@@ -121,7 +140,7 @@
     }
 
     int read(byte b[], int off, int length, int timeout) throws IOException {
-        int n = 0;
+        int n;
 
         // EOF already encountered
         if (eof) {
@@ -143,20 +162,16 @@
 
         boolean gotReset = false;
 
-        Object traceContext = IoTrace.socketReadBegin();
         // acquire file descriptor and do the read
         FileDescriptor fd = impl.acquireFD();
         try {
             BlockGuard.getThreadPolicy().onNetwork();
-            n = socketRead0(fd, b, off, length, timeout);
+            n = socketRead(fd, b, off, length, timeout);
             if (n > 0) {
                 return n;
             }
         } catch (ConnectionResetException rstExc) {
             gotReset = true;
-        } finally {
-            IoTrace.socketReadEnd(traceContext, impl.address, impl.port,
-                                  timeout, n > 0 ? n : 0);
         }
 
         /*
@@ -164,17 +179,13 @@
          * buffered on the socket
          */
         if (gotReset) {
-            traceContext = IoTrace.socketReadBegin();
             impl.setConnectionResetPending();
             try {
-                n = socketRead0(fd, b, off, length, timeout);
+                n = socketRead(fd, b, off, length, timeout);
                 if (n > 0) {
                     return n;
                 }
             } catch (ConnectionResetException rstExc) {
-            } finally {
-                IoTrace.socketReadEnd(traceContext, impl.address, impl.port,
-                                      timeout, n > 0 ? n : 0);
             }
         }
 
diff --git a/ojluni/src/main/java/java/net/SocketOption.java b/ojluni/src/main/java/java/net/SocketOption.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/net/SocketOptions.java b/ojluni/src/main/java/java/net/SocketOptions.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/net/SocketOutputStream.java b/ojluni/src/main/java/java/net/SocketOutputStream.java
old mode 100755
new mode 100644
index fff612f..da0a0de
--- a/ojluni/src/main/java/java/net/SocketOutputStream.java
+++ b/ojluni/src/main/java/java/net/SocketOutputStream.java
@@ -32,7 +32,6 @@
 import java.nio.channels.FileChannel;
 
 import dalvik.system.BlockGuard;
-import sun.misc.IoTrace;
 
 /**
  * This stream extends FileOutputStream to implement a
@@ -104,13 +103,10 @@
             throw new ArrayIndexOutOfBoundsException();
         }
 
-        Object traceContext = IoTrace.socketWriteBegin();
-        int bytesWritten = 0;
         FileDescriptor fd = impl.acquireFD();
         try {
             BlockGuard.getThreadPolicy().onNetwork();
             socketWrite0(fd, b, off, len);
-            bytesWritten = len;
         } catch (SocketException se) {
             if (se instanceof sun.net.ConnectionResetException) {
                 impl.setConnectionResetPending();
@@ -121,8 +117,6 @@
             } else {
                 throw se;
             }
-        } finally {
-            IoTrace.socketWriteEnd(traceContext, impl.address, impl.port, bytesWritten);
         }
     }
 
diff --git a/ojluni/src/main/java/java/net/SocketPermission.java b/ojluni/src/main/java/java/net/SocketPermission.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/net/SocketTimeoutException.java b/ojluni/src/main/java/java/net/SocketTimeoutException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/net/SocksConsts.java b/ojluni/src/main/java/java/net/SocksConsts.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/net/SocksSocketImpl.java b/ojluni/src/main/java/java/net/SocksSocketImpl.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/net/StandardProtocolFamily.java b/ojluni/src/main/java/java/net/StandardProtocolFamily.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/net/StandardSocketOptions.java b/ojluni/src/main/java/java/net/StandardSocketOptions.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/net/URI.java b/ojluni/src/main/java/java/net/URI.java
old mode 100755
new mode 100644
index cfeb731..a74e237
--- a/ojluni/src/main/java/java/net/URI.java
+++ b/ojluni/src/main/java/java/net/URI.java
@@ -1682,6 +1682,13 @@
         return c;
     }
 
+    // US-ASCII only
+    private static int toUpper(char c) {
+        if ((c >= 'a') && (c <= 'z'))
+            return c - ('a' - 'A');
+        return c;
+    }
+
     private static boolean equal(String s, String t) {
         if (s == t) return true;
         if ((s != null) && (t != null)) {
@@ -1732,7 +1739,26 @@
 
     private static int hash(int hash, String s) {
         if (s == null) return hash;
-        return hash * 127 + s.hashCode();
+        return s.indexOf('%') < 0 ? hash * 127 + s.hashCode()
+                                  : normalizedHash(hash, s);
+    }
+
+
+    private static int normalizedHash(int hash, String s) {
+        int h = 0;
+        for (int index = 0; index < s.length(); index++) {
+            char ch = s.charAt(index);
+            h = 31 * h + ch;
+            if (ch == '%') {
+                /*
+                 * Process the next two encoded characters
+                 */
+                for (int i = index + 1; i < index + 3; i++)
+                    h = 31 * h + toUpper(s.charAt(i));
+                index += 2;
+            }
+        }
+        return hash * 127 + h;
     }
 
     // US-ASCII only
diff --git a/ojluni/src/main/java/java/net/URISyntaxException.java b/ojluni/src/main/java/java/net/URISyntaxException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/net/URL.java b/ojluni/src/main/java/java/net/URL.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/net/URLClassLoader.java b/ojluni/src/main/java/java/net/URLClassLoader.java
old mode 100755
new mode 100644
index e4a67a4..f8d1c35
--- a/ojluni/src/main/java/java/net/URLClassLoader.java
+++ b/ojluni/src/main/java/java/net/URLClassLoader.java
@@ -761,6 +761,10 @@
                 public URLClassPath getURLClassPath (URLClassLoader u) {
                     return u.ucp;
                 }
+
+                public String getOriginalHostName(InetAddress ia) {
+                    return ia.holder.getOriginalHostName();
+                }
             }
         );*/
         ClassLoader.registerAsParallelCapable();
diff --git a/ojluni/src/main/java/java/net/URLConnection.java b/ojluni/src/main/java/java/net/URLConnection.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/net/URLDecoder.java b/ojluni/src/main/java/java/net/URLDecoder.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/net/URLEncoder.java b/ojluni/src/main/java/java/net/URLEncoder.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/net/URLStreamHandler.java b/ojluni/src/main/java/java/net/URLStreamHandler.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/net/URLStreamHandlerFactory.java b/ojluni/src/main/java/java/net/URLStreamHandlerFactory.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/net/UnknownHostException.java b/ojluni/src/main/java/java/net/UnknownHostException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/net/UnknownServiceException.java b/ojluni/src/main/java/java/net/UnknownServiceException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/nio/Bits.java b/ojluni/src/main/java/java/nio/Bits.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/nio/Buffer.java b/ojluni/src/main/java/java/nio/Buffer.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/nio/ByteOrder.java b/ojluni/src/main/java/java/nio/ByteOrder.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/nio/MappedByteBuffer.java b/ojluni/src/main/java/java/nio/MappedByteBuffer.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/nio/StringCharBuffer.java b/ojluni/src/main/java/java/nio/StringCharBuffer.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/nio/channels/AsynchronousByteChannel.java b/ojluni/src/main/java/java/nio/channels/AsynchronousByteChannel.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/nio/channels/AsynchronousChannel.java b/ojluni/src/main/java/java/nio/channels/AsynchronousChannel.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/nio/channels/AsynchronousChannelGroup.java b/ojluni/src/main/java/java/nio/channels/AsynchronousChannelGroup.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/nio/channels/AsynchronousServerSocketChannel.java b/ojluni/src/main/java/java/nio/channels/AsynchronousServerSocketChannel.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/nio/channels/AsynchronousSocketChannel.java b/ojluni/src/main/java/java/nio/channels/AsynchronousSocketChannel.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/nio/channels/ByteChannel.java b/ojluni/src/main/java/java/nio/channels/ByteChannel.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/nio/channels/Channel.java b/ojluni/src/main/java/java/nio/channels/Channel.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/nio/channels/Channels.java b/ojluni/src/main/java/java/nio/channels/Channels.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/nio/channels/CompletionHandler.java b/ojluni/src/main/java/java/nio/channels/CompletionHandler.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/nio/channels/DatagramChannel.java b/ojluni/src/main/java/java/nio/channels/DatagramChannel.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/nio/channels/FileChannel.java b/ojluni/src/main/java/java/nio/channels/FileChannel.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/nio/channels/FileLock.java b/ojluni/src/main/java/java/nio/channels/FileLock.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/nio/channels/GatheringByteChannel.java b/ojluni/src/main/java/java/nio/channels/GatheringByteChannel.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/nio/channels/InterruptibleChannel.java b/ojluni/src/main/java/java/nio/channels/InterruptibleChannel.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/nio/channels/MembershipKey.java b/ojluni/src/main/java/java/nio/channels/MembershipKey.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/nio/channels/MulticastChannel.java b/ojluni/src/main/java/java/nio/channels/MulticastChannel.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/nio/channels/NetworkChannel.java b/ojluni/src/main/java/java/nio/channels/NetworkChannel.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/nio/channels/Pipe.java b/ojluni/src/main/java/java/nio/channels/Pipe.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/nio/channels/ReadableByteChannel.java b/ojluni/src/main/java/java/nio/channels/ReadableByteChannel.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/nio/channels/ScatteringByteChannel.java b/ojluni/src/main/java/java/nio/channels/ScatteringByteChannel.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/nio/channels/SeekableByteChannel.java b/ojluni/src/main/java/java/nio/channels/SeekableByteChannel.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/nio/channels/SelectableChannel.java b/ojluni/src/main/java/java/nio/channels/SelectableChannel.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/nio/channels/SelectionKey.java b/ojluni/src/main/java/java/nio/channels/SelectionKey.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/nio/channels/Selector.java b/ojluni/src/main/java/java/nio/channels/Selector.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/nio/channels/ServerSocketChannel.java b/ojluni/src/main/java/java/nio/channels/ServerSocketChannel.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/nio/channels/SocketChannel.java b/ojluni/src/main/java/java/nio/channels/SocketChannel.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/nio/channels/WritableByteChannel.java b/ojluni/src/main/java/java/nio/channels/WritableByteChannel.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/nio/channels/spi/AbstractInterruptibleChannel.java b/ojluni/src/main/java/java/nio/channels/spi/AbstractInterruptibleChannel.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/nio/channels/spi/AbstractSelectableChannel.java b/ojluni/src/main/java/java/nio/channels/spi/AbstractSelectableChannel.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/nio/channels/spi/AbstractSelectionKey.java b/ojluni/src/main/java/java/nio/channels/spi/AbstractSelectionKey.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/nio/channels/spi/AbstractSelector.java b/ojluni/src/main/java/java/nio/channels/spi/AbstractSelector.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/nio/channels/spi/AsynchronousChannelProvider.java b/ojluni/src/main/java/java/nio/channels/spi/AsynchronousChannelProvider.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/nio/channels/spi/SelectorProvider.java b/ojluni/src/main/java/java/nio/channels/spi/SelectorProvider.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/nio/charset/Charset.java b/ojluni/src/main/java/java/nio/charset/Charset.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/nio/charset/CoderMalfunctionError.java b/ojluni/src/main/java/java/nio/charset/CoderMalfunctionError.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/nio/charset/CoderResult.java b/ojluni/src/main/java/java/nio/charset/CoderResult.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/nio/charset/CodingErrorAction.java b/ojluni/src/main/java/java/nio/charset/CodingErrorAction.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/nio/charset/MalformedInputException.java b/ojluni/src/main/java/java/nio/charset/MalformedInputException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/nio/charset/StandardCharsets.java b/ojluni/src/main/java/java/nio/charset/StandardCharsets.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/nio/charset/UnmappableCharacterException.java b/ojluni/src/main/java/java/nio/charset/UnmappableCharacterException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/nio/charset/spi/CharsetProvider.java b/ojluni/src/main/java/java/nio/charset/spi/CharsetProvider.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/AccessControlContext.java b/ojluni/src/main/java/java/security/AccessControlContext.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/AccessControlException.java b/ojluni/src/main/java/java/security/AccessControlException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/AccessController.java b/ojluni/src/main/java/java/security/AccessController.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/AlgorithmConstraints.java b/ojluni/src/main/java/java/security/AlgorithmConstraints.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/AlgorithmParameterGenerator.java b/ojluni/src/main/java/java/security/AlgorithmParameterGenerator.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/AlgorithmParameterGeneratorSpi.java b/ojluni/src/main/java/java/security/AlgorithmParameterGeneratorSpi.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/AlgorithmParameters.java b/ojluni/src/main/java/java/security/AlgorithmParameters.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/AlgorithmParametersSpi.java b/ojluni/src/main/java/java/security/AlgorithmParametersSpi.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/AllPermission.java b/ojluni/src/main/java/java/security/AllPermission.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/AuthProvider.java b/ojluni/src/main/java/java/security/AuthProvider.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/BasicPermission.java b/ojluni/src/main/java/java/security/BasicPermission.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/Certificate.java b/ojluni/src/main/java/java/security/Certificate.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/CodeSigner.java b/ojluni/src/main/java/java/security/CodeSigner.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/CodeSource.java b/ojluni/src/main/java/java/security/CodeSource.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/CryptoPrimitive.java b/ojluni/src/main/java/java/security/CryptoPrimitive.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/DigestException.java b/ojluni/src/main/java/java/security/DigestException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/DigestInputStream.java b/ojluni/src/main/java/java/security/DigestInputStream.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/DigestOutputStream.java b/ojluni/src/main/java/java/security/DigestOutputStream.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/DomainCombiner.java b/ojluni/src/main/java/java/security/DomainCombiner.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/GeneralSecurityException.java b/ojluni/src/main/java/java/security/GeneralSecurityException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/Guard.java b/ojluni/src/main/java/java/security/Guard.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/GuardedObject.java b/ojluni/src/main/java/java/security/GuardedObject.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/Identity.java b/ojluni/src/main/java/java/security/Identity.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/IdentityScope.java b/ojluni/src/main/java/java/security/IdentityScope.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/InvalidAlgorithmParameterException.java b/ojluni/src/main/java/java/security/InvalidAlgorithmParameterException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/InvalidKeyException.java b/ojluni/src/main/java/java/security/InvalidKeyException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/InvalidParameterException.java b/ojluni/src/main/java/java/security/InvalidParameterException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/Key.java b/ojluni/src/main/java/java/security/Key.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/KeyException.java b/ojluni/src/main/java/java/security/KeyException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/KeyFactory.java b/ojluni/src/main/java/java/security/KeyFactory.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/KeyFactorySpi.java b/ojluni/src/main/java/java/security/KeyFactorySpi.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/KeyManagementException.java b/ojluni/src/main/java/java/security/KeyManagementException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/KeyPair.java b/ojluni/src/main/java/java/security/KeyPair.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/KeyPairGenerator.java b/ojluni/src/main/java/java/security/KeyPairGenerator.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/KeyPairGeneratorSpi.java b/ojluni/src/main/java/java/security/KeyPairGeneratorSpi.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/KeyRep.java b/ojluni/src/main/java/java/security/KeyRep.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/KeyStore.java b/ojluni/src/main/java/java/security/KeyStore.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/KeyStoreException.java b/ojluni/src/main/java/java/security/KeyStoreException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/KeyStoreSpi.java b/ojluni/src/main/java/java/security/KeyStoreSpi.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/MessageDigest.java b/ojluni/src/main/java/java/security/MessageDigest.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/MessageDigestSpi.java b/ojluni/src/main/java/java/security/MessageDigestSpi.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/NoSuchAlgorithmException.java b/ojluni/src/main/java/java/security/NoSuchAlgorithmException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/NoSuchProviderException.java b/ojluni/src/main/java/java/security/NoSuchProviderException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/Permission.java b/ojluni/src/main/java/java/security/Permission.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/PermissionCollection.java b/ojluni/src/main/java/java/security/PermissionCollection.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/Permissions.java b/ojluni/src/main/java/java/security/Permissions.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/Policy.java b/ojluni/src/main/java/java/security/Policy.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/PolicySpi.java b/ojluni/src/main/java/java/security/PolicySpi.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/Principal.java b/ojluni/src/main/java/java/security/Principal.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/PrivateKey.java b/ojluni/src/main/java/java/security/PrivateKey.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/PrivilegedAction.java b/ojluni/src/main/java/java/security/PrivilegedAction.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/PrivilegedActionException.java b/ojluni/src/main/java/java/security/PrivilegedActionException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/PrivilegedExceptionAction.java b/ojluni/src/main/java/java/security/PrivilegedExceptionAction.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/ProtectionDomain.java b/ojluni/src/main/java/java/security/ProtectionDomain.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/Provider.java b/ojluni/src/main/java/java/security/Provider.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/ProviderException.java b/ojluni/src/main/java/java/security/ProviderException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/PublicKey.java b/ojluni/src/main/java/java/security/PublicKey.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/SecureClassLoader.java b/ojluni/src/main/java/java/security/SecureClassLoader.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/SecureRandom.java b/ojluni/src/main/java/java/security/SecureRandom.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/SecureRandomSpi.java b/ojluni/src/main/java/java/security/SecureRandomSpi.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/Security.java b/ojluni/src/main/java/java/security/Security.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/SecurityPermission.java b/ojluni/src/main/java/java/security/SecurityPermission.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/Signature.java b/ojluni/src/main/java/java/security/Signature.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/SignatureException.java b/ojluni/src/main/java/java/security/SignatureException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/SignatureSpi.java b/ojluni/src/main/java/java/security/SignatureSpi.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/SignedObject.java b/ojluni/src/main/java/java/security/SignedObject.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/Signer.java b/ojluni/src/main/java/java/security/Signer.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/Timestamp.java b/ojluni/src/main/java/java/security/Timestamp.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/UnrecoverableEntryException.java b/ojluni/src/main/java/java/security/UnrecoverableEntryException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/UnrecoverableKeyException.java b/ojluni/src/main/java/java/security/UnrecoverableKeyException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/UnresolvedPermission.java b/ojluni/src/main/java/java/security/UnresolvedPermission.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/UnresolvedPermissionCollection.java b/ojluni/src/main/java/java/security/UnresolvedPermissionCollection.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/acl/Acl.java b/ojluni/src/main/java/java/security/acl/Acl.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/acl/AclEntry.java b/ojluni/src/main/java/java/security/acl/AclEntry.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/acl/AclNotFoundException.java b/ojluni/src/main/java/java/security/acl/AclNotFoundException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/acl/Group.java b/ojluni/src/main/java/java/security/acl/Group.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/acl/LastOwnerException.java b/ojluni/src/main/java/java/security/acl/LastOwnerException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/acl/NotOwnerException.java b/ojluni/src/main/java/java/security/acl/NotOwnerException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/acl/Owner.java b/ojluni/src/main/java/java/security/acl/Owner.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/acl/Permission.java b/ojluni/src/main/java/java/security/acl/Permission.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/cert/CRL.java b/ojluni/src/main/java/java/security/cert/CRL.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/cert/CRLException.java b/ojluni/src/main/java/java/security/cert/CRLException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/cert/CRLReason.java b/ojluni/src/main/java/java/security/cert/CRLReason.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/cert/CRLSelector.java b/ojluni/src/main/java/java/security/cert/CRLSelector.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/cert/CertPath.java b/ojluni/src/main/java/java/security/cert/CertPath.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/cert/CertPathBuilder.java b/ojluni/src/main/java/java/security/cert/CertPathBuilder.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/cert/CertPathBuilderException.java b/ojluni/src/main/java/java/security/cert/CertPathBuilderException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/cert/CertPathBuilderResult.java b/ojluni/src/main/java/java/security/cert/CertPathBuilderResult.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/cert/CertPathBuilderSpi.java b/ojluni/src/main/java/java/security/cert/CertPathBuilderSpi.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/cert/CertPathHelperImpl.java b/ojluni/src/main/java/java/security/cert/CertPathHelperImpl.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/cert/CertPathParameters.java b/ojluni/src/main/java/java/security/cert/CertPathParameters.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/cert/CertPathValidator.java b/ojluni/src/main/java/java/security/cert/CertPathValidator.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/cert/CertPathValidatorException.java b/ojluni/src/main/java/java/security/cert/CertPathValidatorException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/cert/CertPathValidatorResult.java b/ojluni/src/main/java/java/security/cert/CertPathValidatorResult.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/cert/CertPathValidatorSpi.java b/ojluni/src/main/java/java/security/cert/CertPathValidatorSpi.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/cert/CertSelector.java b/ojluni/src/main/java/java/security/cert/CertSelector.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/cert/CertStore.java b/ojluni/src/main/java/java/security/cert/CertStore.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/cert/CertStoreException.java b/ojluni/src/main/java/java/security/cert/CertStoreException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/cert/CertStoreParameters.java b/ojluni/src/main/java/java/security/cert/CertStoreParameters.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/cert/CertStoreSpi.java b/ojluni/src/main/java/java/security/cert/CertStoreSpi.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/cert/Certificate.java b/ojluni/src/main/java/java/security/cert/Certificate.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/cert/CertificateEncodingException.java b/ojluni/src/main/java/java/security/cert/CertificateEncodingException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/cert/CertificateException.java b/ojluni/src/main/java/java/security/cert/CertificateException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/cert/CertificateExpiredException.java b/ojluni/src/main/java/java/security/cert/CertificateExpiredException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/cert/CertificateFactory.java b/ojluni/src/main/java/java/security/cert/CertificateFactory.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/cert/CertificateFactorySpi.java b/ojluni/src/main/java/java/security/cert/CertificateFactorySpi.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/cert/CertificateNotYetValidException.java b/ojluni/src/main/java/java/security/cert/CertificateNotYetValidException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/cert/CertificateParsingException.java b/ojluni/src/main/java/java/security/cert/CertificateParsingException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/cert/CertificateRevokedException.java b/ojluni/src/main/java/java/security/cert/CertificateRevokedException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/cert/CollectionCertStoreParameters.java b/ojluni/src/main/java/java/security/cert/CollectionCertStoreParameters.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/cert/Extension.java b/ojluni/src/main/java/java/security/cert/Extension.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/cert/LDAPCertStoreParameters.java b/ojluni/src/main/java/java/security/cert/LDAPCertStoreParameters.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/cert/PKIXBuilderParameters.java b/ojluni/src/main/java/java/security/cert/PKIXBuilderParameters.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/cert/PKIXCertPathBuilderResult.java b/ojluni/src/main/java/java/security/cert/PKIXCertPathBuilderResult.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/cert/PKIXCertPathChecker.java b/ojluni/src/main/java/java/security/cert/PKIXCertPathChecker.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/cert/PKIXCertPathValidatorResult.java b/ojluni/src/main/java/java/security/cert/PKIXCertPathValidatorResult.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/cert/PKIXParameters.java b/ojluni/src/main/java/java/security/cert/PKIXParameters.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/cert/PKIXReason.java b/ojluni/src/main/java/java/security/cert/PKIXReason.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/cert/PolicyNode.java b/ojluni/src/main/java/java/security/cert/PolicyNode.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/cert/PolicyQualifierInfo.java b/ojluni/src/main/java/java/security/cert/PolicyQualifierInfo.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/cert/TrustAnchor.java b/ojluni/src/main/java/java/security/cert/TrustAnchor.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/cert/X509CRL.java b/ojluni/src/main/java/java/security/cert/X509CRL.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/cert/X509CRLEntry.java b/ojluni/src/main/java/java/security/cert/X509CRLEntry.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/cert/X509CRLSelector.java b/ojluni/src/main/java/java/security/cert/X509CRLSelector.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/cert/X509CertSelector.java b/ojluni/src/main/java/java/security/cert/X509CertSelector.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/cert/X509Certificate.java b/ojluni/src/main/java/java/security/cert/X509Certificate.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/cert/X509Extension.java b/ojluni/src/main/java/java/security/cert/X509Extension.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/interfaces/DSAKey.java b/ojluni/src/main/java/java/security/interfaces/DSAKey.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/interfaces/DSAKeyPairGenerator.java b/ojluni/src/main/java/java/security/interfaces/DSAKeyPairGenerator.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/interfaces/DSAParams.java b/ojluni/src/main/java/java/security/interfaces/DSAParams.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/interfaces/DSAPrivateKey.java b/ojluni/src/main/java/java/security/interfaces/DSAPrivateKey.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/interfaces/DSAPublicKey.java b/ojluni/src/main/java/java/security/interfaces/DSAPublicKey.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/interfaces/ECKey.java b/ojluni/src/main/java/java/security/interfaces/ECKey.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/interfaces/ECPrivateKey.java b/ojluni/src/main/java/java/security/interfaces/ECPrivateKey.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/interfaces/ECPublicKey.java b/ojluni/src/main/java/java/security/interfaces/ECPublicKey.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/interfaces/RSAKey.java b/ojluni/src/main/java/java/security/interfaces/RSAKey.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/interfaces/RSAMultiPrimePrivateCrtKey.java b/ojluni/src/main/java/java/security/interfaces/RSAMultiPrimePrivateCrtKey.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/interfaces/RSAPrivateCrtKey.java b/ojluni/src/main/java/java/security/interfaces/RSAPrivateCrtKey.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/interfaces/RSAPrivateKey.java b/ojluni/src/main/java/java/security/interfaces/RSAPrivateKey.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/interfaces/RSAPublicKey.java b/ojluni/src/main/java/java/security/interfaces/RSAPublicKey.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/spec/AlgorithmParameterSpec.java b/ojluni/src/main/java/java/security/spec/AlgorithmParameterSpec.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/spec/DSAParameterSpec.java b/ojluni/src/main/java/java/security/spec/DSAParameterSpec.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/spec/DSAPrivateKeySpec.java b/ojluni/src/main/java/java/security/spec/DSAPrivateKeySpec.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/spec/DSAPublicKeySpec.java b/ojluni/src/main/java/java/security/spec/DSAPublicKeySpec.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/spec/ECField.java b/ojluni/src/main/java/java/security/spec/ECField.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/spec/ECFieldF2m.java b/ojluni/src/main/java/java/security/spec/ECFieldF2m.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/spec/ECFieldFp.java b/ojluni/src/main/java/java/security/spec/ECFieldFp.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/spec/ECGenParameterSpec.java b/ojluni/src/main/java/java/security/spec/ECGenParameterSpec.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/spec/ECParameterSpec.java b/ojluni/src/main/java/java/security/spec/ECParameterSpec.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/spec/ECPoint.java b/ojluni/src/main/java/java/security/spec/ECPoint.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/spec/ECPrivateKeySpec.java b/ojluni/src/main/java/java/security/spec/ECPrivateKeySpec.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/spec/ECPublicKeySpec.java b/ojluni/src/main/java/java/security/spec/ECPublicKeySpec.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/spec/EllipticCurve.java b/ojluni/src/main/java/java/security/spec/EllipticCurve.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/spec/EncodedKeySpec.java b/ojluni/src/main/java/java/security/spec/EncodedKeySpec.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/spec/InvalidKeySpecException.java b/ojluni/src/main/java/java/security/spec/InvalidKeySpecException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/spec/InvalidParameterSpecException.java b/ojluni/src/main/java/java/security/spec/InvalidParameterSpecException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/spec/KeySpec.java b/ojluni/src/main/java/java/security/spec/KeySpec.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/spec/MGF1ParameterSpec.java b/ojluni/src/main/java/java/security/spec/MGF1ParameterSpec.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/spec/PKCS8EncodedKeySpec.java b/ojluni/src/main/java/java/security/spec/PKCS8EncodedKeySpec.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/spec/PSSParameterSpec.java b/ojluni/src/main/java/java/security/spec/PSSParameterSpec.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/spec/RSAKeyGenParameterSpec.java b/ojluni/src/main/java/java/security/spec/RSAKeyGenParameterSpec.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/spec/RSAMultiPrimePrivateCrtKeySpec.java b/ojluni/src/main/java/java/security/spec/RSAMultiPrimePrivateCrtKeySpec.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/spec/RSAOtherPrimeInfo.java b/ojluni/src/main/java/java/security/spec/RSAOtherPrimeInfo.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/spec/RSAPrivateCrtKeySpec.java b/ojluni/src/main/java/java/security/spec/RSAPrivateCrtKeySpec.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/spec/RSAPrivateKeySpec.java b/ojluni/src/main/java/java/security/spec/RSAPrivateKeySpec.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/spec/RSAPublicKeySpec.java b/ojluni/src/main/java/java/security/spec/RSAPublicKeySpec.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/security/spec/X509EncodedKeySpec.java b/ojluni/src/main/java/java/security/spec/X509EncodedKeySpec.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/sql/Array.java b/ojluni/src/main/java/java/sql/Array.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/sql/BatchUpdateException.java b/ojluni/src/main/java/java/sql/BatchUpdateException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/sql/Blob.java b/ojluni/src/main/java/java/sql/Blob.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/sql/CallableStatement.java b/ojluni/src/main/java/java/sql/CallableStatement.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/sql/ClientInfoStatus.java b/ojluni/src/main/java/java/sql/ClientInfoStatus.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/sql/Clob.java b/ojluni/src/main/java/java/sql/Clob.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/sql/Connection.java b/ojluni/src/main/java/java/sql/Connection.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/sql/DataTruncation.java b/ojluni/src/main/java/java/sql/DataTruncation.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/sql/DatabaseMetaData.java b/ojluni/src/main/java/java/sql/DatabaseMetaData.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/sql/Date.java b/ojluni/src/main/java/java/sql/Date.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/sql/Driver.java b/ojluni/src/main/java/java/sql/Driver.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/sql/DriverManager.java b/ojluni/src/main/java/java/sql/DriverManager.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/sql/DriverPropertyInfo.java b/ojluni/src/main/java/java/sql/DriverPropertyInfo.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/sql/NClob.java b/ojluni/src/main/java/java/sql/NClob.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/sql/ParameterMetaData.java b/ojluni/src/main/java/java/sql/ParameterMetaData.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/sql/PreparedStatement.java b/ojluni/src/main/java/java/sql/PreparedStatement.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/sql/Ref.java b/ojluni/src/main/java/java/sql/Ref.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/sql/ResultSet.java b/ojluni/src/main/java/java/sql/ResultSet.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/sql/ResultSetMetaData.java b/ojluni/src/main/java/java/sql/ResultSetMetaData.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/sql/RowId.java b/ojluni/src/main/java/java/sql/RowId.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/sql/RowIdLifetime.java b/ojluni/src/main/java/java/sql/RowIdLifetime.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/sql/SQLClientInfoException.java b/ojluni/src/main/java/java/sql/SQLClientInfoException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/sql/SQLData.java b/ojluni/src/main/java/java/sql/SQLData.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/sql/SQLDataException.java b/ojluni/src/main/java/java/sql/SQLDataException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/sql/SQLException.java b/ojluni/src/main/java/java/sql/SQLException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/sql/SQLFeatureNotSupportedException.java b/ojluni/src/main/java/java/sql/SQLFeatureNotSupportedException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/sql/SQLInput.java b/ojluni/src/main/java/java/sql/SQLInput.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/sql/SQLIntegrityConstraintViolationException.java b/ojluni/src/main/java/java/sql/SQLIntegrityConstraintViolationException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/sql/SQLInvalidAuthorizationSpecException.java b/ojluni/src/main/java/java/sql/SQLInvalidAuthorizationSpecException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/sql/SQLNonTransientConnectionException.java b/ojluni/src/main/java/java/sql/SQLNonTransientConnectionException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/sql/SQLNonTransientException.java b/ojluni/src/main/java/java/sql/SQLNonTransientException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/sql/SQLOutput.java b/ojluni/src/main/java/java/sql/SQLOutput.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/sql/SQLPermission.java b/ojluni/src/main/java/java/sql/SQLPermission.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/sql/SQLRecoverableException.java b/ojluni/src/main/java/java/sql/SQLRecoverableException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/sql/SQLSyntaxErrorException.java b/ojluni/src/main/java/java/sql/SQLSyntaxErrorException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/sql/SQLTimeoutException.java b/ojluni/src/main/java/java/sql/SQLTimeoutException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/sql/SQLTransactionRollbackException.java b/ojluni/src/main/java/java/sql/SQLTransactionRollbackException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/sql/SQLTransientConnectionException.java b/ojluni/src/main/java/java/sql/SQLTransientConnectionException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/sql/SQLTransientException.java b/ojluni/src/main/java/java/sql/SQLTransientException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/sql/SQLWarning.java b/ojluni/src/main/java/java/sql/SQLWarning.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/sql/SQLXML.java b/ojluni/src/main/java/java/sql/SQLXML.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/sql/Savepoint.java b/ojluni/src/main/java/java/sql/Savepoint.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/sql/Statement.java b/ojluni/src/main/java/java/sql/Statement.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/sql/Struct.java b/ojluni/src/main/java/java/sql/Struct.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/sql/Time.java b/ojluni/src/main/java/java/sql/Time.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/sql/Timestamp.java b/ojluni/src/main/java/java/sql/Timestamp.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/sql/Types.java b/ojluni/src/main/java/java/sql/Types.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/sql/Wrapper.java b/ojluni/src/main/java/java/sql/Wrapper.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/text/Annotation.java b/ojluni/src/main/java/java/text/Annotation.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/text/AttributedCharacterIterator.java b/ojluni/src/main/java/java/text/AttributedCharacterIterator.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/text/AttributedString.java b/ojluni/src/main/java/java/text/AttributedString.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/text/Bidi.java b/ojluni/src/main/java/java/text/Bidi.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/text/BreakIterator.java b/ojluni/src/main/java/java/text/BreakIterator.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/text/CalendarBuilder.java b/ojluni/src/main/java/java/text/CalendarBuilder.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/text/CharacterIterator.java b/ojluni/src/main/java/java/text/CharacterIterator.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/text/CharacterIteratorFieldDelegate.java b/ojluni/src/main/java/java/text/CharacterIteratorFieldDelegate.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/text/ChoiceFormat.java b/ojluni/src/main/java/java/text/ChoiceFormat.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/text/CollationElementIterator.java b/ojluni/src/main/java/java/text/CollationElementIterator.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/text/CollationKey.java b/ojluni/src/main/java/java/text/CollationKey.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/text/Collator.java b/ojluni/src/main/java/java/text/Collator.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/text/DateFormat.java b/ojluni/src/main/java/java/text/DateFormat.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/text/DateFormatSymbols.java b/ojluni/src/main/java/java/text/DateFormatSymbols.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/text/DecimalFormat.java b/ojluni/src/main/java/java/text/DecimalFormat.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/text/DecimalFormatSymbols.java b/ojluni/src/main/java/java/text/DecimalFormatSymbols.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/text/DigitList.java b/ojluni/src/main/java/java/text/DigitList.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/text/DontCareFieldPosition.java b/ojluni/src/main/java/java/text/DontCareFieldPosition.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/text/EntryPair.java b/ojluni/src/main/java/java/text/EntryPair.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/text/FieldPosition.java b/ojluni/src/main/java/java/text/FieldPosition.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/text/Format.java b/ojluni/src/main/java/java/text/Format.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/text/IcuIteratorWrapper.java b/ojluni/src/main/java/java/text/IcuIteratorWrapper.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/text/MergeCollation.java b/ojluni/src/main/java/java/text/MergeCollation.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/text/MessageFormat.java b/ojluni/src/main/java/java/text/MessageFormat.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/text/Normalizer.java b/ojluni/src/main/java/java/text/Normalizer.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/text/NumberFormat.java b/ojluni/src/main/java/java/text/NumberFormat.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/text/ParseException.java b/ojluni/src/main/java/java/text/ParseException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/text/ParsePosition.java b/ojluni/src/main/java/java/text/ParsePosition.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/text/PatternEntry.java b/ojluni/src/main/java/java/text/PatternEntry.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/text/RuleBasedCollator.java b/ojluni/src/main/java/java/text/RuleBasedCollator.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/text/SimpleDateFormat.java b/ojluni/src/main/java/java/text/SimpleDateFormat.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/text/StringCharacterIterator.java b/ojluni/src/main/java/java/text/StringCharacterIterator.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/text/spi/BreakIteratorProvider.java b/ojluni/src/main/java/java/text/spi/BreakIteratorProvider.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/text/spi/CollatorProvider.java b/ojluni/src/main/java/java/text/spi/CollatorProvider.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/text/spi/DateFormatProvider.java b/ojluni/src/main/java/java/text/spi/DateFormatProvider.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/text/spi/DateFormatSymbolsProvider.java b/ojluni/src/main/java/java/text/spi/DateFormatSymbolsProvider.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/text/spi/DecimalFormatSymbolsProvider.java b/ojluni/src/main/java/java/text/spi/DecimalFormatSymbolsProvider.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/text/spi/NumberFormatProvider.java b/ojluni/src/main/java/java/text/spi/NumberFormatProvider.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/AbstractCollection.java b/ojluni/src/main/java/java/util/AbstractCollection.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/AbstractList.java b/ojluni/src/main/java/java/util/AbstractList.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/AbstractMap.java b/ojluni/src/main/java/java/util/AbstractMap.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/AbstractSequentialList.java b/ojluni/src/main/java/java/util/AbstractSequentialList.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/AbstractSet.java b/ojluni/src/main/java/java/util/AbstractSet.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/ArrayList.java b/ojluni/src/main/java/java/util/ArrayList.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/Arrays.java b/ojluni/src/main/java/java/util/Arrays.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/BitSet.java b/ojluni/src/main/java/java/util/BitSet.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/Calendar.java b/ojluni/src/main/java/java/util/Calendar.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/Collection.java b/ojluni/src/main/java/java/util/Collection.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/ComparableTimSort.java b/ojluni/src/main/java/java/util/ComparableTimSort.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/ConcurrentModificationException.java b/ojluni/src/main/java/java/util/ConcurrentModificationException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/Currency.java b/ojluni/src/main/java/java/util/Currency.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/Date.java b/ojluni/src/main/java/java/util/Date.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/Dictionary.java b/ojluni/src/main/java/java/util/Dictionary.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/DualPivotQuicksort.java b/ojluni/src/main/java/java/util/DualPivotQuicksort.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/DuplicateFormatFlagsException.java b/ojluni/src/main/java/java/util/DuplicateFormatFlagsException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/EmptyStackException.java b/ojluni/src/main/java/java/util/EmptyStackException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/EnumMap.java b/ojluni/src/main/java/java/util/EnumMap.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/EnumSet.java b/ojluni/src/main/java/java/util/EnumSet.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/Enumeration.java b/ojluni/src/main/java/java/util/Enumeration.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/EventListener.java b/ojluni/src/main/java/java/util/EventListener.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/EventListenerProxy.java b/ojluni/src/main/java/java/util/EventListenerProxy.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/EventObject.java b/ojluni/src/main/java/java/util/EventObject.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/FormatFlagsConversionMismatchException.java b/ojluni/src/main/java/java/util/FormatFlagsConversionMismatchException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/Formattable.java b/ojluni/src/main/java/java/util/Formattable.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/FormattableFlags.java b/ojluni/src/main/java/java/util/FormattableFlags.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/Formatter.java b/ojluni/src/main/java/java/util/Formatter.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/FormatterClosedException.java b/ojluni/src/main/java/java/util/FormatterClosedException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/GregorianCalendar.java b/ojluni/src/main/java/java/util/GregorianCalendar.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/HashMap.java b/ojluni/src/main/java/java/util/HashMap.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/HashSet.java b/ojluni/src/main/java/java/util/HashSet.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/Hashtable.java b/ojluni/src/main/java/java/util/Hashtable.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/IdentityHashMap.java b/ojluni/src/main/java/java/util/IdentityHashMap.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/IllegalFormatCodePointException.java b/ojluni/src/main/java/java/util/IllegalFormatCodePointException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/IllegalFormatConversionException.java b/ojluni/src/main/java/java/util/IllegalFormatConversionException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/IllegalFormatException.java b/ojluni/src/main/java/java/util/IllegalFormatException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/IllegalFormatFlagsException.java b/ojluni/src/main/java/java/util/IllegalFormatFlagsException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/IllegalFormatPrecisionException.java b/ojluni/src/main/java/java/util/IllegalFormatPrecisionException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/IllegalFormatWidthException.java b/ojluni/src/main/java/java/util/IllegalFormatWidthException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/IllformedLocaleException.java b/ojluni/src/main/java/java/util/IllformedLocaleException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/InputMismatchException.java b/ojluni/src/main/java/java/util/InputMismatchException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/InvalidPropertiesFormatException.java b/ojluni/src/main/java/java/util/InvalidPropertiesFormatException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/Iterator.java b/ojluni/src/main/java/java/util/Iterator.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/JumboEnumSet.java b/ojluni/src/main/java/java/util/JumboEnumSet.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/LinkedHashMap.java b/ojluni/src/main/java/java/util/LinkedHashMap.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/LinkedHashSet.java b/ojluni/src/main/java/java/util/LinkedHashSet.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/LinkedList.java b/ojluni/src/main/java/java/util/LinkedList.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/List.java b/ojluni/src/main/java/java/util/List.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/ListIterator.java b/ojluni/src/main/java/java/util/ListIterator.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/ListResourceBundle.java b/ojluni/src/main/java/java/util/ListResourceBundle.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/Locale.java b/ojluni/src/main/java/java/util/Locale.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/MissingFormatArgumentException.java b/ojluni/src/main/java/java/util/MissingFormatArgumentException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/MissingFormatWidthException.java b/ojluni/src/main/java/java/util/MissingFormatWidthException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/MissingResourceException.java b/ojluni/src/main/java/java/util/MissingResourceException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/NoSuchElementException.java b/ojluni/src/main/java/java/util/NoSuchElementException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/Objects.java b/ojluni/src/main/java/java/util/Objects.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/Observable.java b/ojluni/src/main/java/java/util/Observable.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/Observer.java b/ojluni/src/main/java/java/util/Observer.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/Properties.java b/ojluni/src/main/java/java/util/Properties.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/PropertyPermission.java b/ojluni/src/main/java/java/util/PropertyPermission.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/PropertyResourceBundle.java b/ojluni/src/main/java/java/util/PropertyResourceBundle.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/Random.java b/ojluni/src/main/java/java/util/Random.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/RandomAccess.java b/ojluni/src/main/java/java/util/RandomAccess.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/RegularEnumSet.java b/ojluni/src/main/java/java/util/RegularEnumSet.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/ResourceBundle.java b/ojluni/src/main/java/java/util/ResourceBundle.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/Scanner.java b/ojluni/src/main/java/java/util/Scanner.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/ServiceConfigurationError.java b/ojluni/src/main/java/java/util/ServiceConfigurationError.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/ServiceLoader.java b/ojluni/src/main/java/java/util/ServiceLoader.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/Set.java b/ojluni/src/main/java/java/util/Set.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/SimpleTimeZone.java b/ojluni/src/main/java/java/util/SimpleTimeZone.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/SortedMap.java b/ojluni/src/main/java/java/util/SortedMap.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/SortedSet.java b/ojluni/src/main/java/java/util/SortedSet.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/Stack.java b/ojluni/src/main/java/java/util/Stack.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/StringTokenizer.java b/ojluni/src/main/java/java/util/StringTokenizer.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/TimSort.java b/ojluni/src/main/java/java/util/TimSort.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/TimeZone.java b/ojluni/src/main/java/java/util/TimeZone.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/Timer.java b/ojluni/src/main/java/java/util/Timer.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/TimerTask.java b/ojluni/src/main/java/java/util/TimerTask.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/TooManyListenersException.java b/ojluni/src/main/java/java/util/TooManyListenersException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/TreeMap.java b/ojluni/src/main/java/java/util/TreeMap.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/TreeSet.java b/ojluni/src/main/java/java/util/TreeSet.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/UUID.java b/ojluni/src/main/java/java/util/UUID.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/UnknownFormatConversionException.java b/ojluni/src/main/java/java/util/UnknownFormatConversionException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/UnknownFormatFlagsException.java b/ojluni/src/main/java/java/util/UnknownFormatFlagsException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/Vector.java b/ojluni/src/main/java/java/util/Vector.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/WeakHashMap.java b/ojluni/src/main/java/java/util/WeakHashMap.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/XMLUtils.java b/ojluni/src/main/java/java/util/XMLUtils.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/jar/Attributes.java b/ojluni/src/main/java/java/util/jar/Attributes.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/jar/JarEntry.java b/ojluni/src/main/java/java/util/jar/JarEntry.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/jar/JarException.java b/ojluni/src/main/java/java/util/jar/JarException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/jar/JarFile.java b/ojluni/src/main/java/java/util/jar/JarFile.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/jar/JarInputStream.java b/ojluni/src/main/java/java/util/jar/JarInputStream.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/jar/JarOutputStream.java b/ojluni/src/main/java/java/util/jar/JarOutputStream.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/jar/JarVerifier.java b/ojluni/src/main/java/java/util/jar/JarVerifier.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/jar/Manifest.java b/ojluni/src/main/java/java/util/jar/Manifest.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/jar/Pack200.java b/ojluni/src/main/java/java/util/jar/Pack200.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/logging/ConsoleHandler.java b/ojluni/src/main/java/java/util/logging/ConsoleHandler.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/logging/ErrorManager.java b/ojluni/src/main/java/java/util/logging/ErrorManager.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/logging/FileHandler.java b/ojluni/src/main/java/java/util/logging/FileHandler.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/logging/Filter.java b/ojluni/src/main/java/java/util/logging/Filter.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/logging/Formatter.java b/ojluni/src/main/java/java/util/logging/Formatter.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/logging/Handler.java b/ojluni/src/main/java/java/util/logging/Handler.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/logging/Level.java b/ojluni/src/main/java/java/util/logging/Level.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/logging/LogManager.java b/ojluni/src/main/java/java/util/logging/LogManager.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/logging/LogRecord.java b/ojluni/src/main/java/java/util/logging/LogRecord.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/logging/Logger.java b/ojluni/src/main/java/java/util/logging/Logger.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/logging/Logging.java b/ojluni/src/main/java/java/util/logging/Logging.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/logging/LoggingMXBean.java b/ojluni/src/main/java/java/util/logging/LoggingMXBean.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/logging/LoggingPermission.java b/ojluni/src/main/java/java/util/logging/LoggingPermission.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/logging/LoggingProxyImpl.java b/ojluni/src/main/java/java/util/logging/LoggingProxyImpl.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/logging/MemoryHandler.java b/ojluni/src/main/java/java/util/logging/MemoryHandler.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/logging/SimpleFormatter.java b/ojluni/src/main/java/java/util/logging/SimpleFormatter.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/logging/SocketHandler.java b/ojluni/src/main/java/java/util/logging/SocketHandler.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/logging/StreamHandler.java b/ojluni/src/main/java/java/util/logging/StreamHandler.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/logging/XMLFormatter.java b/ojluni/src/main/java/java/util/logging/XMLFormatter.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/prefs/AbstractPreferences.java b/ojluni/src/main/java/java/util/prefs/AbstractPreferences.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/prefs/BackingStoreException.java b/ojluni/src/main/java/java/util/prefs/BackingStoreException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/prefs/Base64.java b/ojluni/src/main/java/java/util/prefs/Base64.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/prefs/FileSystemPreferences.java b/ojluni/src/main/java/java/util/prefs/FileSystemPreferences.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/prefs/FileSystemPreferencesFactory.java b/ojluni/src/main/java/java/util/prefs/FileSystemPreferencesFactory.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/prefs/InvalidPreferencesFormatException.java b/ojluni/src/main/java/java/util/prefs/InvalidPreferencesFormatException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/prefs/NodeChangeEvent.java b/ojluni/src/main/java/java/util/prefs/NodeChangeEvent.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/prefs/NodeChangeListener.java b/ojluni/src/main/java/java/util/prefs/NodeChangeListener.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/prefs/PreferenceChangeEvent.java b/ojluni/src/main/java/java/util/prefs/PreferenceChangeEvent.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/prefs/PreferenceChangeListener.java b/ojluni/src/main/java/java/util/prefs/PreferenceChangeListener.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/prefs/Preferences.java b/ojluni/src/main/java/java/util/prefs/Preferences.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/prefs/PreferencesFactory.java b/ojluni/src/main/java/java/util/prefs/PreferencesFactory.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/prefs/XmlSupport.java b/ojluni/src/main/java/java/util/prefs/XmlSupport.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/regex/MatchResult.java b/ojluni/src/main/java/java/util/regex/MatchResult.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/regex/Matcher.java b/ojluni/src/main/java/java/util/regex/Matcher.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/regex/Pattern.java b/ojluni/src/main/java/java/util/regex/Pattern.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/regex/PatternSyntaxException.java b/ojluni/src/main/java/java/util/regex/PatternSyntaxException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/spi/CurrencyNameProvider.java b/ojluni/src/main/java/java/util/spi/CurrencyNameProvider.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/spi/LocaleNameProvider.java b/ojluni/src/main/java/java/util/spi/LocaleNameProvider.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/spi/LocaleServiceProvider.java b/ojluni/src/main/java/java/util/spi/LocaleServiceProvider.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/spi/TimeZoneNameProvider.java b/ojluni/src/main/java/java/util/spi/TimeZoneNameProvider.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/zip/Adler32.java b/ojluni/src/main/java/java/util/zip/Adler32.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/zip/CRC32.java b/ojluni/src/main/java/java/util/zip/CRC32.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/zip/CheckedInputStream.java b/ojluni/src/main/java/java/util/zip/CheckedInputStream.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/zip/CheckedOutputStream.java b/ojluni/src/main/java/java/util/zip/CheckedOutputStream.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/zip/Checksum.java b/ojluni/src/main/java/java/util/zip/Checksum.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/zip/DataFormatException.java b/ojluni/src/main/java/java/util/zip/DataFormatException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/zip/Deflater.java b/ojluni/src/main/java/java/util/zip/Deflater.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/zip/DeflaterInputStream.java b/ojluni/src/main/java/java/util/zip/DeflaterInputStream.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/zip/DeflaterOutputStream.java b/ojluni/src/main/java/java/util/zip/DeflaterOutputStream.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/zip/GZIPInputStream.java b/ojluni/src/main/java/java/util/zip/GZIPInputStream.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/zip/GZIPOutputStream.java b/ojluni/src/main/java/java/util/zip/GZIPOutputStream.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/zip/Inflater.java b/ojluni/src/main/java/java/util/zip/Inflater.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/zip/InflaterInputStream.java b/ojluni/src/main/java/java/util/zip/InflaterInputStream.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/zip/InflaterOutputStream.java b/ojluni/src/main/java/java/util/zip/InflaterOutputStream.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/zip/ZStreamRef.java b/ojluni/src/main/java/java/util/zip/ZStreamRef.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/zip/ZipCoder.java b/ojluni/src/main/java/java/util/zip/ZipCoder.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/zip/ZipConstants.java b/ojluni/src/main/java/java/util/zip/ZipConstants.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/zip/ZipConstants64.java b/ojluni/src/main/java/java/util/zip/ZipConstants64.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/zip/ZipEntry.java b/ojluni/src/main/java/java/util/zip/ZipEntry.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/zip/ZipError.java b/ojluni/src/main/java/java/util/zip/ZipError.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/zip/ZipException.java b/ojluni/src/main/java/java/util/zip/ZipException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/zip/ZipFile.java b/ojluni/src/main/java/java/util/zip/ZipFile.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/zip/ZipInputStream.java b/ojluni/src/main/java/java/util/zip/ZipInputStream.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/java/util/zip/ZipOutputStream.java b/ojluni/src/main/java/java/util/zip/ZipOutputStream.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/javax/crypto/AEADBadTagException.java b/ojluni/src/main/java/javax/crypto/AEADBadTagException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/javax/crypto/BadPaddingException.java b/ojluni/src/main/java/javax/crypto/BadPaddingException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/javax/crypto/Cipher.java b/ojluni/src/main/java/javax/crypto/Cipher.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/javax/crypto/CipherInputStream.java b/ojluni/src/main/java/javax/crypto/CipherInputStream.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/javax/crypto/CipherOutputStream.java b/ojluni/src/main/java/javax/crypto/CipherOutputStream.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/javax/crypto/CipherSpi.java b/ojluni/src/main/java/javax/crypto/CipherSpi.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/javax/crypto/CryptoAllPermission.java b/ojluni/src/main/java/javax/crypto/CryptoAllPermission.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/javax/crypto/CryptoPermission.java b/ojluni/src/main/java/javax/crypto/CryptoPermission.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/javax/crypto/CryptoPermissions.java b/ojluni/src/main/java/javax/crypto/CryptoPermissions.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/javax/crypto/CryptoPolicyParser.java b/ojluni/src/main/java/javax/crypto/CryptoPolicyParser.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/javax/crypto/EncryptedPrivateKeyInfo.java b/ojluni/src/main/java/javax/crypto/EncryptedPrivateKeyInfo.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/javax/crypto/ExemptionMechanism.java b/ojluni/src/main/java/javax/crypto/ExemptionMechanism.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/javax/crypto/ExemptionMechanismException.java b/ojluni/src/main/java/javax/crypto/ExemptionMechanismException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/javax/crypto/ExemptionMechanismSpi.java b/ojluni/src/main/java/javax/crypto/ExemptionMechanismSpi.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/javax/crypto/IllegalBlockSizeException.java b/ojluni/src/main/java/javax/crypto/IllegalBlockSizeException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/javax/crypto/JarVerifier.java b/ojluni/src/main/java/javax/crypto/JarVerifier.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/javax/crypto/JceSecurity.java b/ojluni/src/main/java/javax/crypto/JceSecurity.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/javax/crypto/JceSecurityManager.java b/ojluni/src/main/java/javax/crypto/JceSecurityManager.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/javax/crypto/KeyAgreement.java b/ojluni/src/main/java/javax/crypto/KeyAgreement.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/javax/crypto/KeyAgreementSpi.java b/ojluni/src/main/java/javax/crypto/KeyAgreementSpi.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/javax/crypto/KeyGenerator.java b/ojluni/src/main/java/javax/crypto/KeyGenerator.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/javax/crypto/KeyGeneratorSpi.java b/ojluni/src/main/java/javax/crypto/KeyGeneratorSpi.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/javax/crypto/Mac.java b/ojluni/src/main/java/javax/crypto/Mac.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/javax/crypto/MacSpi.java b/ojluni/src/main/java/javax/crypto/MacSpi.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/javax/crypto/NoSuchPaddingException.java b/ojluni/src/main/java/javax/crypto/NoSuchPaddingException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/javax/crypto/NullCipher.java b/ojluni/src/main/java/javax/crypto/NullCipher.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/javax/crypto/NullCipherSpi.java b/ojluni/src/main/java/javax/crypto/NullCipherSpi.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/javax/crypto/SealedObject.java b/ojluni/src/main/java/javax/crypto/SealedObject.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/javax/crypto/SecretKey.java b/ojluni/src/main/java/javax/crypto/SecretKey.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/javax/crypto/SecretKeyFactory.java b/ojluni/src/main/java/javax/crypto/SecretKeyFactory.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/javax/crypto/SecretKeyFactorySpi.java b/ojluni/src/main/java/javax/crypto/SecretKeyFactorySpi.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/javax/crypto/ShortBufferException.java b/ojluni/src/main/java/javax/crypto/ShortBufferException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/javax/crypto/interfaces/DHKey.java b/ojluni/src/main/java/javax/crypto/interfaces/DHKey.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/javax/crypto/interfaces/DHPrivateKey.java b/ojluni/src/main/java/javax/crypto/interfaces/DHPrivateKey.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/javax/crypto/interfaces/DHPublicKey.java b/ojluni/src/main/java/javax/crypto/interfaces/DHPublicKey.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/javax/crypto/interfaces/PBEKey.java b/ojluni/src/main/java/javax/crypto/interfaces/PBEKey.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/javax/crypto/spec/DESKeySpec.java b/ojluni/src/main/java/javax/crypto/spec/DESKeySpec.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/javax/crypto/spec/DESedeKeySpec.java b/ojluni/src/main/java/javax/crypto/spec/DESedeKeySpec.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/javax/crypto/spec/DHGenParameterSpec.java b/ojluni/src/main/java/javax/crypto/spec/DHGenParameterSpec.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/javax/crypto/spec/DHParameterSpec.java b/ojluni/src/main/java/javax/crypto/spec/DHParameterSpec.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/javax/crypto/spec/DHPrivateKeySpec.java b/ojluni/src/main/java/javax/crypto/spec/DHPrivateKeySpec.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/javax/crypto/spec/DHPublicKeySpec.java b/ojluni/src/main/java/javax/crypto/spec/DHPublicKeySpec.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/javax/crypto/spec/GCMParameterSpec.java b/ojluni/src/main/java/javax/crypto/spec/GCMParameterSpec.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/javax/crypto/spec/IvParameterSpec.java b/ojluni/src/main/java/javax/crypto/spec/IvParameterSpec.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/javax/crypto/spec/OAEPParameterSpec.java b/ojluni/src/main/java/javax/crypto/spec/OAEPParameterSpec.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/javax/crypto/spec/PBEKeySpec.java b/ojluni/src/main/java/javax/crypto/spec/PBEKeySpec.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/javax/crypto/spec/PBEParameterSpec.java b/ojluni/src/main/java/javax/crypto/spec/PBEParameterSpec.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/javax/crypto/spec/PSource.java b/ojluni/src/main/java/javax/crypto/spec/PSource.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/javax/crypto/spec/RC2ParameterSpec.java b/ojluni/src/main/java/javax/crypto/spec/RC2ParameterSpec.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/javax/crypto/spec/RC5ParameterSpec.java b/ojluni/src/main/java/javax/crypto/spec/RC5ParameterSpec.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/javax/crypto/spec/SecretKeySpec.java b/ojluni/src/main/java/javax/crypto/spec/SecretKeySpec.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/javax/net/ServerSocketFactory.java b/ojluni/src/main/java/javax/net/ServerSocketFactory.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/javax/net/SocketFactory.java b/ojluni/src/main/java/javax/net/SocketFactory.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/javax/net/ssl/CertPathTrustManagerParameters.java b/ojluni/src/main/java/javax/net/ssl/CertPathTrustManagerParameters.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/javax/net/ssl/ExtendedSSLSession.java b/ojluni/src/main/java/javax/net/ssl/ExtendedSSLSession.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/javax/net/ssl/HandshakeCompletedEvent.java b/ojluni/src/main/java/javax/net/ssl/HandshakeCompletedEvent.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/javax/net/ssl/HandshakeCompletedListener.java b/ojluni/src/main/java/javax/net/ssl/HandshakeCompletedListener.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/javax/net/ssl/HostnameVerifier.java b/ojluni/src/main/java/javax/net/ssl/HostnameVerifier.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/javax/net/ssl/HttpsURLConnection.java b/ojluni/src/main/java/javax/net/ssl/HttpsURLConnection.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/javax/net/ssl/KeyManager.java b/ojluni/src/main/java/javax/net/ssl/KeyManager.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/javax/net/ssl/KeyManagerFactory.java b/ojluni/src/main/java/javax/net/ssl/KeyManagerFactory.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/javax/net/ssl/KeyManagerFactorySpi.java b/ojluni/src/main/java/javax/net/ssl/KeyManagerFactorySpi.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/javax/net/ssl/KeyStoreBuilderParameters.java b/ojluni/src/main/java/javax/net/ssl/KeyStoreBuilderParameters.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/javax/net/ssl/ManagerFactoryParameters.java b/ojluni/src/main/java/javax/net/ssl/ManagerFactoryParameters.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/javax/net/ssl/SSLContext.java b/ojluni/src/main/java/javax/net/ssl/SSLContext.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/javax/net/ssl/SSLContextSpi.java b/ojluni/src/main/java/javax/net/ssl/SSLContextSpi.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/javax/net/ssl/SSLEngine.java b/ojluni/src/main/java/javax/net/ssl/SSLEngine.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/javax/net/ssl/SSLEngineResult.java b/ojluni/src/main/java/javax/net/ssl/SSLEngineResult.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/javax/net/ssl/SSLException.java b/ojluni/src/main/java/javax/net/ssl/SSLException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/javax/net/ssl/SSLHandshakeException.java b/ojluni/src/main/java/javax/net/ssl/SSLHandshakeException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/javax/net/ssl/SSLKeyException.java b/ojluni/src/main/java/javax/net/ssl/SSLKeyException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/javax/net/ssl/SSLParameters.java b/ojluni/src/main/java/javax/net/ssl/SSLParameters.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/javax/net/ssl/SSLPeerUnverifiedException.java b/ojluni/src/main/java/javax/net/ssl/SSLPeerUnverifiedException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/javax/net/ssl/SSLPermission.java b/ojluni/src/main/java/javax/net/ssl/SSLPermission.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/javax/net/ssl/SSLProtocolException.java b/ojluni/src/main/java/javax/net/ssl/SSLProtocolException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/javax/net/ssl/SSLServerSocket.java b/ojluni/src/main/java/javax/net/ssl/SSLServerSocket.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/javax/net/ssl/SSLServerSocketFactory.java b/ojluni/src/main/java/javax/net/ssl/SSLServerSocketFactory.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/javax/net/ssl/SSLSession.java b/ojluni/src/main/java/javax/net/ssl/SSLSession.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/javax/net/ssl/SSLSessionBindingEvent.java b/ojluni/src/main/java/javax/net/ssl/SSLSessionBindingEvent.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/javax/net/ssl/SSLSessionBindingListener.java b/ojluni/src/main/java/javax/net/ssl/SSLSessionBindingListener.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/javax/net/ssl/SSLSessionContext.java b/ojluni/src/main/java/javax/net/ssl/SSLSessionContext.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/javax/net/ssl/SSLSocket.java b/ojluni/src/main/java/javax/net/ssl/SSLSocket.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/javax/net/ssl/SSLSocketFactory.java b/ojluni/src/main/java/javax/net/ssl/SSLSocketFactory.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/javax/net/ssl/TrustManager.java b/ojluni/src/main/java/javax/net/ssl/TrustManager.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/javax/net/ssl/TrustManagerFactory.java b/ojluni/src/main/java/javax/net/ssl/TrustManagerFactory.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/javax/net/ssl/TrustManagerFactorySpi.java b/ojluni/src/main/java/javax/net/ssl/TrustManagerFactorySpi.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/javax/net/ssl/X509ExtendedKeyManager.java b/ojluni/src/main/java/javax/net/ssl/X509ExtendedKeyManager.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/javax/net/ssl/X509ExtendedTrustManager.java b/ojluni/src/main/java/javax/net/ssl/X509ExtendedTrustManager.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/javax/net/ssl/X509KeyManager.java b/ojluni/src/main/java/javax/net/ssl/X509KeyManager.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/javax/net/ssl/X509TrustManager.java b/ojluni/src/main/java/javax/net/ssl/X509TrustManager.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/javax/security/auth/AuthPermission.java b/ojluni/src/main/java/javax/security/auth/AuthPermission.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/javax/security/auth/DestroyFailedException.java b/ojluni/src/main/java/javax/security/auth/DestroyFailedException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/javax/security/auth/Destroyable.java b/ojluni/src/main/java/javax/security/auth/Destroyable.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/javax/security/auth/PrivateCredentialPermission.java b/ojluni/src/main/java/javax/security/auth/PrivateCredentialPermission.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/javax/security/auth/Subject.java b/ojluni/src/main/java/javax/security/auth/Subject.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/javax/security/auth/SubjectDomainCombiner.java b/ojluni/src/main/java/javax/security/auth/SubjectDomainCombiner.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/javax/security/auth/callback/Callback.java b/ojluni/src/main/java/javax/security/auth/callback/Callback.java
old mode 100755
new mode 100644
index 43f884f..83855ca
--- a/ojluni/src/main/java/javax/security/auth/callback/Callback.java
+++ b/ojluni/src/main/java/javax/security/auth/callback/Callback.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,14 +28,14 @@
 
 /**
  * <p> Implementations of this interface are passed to a
- * <code>CallbackHandler</code>, allowing underlying security services
+ * {@code CallbackHandler}, allowing underlying security services
  * the ability to interact with a calling application to retrieve specific
  * authentication data such as usernames and passwords, or to display
  * certain information, such as error and warning messages.
  *
- * <p> <code>Callback</code> implementations do not retrieve or
+ * <p> {@code Callback} implementations do not retrieve or
  * display the information requested by underlying security services.
- * <code>Callback</code> implementations simply provide the means
+ * {@code Callback} implementations simply provide the means
  * to pass such requests to applications, and for applications,
  * if appropriate, to return requested information back to the
  * underlying security services.
diff --git a/ojluni/src/main/java/javax/security/auth/callback/CallbackHandler.java b/ojluni/src/main/java/javax/security/auth/callback/CallbackHandler.java
old mode 100755
new mode 100644
index f49b1c4..af02496
--- a/ojluni/src/main/java/javax/security/auth/callback/CallbackHandler.java
+++ b/ojluni/src/main/java/javax/security/auth/callback/CallbackHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@
 package javax.security.auth.callback;
 
 /**
- * <p> An application implements a <code>CallbackHandler</code> and passes
+ * <p> An application implements a {@code CallbackHandler} and passes
  * it to underlying security services so that they may interact with
  * the application to retrieve specific authentication data,
  * such as usernames and passwords, or to display certain information,
@@ -40,33 +40,30 @@
  *
  * <p> Underlying security services make requests for different types
  * of information by passing individual Callbacks to the
- * <code>CallbackHandler</code>.  The <code>CallbackHandler</code>
+ * {@code CallbackHandler}.  The {@code CallbackHandler}
  * implementation decides how to retrieve and display information
  * depending on the Callbacks passed to it.  For example,
  * if the underlying service needs a username and password to
- * authenticate a user, it uses a <code>NameCallback</code> and
- * <code>PasswordCallback</code>.  The <code>CallbackHandler</code>
+ * authenticate a user, it uses a {@code NameCallback} and
+ * {@code PasswordCallback}.  The {@code CallbackHandler}
  * can then choose to prompt for a username and password serially,
  * or to prompt for both in a single window.
  *
- * <p> A default <code>CallbackHandler</code> class implementation
- * may be specified in the <i>auth.login.defaultCallbackHandler</i>
- * security property.  The security property can be set
- * in the Java security properties file located in the file named
- * &lt;JAVA_HOME&gt;/lib/security/java.security.
- * &lt;JAVA_HOME&gt; refers to the value of the java.home system property,
- * and specifies the directory where the JRE is installed.
+ * <p> A default {@code CallbackHandler} class implementation
+ * may be specified by setting the value of the
+ * {@code auth.login.defaultCallbackHandler} security property.
  *
  * <p> If the security property is set to the fully qualified name of a
- * <code>CallbackHandler</code> implementation class,
- * then a <code>LoginContext</code> will load the specified
- * <code>CallbackHandler</code> and pass it to the underlying LoginModules.
- * The <code>LoginContext</code> only loads the default handler
+ * {@code CallbackHandler} implementation class,
+ * then a {@code LoginContext} will load the specified
+ * {@code CallbackHandler} and pass it to the underlying LoginModules.
+ * The {@code LoginContext} only loads the default handler
  * if it was not provided one.
  *
  * <p> All default handler implementations must provide a public
  * zero-argument constructor.
  *
+ * @see java.security.Security security properties
  */
 public interface CallbackHandler {
 
@@ -74,15 +71,15 @@
      * <p> Retrieve or display the information requested in the
      * provided Callbacks.
      *
-     * <p> The <code>handle</code> method implementation checks the
-     * instance(s) of the <code>Callback</code> object(s) passed in
+     * <p> The {@code handle} method implementation checks the
+     * instance(s) of the {@code Callback} object(s) passed in
      * to retrieve or display the requested information.
      * The following example is provided to help demonstrate what an
-     * <code>handle</code> method implementation might look like.
+     * {@code handle} method implementation might look like.
      * This example code is for guidance only.  Many details,
      * including proper error handling, are left out for simplicity.
      *
-     * <pre>
+     * <pre>{@code
      * public void handle(Callback[] callbacks)
      * throws IOException, UnsupportedCallbackException {
      *
@@ -136,9 +133,9 @@
      * private char[] readPassword(InputStream in) throws IOException {
      *    // insert code to read a user password from the input stream
      * }
-     * </pre>
+     * }</pre>
      *
-     * @param callbacks an array of <code>Callback</code> objects provided
+     * @param callbacks an array of {@code Callback} objects provided
      *          by an underlying security service which contains
      *          the information requested to be retrieved or displayed.
      *
@@ -146,7 +143,7 @@
      *
      * @exception UnsupportedCallbackException if the implementation of this
      *          method does not support one or more of the Callbacks
-     *          specified in the <code>callbacks</code> parameter.
+     *          specified in the {@code callbacks} parameter.
      */
     void handle(Callback[] callbacks)
     throws java.io.IOException, UnsupportedCallbackException;
diff --git a/ojluni/src/main/java/javax/security/auth/callback/PasswordCallback.java b/ojluni/src/main/java/javax/security/auth/callback/PasswordCallback.java
old mode 100755
new mode 100644
index d040740..0e8fb7b
--- a/ojluni/src/main/java/javax/security/auth/callback/PasswordCallback.java
+++ b/ojluni/src/main/java/javax/security/auth/callback/PasswordCallback.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,8 +27,8 @@
 
 /**
  * <p> Underlying security services instantiate and pass a
- * <code>PasswordCallback</code> to the <code>handle</code>
- * method of a <code>CallbackHandler</code> to retrieve password information.
+ * {@code PasswordCallback} to the {@code handle}
+ * method of a {@code CallbackHandler} to retrieve password information.
  *
  * @see javax.security.auth.callback.CallbackHandler
  */
@@ -53,7 +53,7 @@
     private char[] inputPassword;
 
     /**
-     * Construct a <code>PasswordCallback</code> with a prompt
+     * Construct a {@code PasswordCallback} with a prompt
      * and a boolean specifying whether the password should be displayed
      * as it is being typed.
      *
@@ -64,8 +64,8 @@
      * @param echoOn true if the password should be displayed
      *                  as it is being typed.
      *
-     * @exception IllegalArgumentException if <code>prompt</code> is null or
-     *                  if <code>prompt</code> has a length of 0.
+     * @exception IllegalArgumentException if {@code prompt} is null or
+     *                  if {@code prompt} has a length of 0.
      */
     public PasswordCallback(String prompt, boolean echoOn) {
         if (prompt == null || prompt.length() == 0)
diff --git a/ojluni/src/main/java/javax/security/auth/callback/UnsupportedCallbackException.java b/ojluni/src/main/java/javax/security/auth/callback/UnsupportedCallbackException.java
old mode 100755
new mode 100644
index cb9b66b..0a9fa51
--- a/ojluni/src/main/java/javax/security/auth/callback/UnsupportedCallbackException.java
+++ b/ojluni/src/main/java/javax/security/auth/callback/UnsupportedCallbackException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,8 +26,8 @@
 package javax.security.auth.callback;
 
 /**
- * Signals that a <code>CallbackHandler</code> does not
- * recognize a particular <code>Callback</code>.
+ * Signals that a {@code CallbackHandler} does not
+ * recognize a particular {@code Callback}.
  *
  */
 public class UnsupportedCallbackException extends Exception {
@@ -40,12 +40,12 @@
     private Callback callback;
 
     /**
-     * Constructs a <code>UnsupportedCallbackException</code>
+     * Constructs a {@code UnsupportedCallbackException}
      * with no detail message.
      *
      * <p>
      *
-     * @param callback the unrecognized <code>Callback</code>.
+     * @param callback the unrecognized {@code Callback}.
      */
     public UnsupportedCallbackException(Callback callback) {
         super();
@@ -59,7 +59,7 @@
      *
      * <p>
      *
-     * @param callback the unrecognized <code>Callback</code>. <p>
+     * @param callback the unrecognized {@code Callback}. <p>
      *
      * @param msg the detail message.
      */
@@ -69,11 +69,11 @@
     }
 
     /**
-     * Get the unrecognized <code>Callback</code>.
+     * Get the unrecognized {@code Callback}.
      *
      * <p>
      *
-     * @return the unrecognized <code>Callback</code>.
+     * @return the unrecognized {@code Callback}.
      */
     public Callback getCallback() {
         return callback;
diff --git a/ojluni/src/main/java/javax/security/auth/callback/package-info.java b/ojluni/src/main/java/javax/security/auth/callback/package-info.java
new file mode 100644
index 0000000..4cd5daf
--- /dev/null
+++ b/ojluni/src/main/java/javax/security/auth/callback/package-info.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * This package provides the classes necessary for services
+ * to interact with applications in order to retrieve
+ * information (authentication data including usernames
+ * or passwords, for example) or to display information
+ * (error and warning messages, for example).
+ *
+ * @since JDK1.4
+ */
+package javax.security.auth.callback;
diff --git a/ojluni/src/main/java/javax/security/auth/callback/package.html b/ojluni/src/main/java/javax/security/auth/callback/package.html
deleted file mode 100755
index 66d58e4..0000000
--- a/ojluni/src/main/java/javax/security/auth/callback/package.html
+++ /dev/null
@@ -1,57 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-
-This code is free software; you can redistribute it and/or modify it
-under the terms of the GNU General Public License version 2 only, as
-published by the Free Software Foundation.  Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the LICENSE file that accompanied this code.
-
-This code is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-version 2 for more details (a copy is included in the LICENSE file that
-accompanied this code).
-
-You should have received a copy of the GNU General Public License version
-2 along with this work; if not, write to the Free Software Foundation,
-Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-
-Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-or visit www.oracle.com if you need additional information or have any
-questions.
--->
-
-</head>
-<body bgcolor="white">
-
-	This package provides the classes necessary for services
- 	to interact with applications in order to retrieve 
- 	information (authentication data including usernames
- 	or passwords, for example) or to display information
- 	(error and warning messages, for example).
-
-<!--
-<h2>Package Specification</h2>
-
-##### FILL IN ANY SPECS NEEDED BY JAVA COMPATIBILITY KIT #####
-<ul>
-  <li><a href="">##### REFER TO ANY FRAMEMAKER SPECIFICATION HERE #####</a>
-</ul>
-
-<h2>Related Documentation</h2>
-
-For overviews, tutorials, examples, guides, and tool documentation, please see:
-<ul>
-  <li><a href="">##### REFER TO NON-SPEC DOCUMENTATION HERE #####</a>
-</ul>
-
--->
-
-@since JDK1.4
-</body>
-</html>
diff --git a/ojluni/src/main/java/javax/security/auth/login/LoginException.java b/ojluni/src/main/java/javax/security/auth/login/LoginException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/javax/security/auth/login/package-info.java b/ojluni/src/main/java/javax/security/auth/login/package-info.java
new file mode 100644
index 0000000..a0f7f68
--- /dev/null
+++ b/ojluni/src/main/java/javax/security/auth/login/package-info.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * This package provides a pluggable authentication framework.
+ * <h2>Package Specification</h2>
+ *
+ * <ul>
+ *   <li><a href="{@docRoot}openjdk-redirect.html?v=8&path=/../technotes/guides/security/StandardNames.html">
+ *     <b>Java&trade;
+ *     Cryptography Architecture Standard Algorithm Name
+ *     Documentation</b></a></li>
+ * </ul>
+ *
+ * @since 1.4
+ */
+package javax.security.auth.login;
diff --git a/ojluni/src/main/java/javax/security/auth/login/package.html b/ojluni/src/main/java/javax/security/auth/login/package.html
deleted file mode 100755
index 6bf4b6d..0000000
--- a/ojluni/src/main/java/javax/security/auth/login/package.html
+++ /dev/null
@@ -1,54 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-
-This code is free software; you can redistribute it and/or modify it
-under the terms of the GNU General Public License version 2 only, as
-published by the Free Software Foundation.  Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the LICENSE file that accompanied this code.
-
-This code is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-version 2 for more details (a copy is included in the LICENSE file that
-accompanied this code).
-
-You should have received a copy of the GNU General Public License version
-2 along with this work; if not, write to the Free Software Foundation,
-Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-
-Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-or visit www.oracle.com if you need additional information or have any
-questions.
--->
-
-</head>
-<body bgcolor="white">
-
-	This package provides a pluggable authentication framework.
-<h2>Package Specification</h2>
-
-<ul>
-  <li><a href="{@docRoot}openjdk-redirect.html?v=8&path=/technotes/guides/security/StandardNames.html">
-    <b>Java<FONT SIZE=-2><SUP>TM</SUP></FONT>
-    Cryptography Architecture Standard Algorithm Name
-    Documentation</b></a></li>
-</ul>
-
-<!--
-<h2>Related Documentation</h2>
-
-For overviews, tutorials, examples, guides, and tool documentation, please see:
-<ul>
-  <li><a href="">##### REFER TO NON-SPEC DOCUMENTATION HERE #####</a>
-</ul>
-
--->
-
-@since 1.4
-</body>
-</html>
diff --git a/ojluni/src/main/java/javax/security/auth/x500/X500Principal.java b/ojluni/src/main/java/javax/security/auth/x500/X500Principal.java
old mode 100755
new mode 100644
index 5636856..77292b0
--- a/ojluni/src/main/java/javax/security/auth/x500/X500Principal.java
+++ b/ojluni/src/main/java/javax/security/auth/x500/X500Principal.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,8 +33,8 @@
 import sun.security.util.*;
 
 /**
- * <p> This class represents an X.500 <code>Principal</code>.
- * <code>X500Principal</code>s are represented by distinguished names such as
+ * <p> This class represents an X.500 {@code Principal}.
+ * {@code X500Principal}s are represented by distinguished names such as
  * "CN=Duke, OU=JavaSoft, O=Sun Microsystems, C=US".
  *
  * <p> This class can be instantiated by using a string representation
@@ -50,12 +50,12 @@
  * <a href="http://www.ietf.org/rfc/rfc3280.txt">RFC 3280: Internet X.509
  * Public Key Infrastructure Certificate and CRL Profile</a>.
  *
- * <p> The string representation for this <code>X500Principal</code>
- * can be obtained by calling the <code>getName</code> methods.
+ * <p> The string representation for this {@code X500Principal}
+ * can be obtained by calling the {@code getName} methods.
  *
- * <p> Note that the <code>getSubjectX500Principal</code> and
- * <code>getIssuerX500Principal</code> methods of
- * <code>X509Certificate</code> return X500Principals representing the
+ * <p> Note that the {@code getSubjectX500Principal} and
+ * {@code getIssuerX500Principal} methods of
+ * {@code X509Certificate} return X500Principals representing the
  * issuer and subject fields of the certificate.
  *
  * @see java.security.cert.X509Certificate
@@ -97,7 +97,7 @@
     }
 
     /**
-     * Creates an <code>X500Principal</code> from a string representation of
+     * Creates an {@code X500Principal} from a string representation of
      * an X.500 distinguished name (ex:
      * "CN=Duke, OU=JavaSoft, O=Sun Microsystems, C=US").
      * The distinguished name must be specified using the grammar defined in
@@ -107,22 +107,29 @@
      * defined in RFC 1779 and RFC 2253
      * (and listed in {@link #getName(String format) getName(String format)}),
      * as well as the T, DNQ or DNQUALIFIER, SURNAME, GIVENNAME, INITIALS,
-     * GENERATION, EMAILADDRESS, and SERIALNUMBER keywords whose OIDs are
-     * defined in RFC 3280 and its successor.
+     * GENERATION, EMAILADDRESS, and SERIALNUMBER keywords whose Object
+     * Identifiers (OIDs) are defined in RFC 3280 and its successor.
      * Any other attribute type must be specified as an OID.
      *
+     * <p>This implementation enforces a more restrictive OID syntax than
+     * defined in RFC 1779 and 2253. It uses the more correct syntax defined in
+     * <a href="http://www.ietf.org/rfc/rfc4512.txt">RFC 4512</a>, which
+     * specifies that OIDs contain at least 2 digits:
+     *
+     * <p>{@code numericoid = number 1*( DOT number ) }
+     *
      * @param name an X.500 distinguished name in RFC 1779 or RFC 2253 format
-     * @exception NullPointerException if the <code>name</code>
-     *                  is <code>null</code>
-     * @exception IllegalArgumentException if the <code>name</code>
+     * @exception NullPointerException if the {@code name}
+     *                  is {@code null}
+     * @exception IllegalArgumentException if the {@code name}
      *                  is improperly specified
      */
     public X500Principal(String name) {
-        this(name, (Map<String, String>) Collections.EMPTY_MAP);
+        this(name, Collections.<String, String>emptyMap());
     }
 
     /**
-     * Creates an <code>X500Principal</code> from a string representation of
+     * Creates an {@code X500Principal} from a string representation of
      * an X.500 distinguished name (ex:
      * "CN=Duke, OU=JavaSoft, O=Sun Microsystems, C=US").
      * The distinguished name must be specified using the grammar defined in
@@ -130,24 +137,31 @@
      *
      * <p> This constructor recognizes the attribute type keywords specified
      * in {@link #X500Principal(String)} and also recognizes additional
-     * keywords that have entries in the <code>keywordMap</code> parameter.
+     * keywords that have entries in the {@code keywordMap} parameter.
      * Keyword entries in the keywordMap take precedence over the default
-     * keywords recognized by <code>X500Principal(String)</code>. Keywords
+     * keywords recognized by {@code X500Principal(String)}. Keywords
      * MUST be specified in all upper-case, otherwise they will be ignored.
      * Improperly specified keywords are ignored; however if a keyword in the
-     * name maps to an improperly specified OID, an
-     * <code>IllegalArgumentException</code> is thrown. It is permissible to
+     * name maps to an improperly specified Object Identifier (OID), an
+     * {@code IllegalArgumentException} is thrown. It is permissible to
      * have 2 different keywords that map to the same OID.
      *
+     * <p>This implementation enforces a more restrictive OID syntax than
+     * defined in RFC 1779 and 2253. It uses the more correct syntax defined in
+     * <a href="http://www.ietf.org/rfc/rfc4512.txt">RFC 4512</a>, which
+     * specifies that OIDs contain at least 2 digits:
+     *
+     * <p>{@code numericoid = number 1*( DOT number ) }
+     *
      * @param name an X.500 distinguished name in RFC 1779 or RFC 2253 format
      * @param keywordMap an attribute type keyword map, where each key is a
      *   keyword String that maps to a corresponding object identifier in String
      *   form (a sequence of nonnegative integers separated by periods). The map
-     *   may be empty but never <code>null</code>.
-     * @exception NullPointerException if <code>name</code> or
-     *   <code>keywordMap</code> is <code>null</code>
-     * @exception IllegalArgumentException if the <code>name</code> is
-     *   improperly specified or a keyword in the <code>name</code> maps to an
+     *   may be empty but never {@code null}.
+     * @exception NullPointerException if {@code name} or
+     *   {@code keywordMap} is {@code null}
+     * @exception IllegalArgumentException if the {@code name} is
+     *   improperly specified or a keyword in the {@code name} maps to an
      *   OID that is not in the correct form
      * @since 1.6
      */
@@ -174,10 +188,10 @@
     }
 
     /**
-     * Creates an <code>X500Principal</code> from a distinguished name in
+     * Creates an {@code X500Principal} from a distinguished name in
      * ASN.1 DER encoded form. The ASN.1 notation for this structure is as
      * follows.
-     * <pre><code>
+     * <pre>{@code
      * Name ::= CHOICE {
      *   RDNSequence }
      *
@@ -200,7 +214,7 @@
      *       universalString         UniversalString (SIZE (1..MAX)),
      *       utf8String              UTF8String (SIZE (1.. MAX)),
      *       bmpString               BMPString (SIZE (1..MAX)) }
-     * </code></pre>
+     * }</pre>
      *
      * @param name a byte array containing the distinguished name in ASN.1
      * DER encoded form
@@ -219,7 +233,7 @@
     }
 
     /**
-     * Creates an <code>X500Principal</code> from an <code>InputStream</code>
+     * Creates an {@code X500Principal} from an {@code InputStream}
      * containing the distinguished name in ASN.1 DER encoded form.
      * The ASN.1 notation for this structure is supplied in the
      * documentation for
@@ -228,11 +242,11 @@
      * <p> The read position of the input stream is positioned
      * to the next available byte after the encoded distinguished name.
      *
-     * @param is an <code>InputStream</code> containing the distinguished
+     * @param is an {@code InputStream} containing the distinguished
      *          name in ASN.1 DER encoded form
      *
-     * @exception NullPointerException if the <code>InputStream</code>
-     *          is <code>null</code>
+     * @exception NullPointerException if the {@code InputStream}
+     *          is {@code null}
      * @exception IllegalArgumentException if an encoding error occurs
      *          (incorrect form for DN)
      */
@@ -270,9 +284,9 @@
      * the format defined in RFC 2253.
      *
      * <p>This method is equivalent to calling
-     * <code>getName(X500Principal.RFC2253)</code>.
+     * {@code getName(X500Principal.RFC2253)}.
      *
-     * @return the distinguished name of this <code>X500Principal</code>
+     * @return the distinguished name of this {@code X500Principal}
      */
     public String getName() {
         return getName(X500Principal.RFC2253);
@@ -300,7 +314,7 @@
      * this method returns an RFC 2253 conformant string representation
      * with the following additional canonicalizations:
      *
-     * <p><ol>
+     * <ol>
      * <li> Leading zeros are removed from attribute types
      *          that are encoded as dotted decimal OIDs
      * <li> DirectoryString attribute values of type
@@ -324,9 +338,9 @@
      *          those which section 2.4 of RFC 2253 states must be escaped
      *          (they are escaped using a preceding backslash character)
      * <li> The entire name is converted to upper case
-     *          using <code>String.toUpperCase(Locale.US)</code>
+     *          using {@code String.toUpperCase(Locale.US)}
      * <li> The entire name is converted to lower case
-     *          using <code>String.toLowerCase(Locale.US)</code>
+     *          using {@code String.toLowerCase(Locale.US)}
      * <li> The name is finally normalized using normalization form KD,
      *          as described in the Unicode Standard and UAX #15
      * </ol>
@@ -335,7 +349,7 @@
      *
      * @param format the format to use
      *
-     * @return a string representation of this <code>X500Principal</code>
+     * @return a string representation of this {@code X500Principal}
      *          using the specified format
      * @throws IllegalArgumentException if the specified format is invalid
      *          or null
@@ -357,16 +371,16 @@
      * Returns a string representation of the X.500 distinguished name
      * using the specified format. Valid values for the format are
      * "RFC1779" and "RFC2253" (case insensitive). "CANONICAL" is not
-     * permitted and an <code>IllegalArgumentException</code> will be thrown.
+     * permitted and an {@code IllegalArgumentException} will be thrown.
      *
      * <p>This method returns Strings in the format as specified in
      * {@link #getName(String)} and also emits additional attribute type
-     * keywords for OIDs that have entries in the <code>oidMap</code>
+     * keywords for OIDs that have entries in the {@code oidMap}
      * parameter. OID entries in the oidMap take precedence over the default
-     * OIDs recognized by <code>getName(String)</code>.
+     * OIDs recognized by {@code getName(String)}.
      * Improperly specified OIDs are ignored; however if an OID
      * in the name maps to an improperly specified keyword, an
-     * <code>IllegalArgumentException</code> is thrown.
+     * {@code IllegalArgumentException} is thrown.
      *
      * <p> Additional standard formats may be introduced in the future.
      *
@@ -379,12 +393,12 @@
      * @param oidMap an OID map, where each key is an object identifier in
      *  String form (a sequence of nonnegative integers separated by periods)
      *  that maps to a corresponding attribute type keyword String.
-     *  The map may be empty but never <code>null</code>.
-     * @return a string representation of this <code>X500Principal</code>
+     *  The map may be empty but never {@code null}.
+     * @return a string representation of this {@code X500Principal}
      *          using the specified format
      * @throws IllegalArgumentException if the specified format is invalid,
      *  null, or an OID in the name maps to an improperly specified keyword
-     * @throws NullPointerException if <code>oidMap</code> is <code>null</code>
+     * @throws NullPointerException if {@code oidMap} is {@code null}
      * @since 1.6
      */
     public String getName(String format, Map<String, String> oidMap) {
@@ -424,31 +438,31 @@
 
     /**
      * Return a user-friendly string representation of this
-     * <code>X500Principal</code>.
+     * {@code X500Principal}.
      *
-     * @return a string representation of this <code>X500Principal</code>
+     * @return a string representation of this {@code X500Principal}
      */
     public String toString() {
         return thisX500Name.toString();
     }
 
     /**
-     * Compares the specified <code>Object</code> with this
-     * <code>X500Principal</code> for equality.
+     * Compares the specified {@code Object} with this
+     * {@code X500Principal} for equality.
      *
-     * <p> Specifically, this method returns <code>true</code> if
-     * the <code>Object</code> <i>o</i> is an <code>X500Principal</code>
+     * <p> Specifically, this method returns {@code true} if
+     * the {@code Object} <i>o</i> is an {@code X500Principal}
      * and if the respective canonical string representations
-     * (obtained via the <code>getName(X500Principal.CANONICAL)</code> method)
+     * (obtained via the {@code getName(X500Principal.CANONICAL)} method)
      * of this object and <i>o</i> are equal.
      *
      * <p> This implementation is compliant with the requirements of RFC 3280.
      *
      * @param o Object to be compared for equality with this
-     *          <code>X500Principal</code>
+     *          {@code X500Principal}
      *
-     * @return <code>true</code> if the specified <code>Object</code> is equal
-     *          to this <code>X500Principal</code>, <code>false</code> otherwise
+     * @return {@code true} if the specified {@code Object} is equal
+     *          to this {@code X500Principal}, {@code false} otherwise
      */
     public boolean equals(Object o) {
         if (this == o) {
@@ -462,12 +476,12 @@
     }
 
     /**
-     * Return a hash code for this <code>X500Principal</code>.
+     * Return a hash code for this {@code X500Principal}.
      *
      * <p> The hash code is calculated via:
-     * <code>getName(X500Principal.CANONICAL).hashCode()</code>
+     * {@code getName(X500Principal.CANONICAL).hashCode()}
      *
-     * @return a hash code for this <code>X500Principal</code>
+     * @return a hash code for this {@code X500Principal}
      */
     public int hashCode() {
         return thisX500Name.hashCode();
@@ -476,9 +490,9 @@
     /**
      * Save the X500Principal object to a stream.
      *
-     * @serialData this <code>X500Principal</code> is serialized
+     * @serialData this {@code X500Principal} is serialized
      *          by writing out its DER-encoded form
-     *          (the value of <code>getEncoded</code> is serialized).
+     *          (the value of {@code getEncoded} is serialized).
      */
     private void writeObject(java.io.ObjectOutputStream s)
         throws IOException {
diff --git a/ojluni/src/main/java/javax/security/auth/x500/package-info.java b/ojluni/src/main/java/javax/security/auth/x500/package-info.java
new file mode 100644
index 0000000..12f8a53
--- /dev/null
+++ b/ojluni/src/main/java/javax/security/auth/x500/package-info.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * This package contains the classes that should be used to store
+ * X500 Principal and X500 Private Credentials in a
+ * <i>Subject</i>.
+ *
+ * <h2>Package Specification</h2>
+ *
+ * <ul>
+ *   <li><a href="http://www.ietf.org/rfc/rfc1779.txt">
+ *     RFC 1779: A String Representation of Distinguished Names</a></li>
+ *   <li><a href="http://www.ietf.org/rfc/rfc2253.txt">
+ *     RFC 2253: Lightweight Directory Access Protocol (v3):
+ *     UTF-8 String Representation of Distinguished Names</a></li>
+ *   <li><a href="http://www.ietf.org/rfc/rfc3280.txt">
+ *     RFC 3280: Internet X.509 Public Key Infrastructure
+ *     Certificate and Certificate Revocation List (CRL) Profile</a></li>
+ *   <li><a href="http://www.ietf.org/rfc/rfc4512.txt">
+ *     RFC 4512: Lightweight Directory Access Protocol (LDAP):
+ *     Directory Information Models</a></li>
+ * </ul>
+ *
+ * @since JDK1.4
+ */
+package javax.security.auth.x500;
diff --git a/ojluni/src/main/java/javax/security/auth/x500/package.html b/ojluni/src/main/java/javax/security/auth/x500/package.html
deleted file mode 100755
index 508380f..0000000
--- a/ojluni/src/main/java/javax/security/auth/x500/package.html
+++ /dev/null
@@ -1,55 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-
-This code is free software; you can redistribute it and/or modify it
-under the terms of the GNU General Public License version 2 only, as
-published by the Free Software Foundation.  Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the LICENSE file that accompanied this code.
-
-This code is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-version 2 for more details (a copy is included in the LICENSE file that
-accompanied this code).
-
-You should have received a copy of the GNU General Public License version
-2 along with this work; if not, write to the Free Software Foundation,
-Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-
-Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-or visit www.oracle.com if you need additional information or have any
-questions.
--->
-
-</head>
-<body bgcolor="white">
-
-    This package contains the classes that should be used to store 
-    X500 Principal and X500 Private Crendentials in a
-    <i>Subject</i>.
-
-<!--
-<h2>Package Specification</h2>
-
-##### FILL IN ANY SPECS NEEDED BY JAVA COMPATIBILITY KIT #####
-<ul>
-  <li><a href="">##### REFER TO ANY FRAMEMAKER SPECIFICATION HERE #####</a>
-</ul>
-
-<h2>Related Documentation</h2>
-
-For overviews, tutorials, examples, guides, and tool documentation, please see:
-<ul>
-  <li><a href="">##### REFER TO NON-SPEC DOCUMENTATION HERE #####</a>
-</ul>
-
--->
-
-@since JDK1.4
-</body>
-</html>
diff --git a/ojluni/src/main/java/javax/security/cert/Certificate.java b/ojluni/src/main/java/javax/security/cert/Certificate.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/javax/security/cert/CertificateEncodingException.java b/ojluni/src/main/java/javax/security/cert/CertificateEncodingException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/javax/security/cert/CertificateException.java b/ojluni/src/main/java/javax/security/cert/CertificateException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/javax/security/cert/CertificateExpiredException.java b/ojluni/src/main/java/javax/security/cert/CertificateExpiredException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/javax/security/cert/CertificateNotYetValidException.java b/ojluni/src/main/java/javax/security/cert/CertificateNotYetValidException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/javax/security/cert/CertificateParsingException.java b/ojluni/src/main/java/javax/security/cert/CertificateParsingException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/javax/security/cert/X509Certificate.java b/ojluni/src/main/java/javax/security/cert/X509Certificate.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/javax/sql/CommonDataSource.java b/ojluni/src/main/java/javax/sql/CommonDataSource.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/javax/sql/ConnectionEvent.java b/ojluni/src/main/java/javax/sql/ConnectionEvent.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/javax/sql/ConnectionEventListener.java b/ojluni/src/main/java/javax/sql/ConnectionEventListener.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/javax/sql/ConnectionPoolDataSource.java b/ojluni/src/main/java/javax/sql/ConnectionPoolDataSource.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/javax/sql/DataSource.java b/ojluni/src/main/java/javax/sql/DataSource.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/javax/sql/PooledConnection.java b/ojluni/src/main/java/javax/sql/PooledConnection.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/javax/sql/RowSet.java b/ojluni/src/main/java/javax/sql/RowSet.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/javax/sql/RowSetEvent.java b/ojluni/src/main/java/javax/sql/RowSetEvent.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/javax/sql/RowSetInternal.java b/ojluni/src/main/java/javax/sql/RowSetInternal.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/javax/sql/RowSetListener.java b/ojluni/src/main/java/javax/sql/RowSetListener.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/javax/sql/RowSetMetaData.java b/ojluni/src/main/java/javax/sql/RowSetMetaData.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/javax/sql/RowSetReader.java b/ojluni/src/main/java/javax/sql/RowSetReader.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/javax/sql/RowSetWriter.java b/ojluni/src/main/java/javax/sql/RowSetWriter.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/javax/sql/StatementEvent.java b/ojluni/src/main/java/javax/sql/StatementEvent.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/javax/sql/StatementEventListener.java b/ojluni/src/main/java/javax/sql/StatementEventListener.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/misc/ASCIICaseInsensitiveComparator.java b/ojluni/src/main/java/sun/misc/ASCIICaseInsensitiveComparator.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/misc/BASE64Decoder.java b/ojluni/src/main/java/sun/misc/BASE64Decoder.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/misc/BASE64Encoder.java b/ojluni/src/main/java/sun/misc/BASE64Encoder.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/misc/CEFormatException.java b/ojluni/src/main/java/sun/misc/CEFormatException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/misc/CEStreamExhausted.java b/ojluni/src/main/java/sun/misc/CEStreamExhausted.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/misc/CharacterDecoder.java b/ojluni/src/main/java/sun/misc/CharacterDecoder.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/misc/CharacterEncoder.java b/ojluni/src/main/java/sun/misc/CharacterEncoder.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/misc/Cleaner.java b/ojluni/src/main/java/sun/misc/Cleaner.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/misc/CompoundEnumeration.java b/ojluni/src/main/java/sun/misc/CompoundEnumeration.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/misc/DoubleConsts.java b/ojluni/src/main/java/sun/misc/DoubleConsts.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/misc/FileURLMapper.java b/ojluni/src/main/java/sun/misc/FileURLMapper.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/misc/FloatConsts.java b/ojluni/src/main/java/sun/misc/FloatConsts.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/misc/FpUtils.java b/ojluni/src/main/java/sun/misc/FpUtils.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/misc/Hashing.java b/ojluni/src/main/java/sun/misc/Hashing.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/misc/HexDumpEncoder.java b/ojluni/src/main/java/sun/misc/HexDumpEncoder.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/misc/IOUtils.java b/ojluni/src/main/java/sun/misc/IOUtils.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/misc/InvalidJarIndexException.java b/ojluni/src/main/java/sun/misc/InvalidJarIndexException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/misc/IoTrace.java b/ojluni/src/main/java/sun/misc/IoTrace.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/misc/JarIndex.java b/ojluni/src/main/java/sun/misc/JarIndex.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/misc/JavaSecurityProtectionDomainAccess.java b/ojluni/src/main/java/sun/misc/JavaSecurityProtectionDomainAccess.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/misc/LRUCache.java b/ojluni/src/main/java/sun/misc/LRUCache.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/misc/MessageUtils.java b/ojluni/src/main/java/sun/misc/MessageUtils.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/misc/MetaIndex.java b/ojluni/src/main/java/sun/misc/MetaIndex.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/misc/REException.java b/ojluni/src/main/java/sun/misc/REException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/misc/RegexpPool.java b/ojluni/src/main/java/sun/misc/RegexpPool.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/misc/RegexpTarget.java b/ojluni/src/main/java/sun/misc/RegexpTarget.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/misc/Resource.java b/ojluni/src/main/java/sun/misc/Resource.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/misc/Service.java b/ojluni/src/main/java/sun/misc/Service.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/misc/ServiceConfigurationError.java b/ojluni/src/main/java/sun/misc/ServiceConfigurationError.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/misc/SoftCache.java b/ojluni/src/main/java/sun/misc/SoftCache.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/misc/URLClassPath.java b/ojluni/src/main/java/sun/misc/URLClassPath.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/misc/VM.java b/ojluni/src/main/java/sun/misc/VM.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/net/ApplicationProxy.java b/ojluni/src/main/java/sun/net/ApplicationProxy.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/net/ConnectionResetException.java b/ojluni/src/main/java/sun/net/ConnectionResetException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/net/InetAddressCachePolicy.java b/ojluni/src/main/java/sun/net/InetAddressCachePolicy.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/net/NetHooks.java b/ojluni/src/main/java/sun/net/NetHooks.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/net/NetProperties.java b/ojluni/src/main/java/sun/net/NetProperties.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/net/NetworkClient.java b/ojluni/src/main/java/sun/net/NetworkClient.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/net/ProgressEvent.java b/ojluni/src/main/java/sun/net/ProgressEvent.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/net/ProgressListener.java b/ojluni/src/main/java/sun/net/ProgressListener.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/net/ProgressMeteringPolicy.java b/ojluni/src/main/java/sun/net/ProgressMeteringPolicy.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/net/ProgressMonitor.java b/ojluni/src/main/java/sun/net/ProgressMonitor.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/net/ProgressSource.java b/ojluni/src/main/java/sun/net/ProgressSource.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/net/RegisteredDomain.java b/ojluni/src/main/java/sun/net/RegisteredDomain.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/net/ResourceManager.java b/ojluni/src/main/java/sun/net/ResourceManager.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/net/SocksProxy.java b/ojluni/src/main/java/sun/net/SocksProxy.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/net/TelnetInputStream.java b/ojluni/src/main/java/sun/net/TelnetInputStream.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/net/TelnetOutputStream.java b/ojluni/src/main/java/sun/net/TelnetOutputStream.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/net/TelnetProtocolException.java b/ojluni/src/main/java/sun/net/TelnetProtocolException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/net/TransferProtocolClient.java b/ojluni/src/main/java/sun/net/TransferProtocolClient.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/net/ftp/FtpClient.java b/ojluni/src/main/java/sun/net/ftp/FtpClient.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/net/ftp/FtpClientProvider.java b/ojluni/src/main/java/sun/net/ftp/FtpClientProvider.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/net/ftp/FtpDirEntry.java b/ojluni/src/main/java/sun/net/ftp/FtpDirEntry.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/net/ftp/FtpDirParser.java b/ojluni/src/main/java/sun/net/ftp/FtpDirParser.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/net/ftp/FtpLoginException.java b/ojluni/src/main/java/sun/net/ftp/FtpLoginException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/net/ftp/FtpProtocolException.java b/ojluni/src/main/java/sun/net/ftp/FtpProtocolException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/net/ftp/FtpReplyCode.java b/ojluni/src/main/java/sun/net/ftp/FtpReplyCode.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/net/ftp/impl/DefaultFtpClientProvider.java b/ojluni/src/main/java/sun/net/ftp/impl/DefaultFtpClientProvider.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/net/ftp/impl/FtpClient.java b/ojluni/src/main/java/sun/net/ftp/impl/FtpClient.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/net/smtp/SmtpClient.java b/ojluni/src/main/java/sun/net/smtp/SmtpClient.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/net/smtp/SmtpProtocolException.java b/ojluni/src/main/java/sun/net/smtp/SmtpProtocolException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/net/spi/DefaultProxySelector.java b/ojluni/src/main/java/sun/net/spi/DefaultProxySelector.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/net/spi/nameservice/NameService.java b/ojluni/src/main/java/sun/net/spi/nameservice/NameService.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/net/spi/nameservice/NameServiceDescriptor.java b/ojluni/src/main/java/sun/net/spi/nameservice/NameServiceDescriptor.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/net/util/IPAddressUtil.java b/ojluni/src/main/java/sun/net/util/IPAddressUtil.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/net/util/URLUtil.java b/ojluni/src/main/java/sun/net/util/URLUtil.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/net/www/HeaderParser.java b/ojluni/src/main/java/sun/net/www/HeaderParser.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/net/www/MessageHeader.java b/ojluni/src/main/java/sun/net/www/MessageHeader.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/net/www/MeteredStream.java b/ojluni/src/main/java/sun/net/www/MeteredStream.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/net/www/ParseUtil.java b/ojluni/src/main/java/sun/net/www/ParseUtil.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/net/www/URLConnection.java b/ojluni/src/main/java/sun/net/www/URLConnection.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/net/www/http/ChunkedInputStream.java b/ojluni/src/main/java/sun/net/www/http/ChunkedInputStream.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/net/www/http/ChunkedOutputStream.java b/ojluni/src/main/java/sun/net/www/http/ChunkedOutputStream.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/net/www/http/HttpCapture.java b/ojluni/src/main/java/sun/net/www/http/HttpCapture.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/net/www/http/HttpCaptureInputStream.java b/ojluni/src/main/java/sun/net/www/http/HttpCaptureInputStream.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/net/www/http/HttpCaptureOutputStream.java b/ojluni/src/main/java/sun/net/www/http/HttpCaptureOutputStream.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/net/www/http/HttpClient.java b/ojluni/src/main/java/sun/net/www/http/HttpClient.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/net/www/http/Hurryable.java b/ojluni/src/main/java/sun/net/www/http/Hurryable.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/net/www/http/KeepAliveCache.java b/ojluni/src/main/java/sun/net/www/http/KeepAliveCache.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/net/www/http/KeepAliveStream.java b/ojluni/src/main/java/sun/net/www/http/KeepAliveStream.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/net/www/http/KeepAliveStreamCleaner.java b/ojluni/src/main/java/sun/net/www/http/KeepAliveStreamCleaner.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/net/www/http/PosterOutputStream.java b/ojluni/src/main/java/sun/net/www/http/PosterOutputStream.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/net/www/protocol/file/FileURLConnection.java b/ojluni/src/main/java/sun/net/www/protocol/file/FileURLConnection.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/net/www/protocol/file/Handler.java b/ojluni/src/main/java/sun/net/www/protocol/file/Handler.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/net/www/protocol/ftp/FtpURLConnection.java b/ojluni/src/main/java/sun/net/www/protocol/ftp/FtpURLConnection.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/net/www/protocol/ftp/Handler.java b/ojluni/src/main/java/sun/net/www/protocol/ftp/Handler.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/net/www/protocol/http/AuthCache.java b/ojluni/src/main/java/sun/net/www/protocol/http/AuthCache.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/net/www/protocol/http/AuthCacheImpl.java b/ojluni/src/main/java/sun/net/www/protocol/http/AuthCacheImpl.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/net/www/protocol/http/AuthCacheValue.java b/ojluni/src/main/java/sun/net/www/protocol/http/AuthCacheValue.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/net/www/protocol/http/AuthScheme.java b/ojluni/src/main/java/sun/net/www/protocol/http/AuthScheme.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/net/www/protocol/http/AuthenticationHeader.java b/ojluni/src/main/java/sun/net/www/protocol/http/AuthenticationHeader.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/net/www/protocol/http/AuthenticationInfo.java b/ojluni/src/main/java/sun/net/www/protocol/http/AuthenticationInfo.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/net/www/protocol/http/BasicAuthentication.java b/ojluni/src/main/java/sun/net/www/protocol/http/BasicAuthentication.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/net/www/protocol/http/DigestAuthentication.java b/ojluni/src/main/java/sun/net/www/protocol/http/DigestAuthentication.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/net/www/protocol/http/Handler.java b/ojluni/src/main/java/sun/net/www/protocol/http/Handler.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/net/www/protocol/http/HttpAuthenticator.java b/ojluni/src/main/java/sun/net/www/protocol/http/HttpAuthenticator.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/net/www/protocol/http/HttpCallerInfo.java b/ojluni/src/main/java/sun/net/www/protocol/http/HttpCallerInfo.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/net/www/protocol/http/HttpURLConnection.java b/ojluni/src/main/java/sun/net/www/protocol/http/HttpURLConnection.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/net/www/protocol/http/NTLMAuthenticationProxy.java b/ojluni/src/main/java/sun/net/www/protocol/http/NTLMAuthenticationProxy.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/net/www/protocol/http/NegotiateAuthentication.java b/ojluni/src/main/java/sun/net/www/protocol/http/NegotiateAuthentication.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/net/www/protocol/http/Negotiator.java b/ojluni/src/main/java/sun/net/www/protocol/http/Negotiator.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/net/www/protocol/jar/Handler.java b/ojluni/src/main/java/sun/net/www/protocol/jar/Handler.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/net/www/protocol/jar/JarFileFactory.java b/ojluni/src/main/java/sun/net/www/protocol/jar/JarFileFactory.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/net/www/protocol/jar/JarURLConnection.java b/ojluni/src/main/java/sun/net/www/protocol/jar/JarURLConnection.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/net/www/protocol/jar/URLJarFile.java b/ojluni/src/main/java/sun/net/www/protocol/jar/URLJarFile.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/net/www/protocol/jar/URLJarFileCallBack.java b/ojluni/src/main/java/sun/net/www/protocol/jar/URLJarFileCallBack.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/nio/ByteBuffered.java b/ojluni/src/main/java/sun/nio/ByteBuffered.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/nio/ch/AbstractPollArrayWrapper.java b/ojluni/src/main/java/sun/nio/ch/AbstractPollArrayWrapper.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/nio/ch/AbstractPollSelectorImpl.java b/ojluni/src/main/java/sun/nio/ch/AbstractPollSelectorImpl.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/nio/ch/AllocatedNativeObject.java b/ojluni/src/main/java/sun/nio/ch/AllocatedNativeObject.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/nio/ch/AsynchronousChannelGroupImpl.java b/ojluni/src/main/java/sun/nio/ch/AsynchronousChannelGroupImpl.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/nio/ch/AsynchronousServerSocketChannelImpl.java b/ojluni/src/main/java/sun/nio/ch/AsynchronousServerSocketChannelImpl.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/nio/ch/AsynchronousSocketChannelImpl.java b/ojluni/src/main/java/sun/nio/ch/AsynchronousSocketChannelImpl.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/nio/ch/BsdAsynchronousChannelProvider.java b/ojluni/src/main/java/sun/nio/ch/BsdAsynchronousChannelProvider.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/nio/ch/Cancellable.java b/ojluni/src/main/java/sun/nio/ch/Cancellable.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/nio/ch/ChannelInputStream.java b/ojluni/src/main/java/sun/nio/ch/ChannelInputStream.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/nio/ch/CompletedFuture.java b/ojluni/src/main/java/sun/nio/ch/CompletedFuture.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/nio/ch/DatagramChannelImpl.java b/ojluni/src/main/java/sun/nio/ch/DatagramChannelImpl.java
old mode 100755
new mode 100644
index c93e82d..3e06fd0
--- a/ojluni/src/main/java/sun/nio/ch/DatagramChannelImpl.java
+++ b/ojluni/src/main/java/sun/nio/ch/DatagramChannelImpl.java
@@ -780,7 +780,7 @@
                             }
                             do {
                                 tmpBuf.clear();
-                            } while (read(tmpBuf) > 0);
+                            } while (receive(tmpBuf) != null);
                         } finally {
                             if (blocking) {
                                 configureBlocking(true);
diff --git a/ojluni/src/main/java/sun/nio/ch/DatagramDispatcher.java b/ojluni/src/main/java/sun/nio/ch/DatagramDispatcher.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/nio/ch/DatagramSocketAdaptor.java b/ojluni/src/main/java/sun/nio/ch/DatagramSocketAdaptor.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/nio/ch/DefaultAsynchronousChannelProvider.java b/ojluni/src/main/java/sun/nio/ch/DefaultAsynchronousChannelProvider.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/nio/ch/DefaultSelectorProvider.java b/ojluni/src/main/java/sun/nio/ch/DefaultSelectorProvider.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/nio/ch/DirectBuffer.java b/ojluni/src/main/java/sun/nio/ch/DirectBuffer.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/nio/ch/EPoll.java b/ojluni/src/main/java/sun/nio/ch/EPoll.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/nio/ch/EPollArrayWrapper.java b/ojluni/src/main/java/sun/nio/ch/EPollArrayWrapper.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/nio/ch/EPollPort.java b/ojluni/src/main/java/sun/nio/ch/EPollPort.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/nio/ch/EPollSelectorImpl.java b/ojluni/src/main/java/sun/nio/ch/EPollSelectorImpl.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/nio/ch/EPollSelectorProvider.java b/ojluni/src/main/java/sun/nio/ch/EPollSelectorProvider.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/nio/ch/ExtendedSocketOption.java b/ojluni/src/main/java/sun/nio/ch/ExtendedSocketOption.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/nio/ch/FileChannelImpl.java b/ojluni/src/main/java/sun/nio/ch/FileChannelImpl.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/nio/ch/FileDispatcher.java b/ojluni/src/main/java/sun/nio/ch/FileDispatcher.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/nio/ch/FileDispatcherImpl.java b/ojluni/src/main/java/sun/nio/ch/FileDispatcherImpl.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/nio/ch/FileKey.java b/ojluni/src/main/java/sun/nio/ch/FileKey.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/nio/ch/FileLockImpl.java b/ojluni/src/main/java/sun/nio/ch/FileLockImpl.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/nio/ch/FileLockTable.java b/ojluni/src/main/java/sun/nio/ch/FileLockTable.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/nio/ch/Groupable.java b/ojluni/src/main/java/sun/nio/ch/Groupable.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/nio/ch/IOStatus.java b/ojluni/src/main/java/sun/nio/ch/IOStatus.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/nio/ch/IOUtil.java b/ojluni/src/main/java/sun/nio/ch/IOUtil.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/nio/ch/IOVecWrapper.java b/ojluni/src/main/java/sun/nio/ch/IOVecWrapper.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/nio/ch/InheritedChannel.java b/ojluni/src/main/java/sun/nio/ch/InheritedChannel.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/nio/ch/Interruptible.java b/ojluni/src/main/java/sun/nio/ch/Interruptible.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/nio/ch/Invoker.java b/ojluni/src/main/java/sun/nio/ch/Invoker.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/nio/ch/KQueue.java b/ojluni/src/main/java/sun/nio/ch/KQueue.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/nio/ch/KQueuePort.java b/ojluni/src/main/java/sun/nio/ch/KQueuePort.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/nio/ch/LinuxAsynchronousChannelProvider.java b/ojluni/src/main/java/sun/nio/ch/LinuxAsynchronousChannelProvider.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/nio/ch/MembershipKeyImpl.java b/ojluni/src/main/java/sun/nio/ch/MembershipKeyImpl.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/nio/ch/MembershipRegistry.java b/ojluni/src/main/java/sun/nio/ch/MembershipRegistry.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/nio/ch/NativeDispatcher.java b/ojluni/src/main/java/sun/nio/ch/NativeDispatcher.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/nio/ch/NativeObject.java b/ojluni/src/main/java/sun/nio/ch/NativeObject.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/nio/ch/NativeThread.java b/ojluni/src/main/java/sun/nio/ch/NativeThread.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/nio/ch/NativeThreadSet.java b/ojluni/src/main/java/sun/nio/ch/NativeThreadSet.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/nio/ch/Net.java b/ojluni/src/main/java/sun/nio/ch/Net.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/nio/ch/OptionKey.java b/ojluni/src/main/java/sun/nio/ch/OptionKey.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/nio/ch/PendingFuture.java b/ojluni/src/main/java/sun/nio/ch/PendingFuture.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/nio/ch/PipeImpl.java b/ojluni/src/main/java/sun/nio/ch/PipeImpl.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/nio/ch/PollArrayWrapper.java b/ojluni/src/main/java/sun/nio/ch/PollArrayWrapper.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/nio/ch/PollSelectorImpl.java b/ojluni/src/main/java/sun/nio/ch/PollSelectorImpl.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/nio/ch/PollSelectorProvider.java b/ojluni/src/main/java/sun/nio/ch/PollSelectorProvider.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/nio/ch/Port.java b/ojluni/src/main/java/sun/nio/ch/Port.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/nio/ch/Reflect.java b/ojluni/src/main/java/sun/nio/ch/Reflect.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/nio/ch/SelChImpl.java b/ojluni/src/main/java/sun/nio/ch/SelChImpl.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/nio/ch/SelectionKeyImpl.java b/ojluni/src/main/java/sun/nio/ch/SelectionKeyImpl.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/nio/ch/SelectorImpl.java b/ojluni/src/main/java/sun/nio/ch/SelectorImpl.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/nio/ch/SelectorProviderImpl.java b/ojluni/src/main/java/sun/nio/ch/SelectorProviderImpl.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/nio/ch/ServerSocketAdaptor.java b/ojluni/src/main/java/sun/nio/ch/ServerSocketAdaptor.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/nio/ch/ServerSocketChannelImpl.java b/ojluni/src/main/java/sun/nio/ch/ServerSocketChannelImpl.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/nio/ch/SinkChannelImpl.java b/ojluni/src/main/java/sun/nio/ch/SinkChannelImpl.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/nio/ch/SocketAdaptor.java b/ojluni/src/main/java/sun/nio/ch/SocketAdaptor.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/nio/ch/SocketChannelImpl.java b/ojluni/src/main/java/sun/nio/ch/SocketChannelImpl.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/nio/ch/SocketDispatcher.java b/ojluni/src/main/java/sun/nio/ch/SocketDispatcher.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/nio/ch/SourceChannelImpl.java b/ojluni/src/main/java/sun/nio/ch/SourceChannelImpl.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/nio/ch/ThreadPool.java b/ojluni/src/main/java/sun/nio/ch/ThreadPool.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/nio/ch/UnixAsynchronousServerSocketChannelImpl.java b/ojluni/src/main/java/sun/nio/ch/UnixAsynchronousServerSocketChannelImpl.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/nio/ch/UnixAsynchronousSocketChannelImpl.java b/ojluni/src/main/java/sun/nio/ch/UnixAsynchronousSocketChannelImpl.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/nio/ch/Util.java b/ojluni/src/main/java/sun/nio/ch/Util.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/nio/cs/ArrayDecoder.java b/ojluni/src/main/java/sun/nio/cs/ArrayDecoder.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/nio/cs/ArrayEncoder.java b/ojluni/src/main/java/sun/nio/cs/ArrayEncoder.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/nio/cs/HistoricallyNamedCharset.java b/ojluni/src/main/java/sun/nio/cs/HistoricallyNamedCharset.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/nio/cs/StreamDecoder.java b/ojluni/src/main/java/sun/nio/cs/StreamDecoder.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/nio/cs/StreamEncoder.java b/ojluni/src/main/java/sun/nio/cs/StreamEncoder.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/nio/cs/ThreadLocalCoders.java b/ojluni/src/main/java/sun/nio/cs/ThreadLocalCoders.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/reflect/CallerSensitive.java b/ojluni/src/main/java/sun/reflect/CallerSensitive.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/reflect/ConstructorAccessor.java b/ojluni/src/main/java/sun/reflect/ConstructorAccessor.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/reflect/Reflection.java b/ojluni/src/main/java/sun/reflect/Reflection.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/reflect/annotation/AnnotationType.java b/ojluni/src/main/java/sun/reflect/annotation/AnnotationType.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/reflect/misc/ReflectUtil.java b/ojluni/src/main/java/sun/reflect/misc/ReflectUtil.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/security/action/GetBooleanAction.java b/ojluni/src/main/java/sun/security/action/GetBooleanAction.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/security/action/GetIntegerAction.java b/ojluni/src/main/java/sun/security/action/GetIntegerAction.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/security/action/GetPropertyAction.java b/ojluni/src/main/java/sun/security/action/GetPropertyAction.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/security/action/LoadLibraryAction.java b/ojluni/src/main/java/sun/security/action/LoadLibraryAction.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/security/action/PutAllAction.java b/ojluni/src/main/java/sun/security/action/PutAllAction.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/security/internal/interfaces/TlsMasterSecret.java b/ojluni/src/main/java/sun/security/internal/interfaces/TlsMasterSecret.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/security/internal/spec/TlsKeyMaterialParameterSpec.java b/ojluni/src/main/java/sun/security/internal/spec/TlsKeyMaterialParameterSpec.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/security/internal/spec/TlsKeyMaterialSpec.java b/ojluni/src/main/java/sun/security/internal/spec/TlsKeyMaterialSpec.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/security/internal/spec/TlsMasterSecretParameterSpec.java b/ojluni/src/main/java/sun/security/internal/spec/TlsMasterSecretParameterSpec.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/security/internal/spec/TlsPrfParameterSpec.java b/ojluni/src/main/java/sun/security/internal/spec/TlsPrfParameterSpec.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/security/internal/spec/TlsRsaPremasterSecretParameterSpec.java b/ojluni/src/main/java/sun/security/internal/spec/TlsRsaPremasterSecretParameterSpec.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/security/jca/GetInstance.java b/ojluni/src/main/java/sun/security/jca/GetInstance.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/security/jca/JCAUtil.java b/ojluni/src/main/java/sun/security/jca/JCAUtil.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/security/jca/ProviderConfig.java b/ojluni/src/main/java/sun/security/jca/ProviderConfig.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/security/jca/ProviderList.java b/ojluni/src/main/java/sun/security/jca/ProviderList.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/security/jca/Providers.java b/ojluni/src/main/java/sun/security/jca/Providers.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/security/jca/ServiceId.java b/ojluni/src/main/java/sun/security/jca/ServiceId.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/security/pkcs/ContentInfo.java b/ojluni/src/main/java/sun/security/pkcs/ContentInfo.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/security/pkcs/PKCS7.java b/ojluni/src/main/java/sun/security/pkcs/PKCS7.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/security/pkcs/PKCS8Key.java b/ojluni/src/main/java/sun/security/pkcs/PKCS8Key.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/security/pkcs/PKCS9Attribute.java b/ojluni/src/main/java/sun/security/pkcs/PKCS9Attribute.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/security/pkcs/PKCS9Attributes.java b/ojluni/src/main/java/sun/security/pkcs/PKCS9Attributes.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/security/pkcs/ParsingException.java b/ojluni/src/main/java/sun/security/pkcs/ParsingException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/security/pkcs/SignerInfo.java b/ojluni/src/main/java/sun/security/pkcs/SignerInfo.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/security/pkcs/SigningCertificateInfo.java b/ojluni/src/main/java/sun/security/pkcs/SigningCertificateInfo.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/security/provider/X509Factory.java b/ojluni/src/main/java/sun/security/provider/X509Factory.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/security/rsa/SunRsaSignEntries.java b/ojluni/src/main/java/sun/security/rsa/SunRsaSignEntries.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/security/timestamp/TimestampToken.java b/ojluni/src/main/java/sun/security/timestamp/TimestampToken.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/security/util/BitArray.java b/ojluni/src/main/java/sun/security/util/BitArray.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/security/util/ByteArrayLexOrder.java b/ojluni/src/main/java/sun/security/util/ByteArrayLexOrder.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/security/util/ByteArrayTagOrder.java b/ojluni/src/main/java/sun/security/util/ByteArrayTagOrder.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/security/util/Cache.java b/ojluni/src/main/java/sun/security/util/Cache.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/security/util/Debug.java b/ojluni/src/main/java/sun/security/util/Debug.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/security/util/DerEncoder.java b/ojluni/src/main/java/sun/security/util/DerEncoder.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/security/util/DerIndefLenConverter.java b/ojluni/src/main/java/sun/security/util/DerIndefLenConverter.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/security/util/DerInputBuffer.java b/ojluni/src/main/java/sun/security/util/DerInputBuffer.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/security/util/DerInputStream.java b/ojluni/src/main/java/sun/security/util/DerInputStream.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/security/util/DerOutputStream.java b/ojluni/src/main/java/sun/security/util/DerOutputStream.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/security/util/DerValue.java b/ojluni/src/main/java/sun/security/util/DerValue.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/security/util/DisabledAlgorithmConstraints.java b/ojluni/src/main/java/sun/security/util/DisabledAlgorithmConstraints.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/security/util/KeyUtil.java b/ojluni/src/main/java/sun/security/util/KeyUtil.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/security/util/Length.java b/ojluni/src/main/java/sun/security/util/Length.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/security/util/ManifestDigester.java b/ojluni/src/main/java/sun/security/util/ManifestDigester.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/security/util/ManifestEntryVerifier.java b/ojluni/src/main/java/sun/security/util/ManifestEntryVerifier.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/security/util/ObjectIdentifier.java b/ojluni/src/main/java/sun/security/util/ObjectIdentifier.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/security/util/PropertyExpander.java b/ojluni/src/main/java/sun/security/util/PropertyExpander.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/security/util/Resources.java b/ojluni/src/main/java/sun/security/util/Resources.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/security/util/ResourcesMgr.java b/ojluni/src/main/java/sun/security/util/ResourcesMgr.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/security/util/SecurityConstants.java b/ojluni/src/main/java/sun/security/util/SecurityConstants.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/security/util/SignatureFileVerifier.java b/ojluni/src/main/java/sun/security/util/SignatureFileVerifier.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/security/util/UntrustedCertificates.java b/ojluni/src/main/java/sun/security/util/UntrustedCertificates.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/security/validator/EndEntityChecker.java b/ojluni/src/main/java/sun/security/validator/EndEntityChecker.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/security/validator/KeyStores.java b/ojluni/src/main/java/sun/security/validator/KeyStores.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/security/validator/PKIXValidator.java b/ojluni/src/main/java/sun/security/validator/PKIXValidator.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/security/validator/SimpleValidator.java b/ojluni/src/main/java/sun/security/validator/SimpleValidator.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/security/validator/Validator.java b/ojluni/src/main/java/sun/security/validator/Validator.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/security/validator/ValidatorException.java b/ojluni/src/main/java/sun/security/validator/ValidatorException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/security/x509/AVA.java b/ojluni/src/main/java/sun/security/x509/AVA.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/security/x509/AccessDescription.java b/ojluni/src/main/java/sun/security/x509/AccessDescription.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/security/x509/AlgorithmId.java b/ojluni/src/main/java/sun/security/x509/AlgorithmId.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/security/x509/AttributeNameEnumeration.java b/ojluni/src/main/java/sun/security/x509/AttributeNameEnumeration.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/security/x509/AuthorityInfoAccessExtension.java b/ojluni/src/main/java/sun/security/x509/AuthorityInfoAccessExtension.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/security/x509/AuthorityKeyIdentifierExtension.java b/ojluni/src/main/java/sun/security/x509/AuthorityKeyIdentifierExtension.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/security/x509/BasicConstraintsExtension.java b/ojluni/src/main/java/sun/security/x509/BasicConstraintsExtension.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/security/x509/CRLDistributionPointsExtension.java b/ojluni/src/main/java/sun/security/x509/CRLDistributionPointsExtension.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/security/x509/CRLExtensions.java b/ojluni/src/main/java/sun/security/x509/CRLExtensions.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/security/x509/CRLNumberExtension.java b/ojluni/src/main/java/sun/security/x509/CRLNumberExtension.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/security/x509/CRLReasonCodeExtension.java b/ojluni/src/main/java/sun/security/x509/CRLReasonCodeExtension.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/security/x509/CertAttrSet.java b/ojluni/src/main/java/sun/security/x509/CertAttrSet.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/security/x509/CertificateAlgorithmId.java b/ojluni/src/main/java/sun/security/x509/CertificateAlgorithmId.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/security/x509/CertificateExtensions.java b/ojluni/src/main/java/sun/security/x509/CertificateExtensions.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/security/x509/CertificateIssuerExtension.java b/ojluni/src/main/java/sun/security/x509/CertificateIssuerExtension.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/security/x509/CertificateIssuerName.java b/ojluni/src/main/java/sun/security/x509/CertificateIssuerName.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/security/x509/CertificateIssuerUniqueIdentity.java b/ojluni/src/main/java/sun/security/x509/CertificateIssuerUniqueIdentity.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/security/x509/CertificatePoliciesExtension.java b/ojluni/src/main/java/sun/security/x509/CertificatePoliciesExtension.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/security/x509/CertificatePolicyId.java b/ojluni/src/main/java/sun/security/x509/CertificatePolicyId.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/security/x509/CertificatePolicyMap.java b/ojluni/src/main/java/sun/security/x509/CertificatePolicyMap.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/security/x509/CertificatePolicySet.java b/ojluni/src/main/java/sun/security/x509/CertificatePolicySet.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/security/x509/CertificateSerialNumber.java b/ojluni/src/main/java/sun/security/x509/CertificateSerialNumber.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/security/x509/CertificateSubjectName.java b/ojluni/src/main/java/sun/security/x509/CertificateSubjectName.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/security/x509/CertificateSubjectUniqueIdentity.java b/ojluni/src/main/java/sun/security/x509/CertificateSubjectUniqueIdentity.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/security/x509/CertificateValidity.java b/ojluni/src/main/java/sun/security/x509/CertificateValidity.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/security/x509/CertificateVersion.java b/ojluni/src/main/java/sun/security/x509/CertificateVersion.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/security/x509/CertificateX509Key.java b/ojluni/src/main/java/sun/security/x509/CertificateX509Key.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/security/x509/DNSName.java b/ojluni/src/main/java/sun/security/x509/DNSName.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/security/x509/DeltaCRLIndicatorExtension.java b/ojluni/src/main/java/sun/security/x509/DeltaCRLIndicatorExtension.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/security/x509/DistributionPoint.java b/ojluni/src/main/java/sun/security/x509/DistributionPoint.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/security/x509/DistributionPointName.java b/ojluni/src/main/java/sun/security/x509/DistributionPointName.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/security/x509/EDIPartyName.java b/ojluni/src/main/java/sun/security/x509/EDIPartyName.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/security/x509/ExtendedKeyUsageExtension.java b/ojluni/src/main/java/sun/security/x509/ExtendedKeyUsageExtension.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/security/x509/Extension.java b/ojluni/src/main/java/sun/security/x509/Extension.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/security/x509/FreshestCRLExtension.java b/ojluni/src/main/java/sun/security/x509/FreshestCRLExtension.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/security/x509/GeneralName.java b/ojluni/src/main/java/sun/security/x509/GeneralName.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/security/x509/GeneralNameInterface.java b/ojluni/src/main/java/sun/security/x509/GeneralNameInterface.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/security/x509/GeneralNames.java b/ojluni/src/main/java/sun/security/x509/GeneralNames.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/security/x509/GeneralSubtree.java b/ojluni/src/main/java/sun/security/x509/GeneralSubtree.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/security/x509/GeneralSubtrees.java b/ojluni/src/main/java/sun/security/x509/GeneralSubtrees.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/security/x509/IPAddressName.java b/ojluni/src/main/java/sun/security/x509/IPAddressName.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/security/x509/InhibitAnyPolicyExtension.java b/ojluni/src/main/java/sun/security/x509/InhibitAnyPolicyExtension.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/security/x509/InvalidityDateExtension.java b/ojluni/src/main/java/sun/security/x509/InvalidityDateExtension.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/security/x509/IssuerAlternativeNameExtension.java b/ojluni/src/main/java/sun/security/x509/IssuerAlternativeNameExtension.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/security/x509/IssuingDistributionPointExtension.java b/ojluni/src/main/java/sun/security/x509/IssuingDistributionPointExtension.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/security/x509/KeyIdentifier.java b/ojluni/src/main/java/sun/security/x509/KeyIdentifier.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/security/x509/KeyUsageExtension.java b/ojluni/src/main/java/sun/security/x509/KeyUsageExtension.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/security/x509/NameConstraintsExtension.java b/ojluni/src/main/java/sun/security/x509/NameConstraintsExtension.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/security/x509/NetscapeCertTypeExtension.java b/ojluni/src/main/java/sun/security/x509/NetscapeCertTypeExtension.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/security/x509/OCSPNoCheckExtension.java b/ojluni/src/main/java/sun/security/x509/OCSPNoCheckExtension.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/security/x509/OIDMap.java b/ojluni/src/main/java/sun/security/x509/OIDMap.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/security/x509/OIDName.java b/ojluni/src/main/java/sun/security/x509/OIDName.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/security/x509/OtherName.java b/ojluni/src/main/java/sun/security/x509/OtherName.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/security/x509/PKIXExtensions.java b/ojluni/src/main/java/sun/security/x509/PKIXExtensions.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/security/x509/PolicyConstraintsExtension.java b/ojluni/src/main/java/sun/security/x509/PolicyConstraintsExtension.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/security/x509/PolicyInformation.java b/ojluni/src/main/java/sun/security/x509/PolicyInformation.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/security/x509/PolicyMappingsExtension.java b/ojluni/src/main/java/sun/security/x509/PolicyMappingsExtension.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/security/x509/PrivateKeyUsageExtension.java b/ojluni/src/main/java/sun/security/x509/PrivateKeyUsageExtension.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/security/x509/RDN.java b/ojluni/src/main/java/sun/security/x509/RDN.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/security/x509/RFC822Name.java b/ojluni/src/main/java/sun/security/x509/RFC822Name.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/security/x509/ReasonFlags.java b/ojluni/src/main/java/sun/security/x509/ReasonFlags.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/security/x509/SerialNumber.java b/ojluni/src/main/java/sun/security/x509/SerialNumber.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/security/x509/SubjectAlternativeNameExtension.java b/ojluni/src/main/java/sun/security/x509/SubjectAlternativeNameExtension.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/security/x509/SubjectInfoAccessExtension.java b/ojluni/src/main/java/sun/security/x509/SubjectInfoAccessExtension.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/security/x509/SubjectKeyIdentifierExtension.java b/ojluni/src/main/java/sun/security/x509/SubjectKeyIdentifierExtension.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/security/x509/URIName.java b/ojluni/src/main/java/sun/security/x509/URIName.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/security/x509/UniqueIdentity.java b/ojluni/src/main/java/sun/security/x509/UniqueIdentity.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/security/x509/X400Address.java b/ojluni/src/main/java/sun/security/x509/X400Address.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/security/x509/X500Name.java b/ojluni/src/main/java/sun/security/x509/X500Name.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/security/x509/X509AttributeName.java b/ojluni/src/main/java/sun/security/x509/X509AttributeName.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/security/x509/X509CRLEntryImpl.java b/ojluni/src/main/java/sun/security/x509/X509CRLEntryImpl.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/security/x509/X509CRLImpl.java b/ojluni/src/main/java/sun/security/x509/X509CRLImpl.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/security/x509/X509CertImpl.java b/ojluni/src/main/java/sun/security/x509/X509CertImpl.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/security/x509/X509CertInfo.java b/ojluni/src/main/java/sun/security/x509/X509CertInfo.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/security/x509/X509Key.java b/ojluni/src/main/java/sun/security/x509/X509Key.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/util/LocaleServiceProviderPool.java b/ojluni/src/main/java/sun/util/LocaleServiceProviderPool.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/util/ResourceBundleEnumeration.java b/ojluni/src/main/java/sun/util/ResourceBundleEnumeration.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/util/calendar/AbstractCalendar.java b/ojluni/src/main/java/sun/util/calendar/AbstractCalendar.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/util/calendar/BaseCalendar.java b/ojluni/src/main/java/sun/util/calendar/BaseCalendar.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/util/calendar/CalendarDate.java b/ojluni/src/main/java/sun/util/calendar/CalendarDate.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/util/calendar/CalendarSystem.java b/ojluni/src/main/java/sun/util/calendar/CalendarSystem.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/util/calendar/CalendarUtils.java b/ojluni/src/main/java/sun/util/calendar/CalendarUtils.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/util/calendar/Era.java b/ojluni/src/main/java/sun/util/calendar/Era.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/util/calendar/Gregorian.java b/ojluni/src/main/java/sun/util/calendar/Gregorian.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/util/calendar/ImmutableGregorianDate.java b/ojluni/src/main/java/sun/util/calendar/ImmutableGregorianDate.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/util/calendar/JulianCalendar.java b/ojluni/src/main/java/sun/util/calendar/JulianCalendar.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/util/calendar/LocalGregorianCalendar.java b/ojluni/src/main/java/sun/util/calendar/LocalGregorianCalendar.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/util/calendar/TzIDOldMapping.java b/ojluni/src/main/java/sun/util/calendar/TzIDOldMapping.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/util/locale/BaseLocale.java b/ojluni/src/main/java/sun/util/locale/BaseLocale.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/util/locale/Extension.java b/ojluni/src/main/java/sun/util/locale/Extension.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/util/locale/InternalLocaleBuilder.java b/ojluni/src/main/java/sun/util/locale/InternalLocaleBuilder.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/util/locale/LanguageTag.java b/ojluni/src/main/java/sun/util/locale/LanguageTag.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/util/locale/LocaleExtensions.java b/ojluni/src/main/java/sun/util/locale/LocaleExtensions.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/util/locale/LocaleObjectCache.java b/ojluni/src/main/java/sun/util/locale/LocaleObjectCache.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/util/locale/LocaleSyntaxException.java b/ojluni/src/main/java/sun/util/locale/LocaleSyntaxException.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/util/locale/LocaleUtils.java b/ojluni/src/main/java/sun/util/locale/LocaleUtils.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/util/locale/ParseStatus.java b/ojluni/src/main/java/sun/util/locale/ParseStatus.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/util/locale/StringTokenIterator.java b/ojluni/src/main/java/sun/util/locale/StringTokenIterator.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/util/locale/UnicodeLocaleExtension.java b/ojluni/src/main/java/sun/util/locale/UnicodeLocaleExtension.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/util/logging/LoggingProxy.java b/ojluni/src/main/java/sun/util/logging/LoggingProxy.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/util/logging/LoggingSupport.java b/ojluni/src/main/java/sun/util/logging/LoggingSupport.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/util/logging/PlatformLogger.java b/ojluni/src/main/java/sun/util/logging/PlatformLogger.java
old mode 100755
new mode 100644
diff --git a/ojluni/src/main/java/sun/util/resources/OpenListResourceBundle.java b/ojluni/src/main/java/sun/util/resources/OpenListResourceBundle.java
old mode 100755
new mode 100644
diff --git a/openjdk_java_files.mk b/openjdk_java_files.mk
index 118e687..c3eb5f6 100644
--- a/openjdk_java_files.mk
+++ b/openjdk_java_files.mk
@@ -1104,13 +1104,16 @@
     ojluni/src/main/java/javax/security/auth/callback/Callback.java \
     ojluni/src/main/java/javax/security/auth/callback/PasswordCallback.java \
     ojluni/src/main/java/javax/security/auth/callback/UnsupportedCallbackException.java \
+    ojluni/src/main/java/javax/security/auth/callback/package-info.java \
     ojluni/src/main/java/javax/security/auth/Destroyable.java \
     ojluni/src/main/java/javax/security/auth/DestroyFailedException.java \
     ojluni/src/main/java/javax/security/auth/login/LoginException.java \
+    ojluni/src/main/java/javax/security/auth/login/package-info.java \
     ojluni/src/main/java/javax/security/auth/PrivateCredentialPermission.java \
     ojluni/src/main/java/javax/security/auth/SubjectDomainCombiner.java \
     ojluni/src/main/java/javax/security/auth/Subject.java \
     ojluni/src/main/java/javax/security/auth/x500/X500Principal.java \
+    ojluni/src/main/java/javax/security/auth/x500/package-info.java \
     ojluni/src/main/java/javax/security/cert/CertificateEncodingException.java \
     ojluni/src/main/java/javax/security/cert/CertificateException.java \
     ojluni/src/main/java/javax/security/cert/CertificateExpiredException.java \