harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r805197 [2/2] - in /harmony/enhanced/classlib/branches/java6: ./ make/ modules/accessibility/ modules/annotation/ modules/applet/ modules/archive/ modules/auth/ modules/awt/ modules/awt/make/ modules/awt/src/main/native/gl/windows/ modules/...
Date Mon, 17 Aug 2009 22:53:03 GMT
Modified: harmony/enhanced/classlib/branches/java6/modules/security/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/security/build.xml?rev=805197&r1=805196&r2=805197&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/security/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/security/build.xml Mon Aug 17 22:53:00
2009
@@ -27,6 +27,8 @@
 
     <target name="build" depends="compile-java, copy-resources, build-jar" />
 
+    <target name="clean" depends="clean-java,clean-native,clean-test" />
+
     <target name="test" depends="-test-module">
         <fail message="Some tests failed">
             <condition>
@@ -42,7 +44,8 @@
     <target name="-test-module" depends="build, run-tests" />
 
     <!-- Build native code -->
-    <available file="src/main/native/security/${hy.os.family}" property="native.present"
/>
+    <available file="src/main/native/security/${hy.os.family}"
+               property="native.present" />
 
     <target name="build-native" depends="build-native-all" />
     <target name="build-native-all" if="native.present" >
@@ -62,18 +65,20 @@
         </copy>
     </target>
     
-    <!-- Clean natives -->
-    <target name="clean-native" if="native.present" >
-        <make dir="src/main/native/security/${hy.os.family}" target="clean" />
-    </target>
-
-    <target name="clean">
+    <target name="clean-java">
         <delete file="${hy.jdk}/jre/lib/boot/security.jar" />
         <delete file="${hy.jdk}/jre/lib/boot/security-src.jar" />
-        <delete dir="${tests.hdk.dir}" failonerror="false" />
         <delete failonerror="false">
             <fileset refid="classes" />
         </delete>
+    </target>
+
+    <target name="clean-native" if="native.present" >
+        <make dir="src/main/native/security/${hy.os.family}" target="clean" />
+    </target>
+
+    <target name="clean-test">
+        <delete dir="${tests.hdk.dir}" failonerror="false" />
         <delete failonerror="false" dir="bin"/>
     </target>
 

Modified: harmony/enhanced/classlib/branches/java6/modules/sound/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/sound/build.xml?rev=805197&r1=805196&r2=805197&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/sound/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/sound/build.xml Mon Aug 17 22:53:00 2009
@@ -41,13 +41,18 @@
     <!-- internal target for local and global test run sequence -->
     <target name="-test-module" depends="build, run-tests" />
 
-    <target name="clean">
+    <target name="clean" depends="clean-java,clean-test" />
+    
+    <target name="clean-java">
         <delete file="${hy.jdk}/jre/lib/boot/sound.jar" />
         <delete file="${hy.jdk}/jre/lib/boot/sound-src.jar" />
-        <delete dir="${tests.hdk.dir}" failonerror="false" />
         <delete failonerror="false">
             <fileset refid="classes" />
         </delete>
+    </target>
+
+    <target name="clean-test">
+        <delete dir="${tests.hdk.dir}" failonerror="false" />
         <delete failonerror="false" dir="bin"/>
     </target>
 

Modified: harmony/enhanced/classlib/branches/java6/modules/sql/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/sql/build.xml?rev=805197&r1=805196&r2=805197&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/sql/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/sql/build.xml Mon Aug 17 22:53:00 2009
@@ -31,6 +31,8 @@
     <target name="build"
             depends="check-depends, compile-java, copy-resources, build-jar" />
 
+    <target name="clean" depends="clean-java,clean-test" />
+
     <target name="check-depends">
         <check-one-file src="${derby.url}" dest="${derby.jar}" />
     </target>
@@ -55,14 +57,17 @@
     <!-- internal target for local and global test run sequence -->
     <target name="-test-module" depends="build, run-tests" />
 
-    <target name="clean">
+    <target name="clean-java">
         <delete file="${hy.jdk}/jre/lib/boot/sql.jar" />
         <delete file="${hy.jdk}/jre/lib/boot/sql-src.jar" />
-        <delete dir="${tests.hdk.dir}" failonerror="false" />
-        <delete dir="${hy.hdk}/build/test/derby" /> 
         <delete failonerror="false">
             <fileset refid="classes" />
         </delete>
+    </target>
+
+    <target name="clean-test">
+        <delete dir="${tests.hdk.dir}" failonerror="false" />
+        <delete dir="${hy.hdk}/build/test/derby" /> 
         <delete failonerror="false" dir="bin"/>
     </target>
 

Modified: harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/org/apache/harmony/sql/internal/rowset/CachedRowSetImpl.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/org/apache/harmony/sql/internal/rowset/CachedRowSetImpl.java?rev=805197&r1=805196&r2=805197&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/org/apache/harmony/sql/internal/rowset/CachedRowSetImpl.java
(original)
+++ harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/org/apache/harmony/sql/internal/rowset/CachedRowSetImpl.java
Mon Aug 17 22:53:00 2009
@@ -2447,7 +2447,11 @@
             throw ex;
         }
 
-        updateString(columnIndex, new String(byteArray));
+        try {
+            updateString(columnIndex, new String(byteArray, "ISO-8859-1")); //$NON-NLS-1$
+        } catch (java.io.UnsupportedEncodingException e) {
+            throw new RuntimeException(e.getMessage());
+        }
     }
 
     public void updateAsciiStream(String columnName, InputStream x, int length)

Modified: harmony/enhanced/classlib/branches/java6/modules/sql/src/test/java/org/apache/harmony/sql/tests/internal/rowset/CachedRowSetStreamTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/sql/src/test/java/org/apache/harmony/sql/tests/internal/rowset/CachedRowSetStreamTest.java?rev=805197&r1=805196&r2=805197&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/sql/src/test/java/org/apache/harmony/sql/tests/internal/rowset/CachedRowSetStreamTest.java
(original)
+++ harmony/enhanced/classlib/branches/java6/modules/sql/src/test/java/org/apache/harmony/sql/tests/internal/rowset/CachedRowSetStreamTest.java
Mon Aug 17 22:53:00 2009
@@ -241,7 +241,7 @@
             out.write(i);
         }
 
-        byte[] expected = value.getBytes();
+        byte[] expected = value.getBytes("ISO8859-1");
 
         byte[] actual = out.toByteArray();
 
@@ -281,7 +281,7 @@
             out.write(i);
         }
 
-        byte[] expected = value.getBytes();
+        byte[] expected = value.getBytes("ISO8859-1");
 
         byte[] actual = out.toByteArray();
 
@@ -348,7 +348,7 @@
             out.write(i);
         }
 
-        byte[] expected = "test".getBytes();
+        byte[] expected = "test".getBytes("ISO8859-1");
         byte[] actual = out.toByteArray();
 
         assertEquals(expected.length, actual.length);
@@ -779,30 +779,27 @@
         }
 
         String value = new String("\u548c\u8c10");
-        in = new ByteArrayInputStream(value.getBytes());
+        in = new ByteArrayInputStream(value.getBytes("ISO-8859-1"));
         crset.updateAsciiStream(2, in, in.available());
 
         obj = crset.getObject(2);
         assertTrue(obj instanceof String);
-        assertEquals(new String(value.getBytes()), obj);
 
-        byte[] bytes = ((String) obj).getBytes();
-        byte[] expected = value.getBytes();
+        byte[] bytes = ((String) obj).getBytes("ISO-8859-1");
+        byte[] expected = value.getBytes("ISO-8859-1");
         assertEquals(expected.length, bytes.length);
         for (int i = 0; i < bytes.length; i++) {
             assertEquals(expected[i], bytes[i]);
         }
 
         value = new String("\u548d\u8c1a");
-        in = new ByteArrayInputStream(value.getBytes());
+        in = new ByteArrayInputStream(value.getBytes("ISO-8859-1"));
         crset.updateAsciiStream(3, in, in.available());
 
         obj = crset.getObject(3);
         assertTrue(obj instanceof String);
-        assertEquals(new String(value.getBytes()), obj);
-
-        bytes = ((String) obj).getBytes();
-        expected = value.getBytes();
+        bytes = ((String) obj).getBytes("ISO-8859-1");
+        expected = value.getBytes("ISO-8859-1");
         assertEquals(expected.length, bytes.length);
         for (int i = 0; i < bytes.length; i++) {
             assertEquals(expected[i], bytes[i]);
@@ -1207,8 +1204,8 @@
         crset.setCommand("update STREAM set LONGVARCHAR_T=? where ID= ?");
 
         String value = "It's    is a very very very long long long story";
-        crset.setAsciiStream(1, new ByteArrayInputStream(value.getBytes()),
-                value.getBytes().length);
+        byte[] bytes = value.getBytes("ISO-8859-1");
+        crset.setAsciiStream(1, new ByteArrayInputStream(bytes), bytes.length);
         crset.setInt(2, 1);
 
         if ("true".equals(System.getProperty("Testing Harmony"))) {

Modified: harmony/enhanced/classlib/branches/java6/modules/suncompat/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/suncompat/build.xml?rev=805197&r1=805196&r2=805197&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/suncompat/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/suncompat/build.xml Mon Aug 17 22:53:00
2009
@@ -41,13 +41,18 @@
     <!-- internal target for local and global test run sequence -->
     <target name="-test-module" depends="build, run-tests" />
 
-    <target name="clean">
+    <target name="clean" depends="clean-java,clean-test" />
+    
+    <target name="clean-java">
         <delete file="${hy.jdk}/jre/lib/boot/suncompat.jar" />
         <delete file="${hy.jdk}/jre/lib/boot/suncompat-src.jar" />
-        <delete dir="${tests.hdk.dir}" failonerror="false" />
         <delete failonerror="false">
             <fileset refid="classes" />
         </delete>
+    </target>
+
+    <target name="clean-test">
+        <delete dir="${tests.hdk.dir}" failonerror="false" />
         <delete failonerror="false" dir="bin"/>
     </target>
 

Modified: harmony/enhanced/classlib/branches/java6/modules/swing/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/swing/build.xml?rev=805197&r1=805196&r2=805197&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/swing/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/swing/build.xml Mon Aug 17 22:53:00 2009
@@ -35,6 +35,8 @@
 
     <target name="build" depends="compile-java, copy-resources, build-jar" />
 
+    <target name="clean" depends="clean-java,clean-test" />
+
     <target name="test" depends="-test-module">
         <fail message="Some tests failed">
             <condition>
@@ -49,14 +51,17 @@
     <!-- internal target for local and global test run sequence -->
     <target name="-test-module" depends="build, run-tests" />
 
-    <target name="clean">
+    <target name="clean-java">
         <delete file="${hy.jdk}/jre/lib/boot/swing.jar" />
         <delete file="${hy.jdk}/jre/lib/boot/swing-src.jar" />
-        <delete dir="${tests.hdk.dir}" failonerror="false" />
         <delete failonerror="false">
             <fileset refid="classes" />
             <fileset refid="hidden.classes"/>
         </delete>
+    </target>
+
+    <target name="clean-test">
+        <delete dir="${tests.hdk.dir}" failonerror="false" />
         <delete failonerror="false" dir="bin"/>
     </target>
 

Propchange: harmony/enhanced/classlib/branches/java6/modules/swing/src/test/api/java.injected/javax/swing/BasicSwingTestCase.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug 17 22:53:00 2009
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java.injected/javax/swing/BasicSwingTestCase.java:768152-803295
+/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java.injected/javax/swing/BasicSwingTestCase.java:768152-804992

Propchange: harmony/enhanced/classlib/branches/java6/modules/swing/src/test/api/java.injected/javax/swing/SwingTestCase.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug 17 22:53:00 2009
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java.injected/javax/swing/SwingTestCase.java:768152-803295
+/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java.injected/javax/swing/SwingTestCase.java:768152-804992

Propchange: harmony/enhanced/classlib/branches/java6/modules/swing/src/test/api/java.injected/javax/swing/text/parser/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug 17 22:53:00 2009
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java.injected/javax/swing/text/parser:768152-803295
+/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java.injected/javax/swing/text/parser:768152-804992

Modified: harmony/enhanced/classlib/branches/java6/modules/text/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/text/build.xml?rev=805197&r1=805196&r2=805197&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/text/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/text/build.xml Mon Aug 17 22:53:00 2009
@@ -41,13 +41,18 @@
     <!-- internal target for local and global test run sequence -->
     <target name="-test-module" depends="build, run-tests" />
     
-    <target name="clean">
+    <target name="clean" depends="clean-java,clean-test" />
+    
+    <target name="clean-java">
         <delete file="${hy.jdk}/jre/lib/boot/text.jar" />
         <delete file="${hy.jdk}/jre/lib/boot/text-src.jar" />
-        <delete dir="${tests.hdk.dir}" failonerror="false" />
         <delete failonerror="false">
             <fileset refid="classes" />
         </delete>
+    </target>
+
+    <target name="clean-test">
+        <delete dir="${tests.hdk.dir}" failonerror="false" />
         <delete failonerror="false" dir="bin"/>
     </target>
 

Modified: harmony/enhanced/classlib/branches/java6/modules/x-net/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/x-net/build.xml?rev=805197&r1=805196&r2=805197&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/x-net/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/x-net/build.xml Mon Aug 17 22:53:00 2009
@@ -41,13 +41,18 @@
     <!-- internal target for local and global test run sequence -->
     <target name="-test-module" depends="build, run-tests" />
 
-    <target name="clean">
+    <target name="clean" depends="clean-java,clean-test" />
+    
+    <target name="clean-java">
         <delete file="${hy.jdk}/jre/lib/boot/x-net.jar" />
         <delete file="${hy.jdk}/jre/lib/boot/x-net-src.jar" />
-        <delete dir="${tests.hdk.dir}" failonerror="false" />
         <delete failonerror="false">
             <fileset refid="classes" />
         </delete>
+    </target>
+
+    <target name="clean-test">
+        <delete dir="${tests.hdk.dir}" failonerror="false" />
         <delete failonerror="false" dir="bin"/>
     </target>
 

Modified: harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/CertificateMessageTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/CertificateMessageTest.java?rev=805197&r1=805196&r2=805197&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/CertificateMessageTest.java
(original)
+++ harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/CertificateMessageTest.java
Mon Aug 17 22:53:00 2009
@@ -84,7 +84,7 @@
 		CertificateFactory certFactory = CertificateFactory.getInstance("X509");
 
 		ByteArrayInputStream bais = new ByteArrayInputStream(base64certEncoding
-				.getBytes());
+				.getBytes("UTF-8"));
 		X509Certificate cert = (X509Certificate) certFactory.generateCertificate(bais);
 		CertificateMessage message = new CertificateMessage(
 				new X509Certificate[] { cert });

Modified: harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/CertificateRequestTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/CertificateRequestTest.java?rev=805197&r1=805196&r2=805197&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/CertificateRequestTest.java
(original)
+++ harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/CertificateRequestTest.java
Mon Aug 17 22:53:00 2009
@@ -57,7 +57,7 @@
 
         CertificateFactory certFactory = CertificateFactory.getInstance("X509");
         ByteArrayInputStream bais = new ByteArrayInputStream(base64certEncoding
-                .getBytes());
+                .getBytes("UTF-8"));
         X509Certificate cert = (X509Certificate) certFactory.generateCertificate(bais);
         X509Certificate[] accepted = {cert};
         X500Principal[] certificate_authorities = {cert.getIssuerX500Principal()};

Modified: harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/TrustManagerImplTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/TrustManagerImplTest.java?rev=805197&r1=805196&r2=805197&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/TrustManagerImplTest.java
(original)
+++ harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/TrustManagerImplTest.java
Mon Aug 17 22:53:00 2009
@@ -65,7 +65,7 @@
         super.setUp();
         CertificateFactory certFactory = CertificateFactory.getInstance("X509");
         ByteArrayInputStream bais = new ByteArrayInputStream(base64certEncoding
-                .getBytes());
+                .getBytes("UTF-8"));
         X509Certificate cert = (X509Certificate) certFactory
                 .generateCertificate(bais);
         untrustedChain = new X509Certificate[] { cert };

Modified: harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/impl/java/org/apache/harmony/xnet/tests/provider/jsse/DigitalSignatureTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/impl/java/org/apache/harmony/xnet/tests/provider/jsse/DigitalSignatureTest.java?rev=805197&r1=805196&r2=805197&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/impl/java/org/apache/harmony/xnet/tests/provider/jsse/DigitalSignatureTest.java
(original)
+++ harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/impl/java/org/apache/harmony/xnet/tests/provider/jsse/DigitalSignatureTest.java
Mon Aug 17 22:53:00 2009
@@ -49,7 +49,7 @@
                 + "0piKwYmLXtqi7BTgpgoDXtYi6VJYzvBxLhe050vi1lUNe2iCl/jsU4IcBCcOjV4CwbTDRhq6PzT7"
                 + "70uWtMhAV28E/jcszlyxHYZ5qK0wp8BoBdcNQf3tihBuQkrsv57z94tbEJxg5JeMOl1aWVtw6LLR"
                 + "K2GQBaDrwvy7R4FA2oOc/JS9PsiT0ieKO1dhPGmqJDaVMlZMFeUY41hTzU3BAmcjYBWQI2oNqHRv"
-                + "ya9tUQIDAQAB").getBytes();
+                + "ya9tUQIDAQAB").getBytes("UTF-8");
 
         byte[] b64PrivateKeySpec = ("MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCTur+p5srr+1IvJ1FQIC/BypGV"
                 + "L3lpq7nGPZ8WktFhgbRq+47SpefXgc2agLyTO2TrpD7ihlL1KRBjCvbjH72J17Sz3F+NDmiEOljo"
@@ -72,7 +72,7 @@
                 + "LZRbOXEAR4abQ4g0IDeLNZAFfHttdKTesIrCH54R/tP2Eq/8w3U+hvhxltjqd9keKUBJFvlVSJAI"
                 + "6qJhAoGBAJU8ET4NHv4/AS3SiTcg65TE4ktrTsVZixNYVORE32bFZCZClWLI2aUattiIk8UqvG74"
                 + "wugnxUGk8tJMcw1J/gh+UlnGrX7HqiWTCzEyepOiDQV3NkOQ+9z9WeQNNUtQyIFZZB4wQHaH21BB"
-                + "a1kmrzyqihpAVWrpBOJCipel8S0X").getBytes();
+                + "a1kmrzyqihpAVWrpBOJCipel8S0X").getBytes("UTF-8");
 
         // Create public/private keys and certificate
         KeyFactory keyFactory = KeyFactory.getInstance("RSA");



Mime
View raw message