harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r963871 - in /harmony/enhanced/java/branches/java6: ./ classlib/ classlib/depends/libs/ classlib/make/ classlib/modules/archive/make/ classlib/modules/crypto/make/ classlib/modules/imageio/src/main/java/javax/imageio/ classlib/modules/image...
Date Tue, 13 Jul 2010 21:38:48 GMT
Author: hindessm
Date: Tue Jul 13 21:38:47 2010
New Revision: 963871

URL: http://svn.apache.org/viewvc?rev=963871&view=rev
Log:
Merge changes from trunk@963699.

Added:
    harmony/enhanced/java/branches/java6/jdktools/modules/jdktools/src/main/java/org/apache/harmony/tools/jdb/
      - copied from r963699, harmony/enhanced/java/trunk/jdktools/modules/jdktools/src/main/java/org/apache/harmony/tools/jdb/
    harmony/enhanced/java/branches/java6/jdktools/modules/jdktools/src/main/java/org/apache/harmony/tools/jdb/Main.java
      - copied unchanged from r963699, harmony/enhanced/java/trunk/jdktools/modules/jdktools/src/main/java/org/apache/harmony/tools/jdb/Main.java
Modified:
    harmony/enhanced/java/branches/java6/   (props changed)
    harmony/enhanced/java/branches/java6/build.xml
    harmony/enhanced/java/branches/java6/classlib/   (props changed)
    harmony/enhanced/java/branches/java6/classlib/depends/libs/   (props changed)
    harmony/enhanced/java/branches/java6/classlib/make/depends-common.xml
    harmony/enhanced/java/branches/java6/classlib/make/properties.xml
    harmony/enhanced/java/branches/java6/classlib/modules/archive/make/run-test.xml
    harmony/enhanced/java/branches/java6/classlib/modules/crypto/make/run-test.xml
    harmony/enhanced/java/branches/java6/classlib/modules/imageio/src/main/java/javax/imageio/ImageTypeSpecifier.java
    harmony/enhanced/java/branches/java6/classlib/modules/imageio/src/main/java/javax/imageio/spi/ServiceRegistry.java
    harmony/enhanced/java/branches/java6/classlib/modules/imageio/src/main/java/javax/imageio/stream/ImageOutputStreamImpl.java
    harmony/enhanced/java/branches/java6/classlib/modules/imageio/src/test/java/javax/imageio/ImageTypeSpecifierTest.java
    harmony/enhanced/java/branches/java6/classlib/modules/imageio/src/test/java/javax/imageio/stream/ImageOutputStreamImplTest.java
    harmony/enhanced/java/branches/java6/classlib/modules/lang-management/make/run-test.xml
    harmony/enhanced/java/branches/java6/classlib/modules/luni/make/run-test.xml
    harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/java/java/io/BufferedOutputStream.java
    harmony/enhanced/java/branches/java6/classlib/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/BufferedOutputStreamTest.java
    harmony/enhanced/java/branches/java6/classlib/modules/nio/src/main/java/common/org/apache/harmony/nio/internal/SocketChannelImpl.java
    harmony/enhanced/java/branches/java6/classlib/modules/nio/src/test/java/common/org/apache/harmony/nio/tests/java/nio/channels/SocketChannelTest.java
    harmony/enhanced/java/branches/java6/classlib/modules/security/make/run-test.xml
    harmony/enhanced/java/branches/java6/classlib/modules/x-net/make/run-test.xml
    harmony/enhanced/java/branches/java6/common_resources/make/depends.xml
    harmony/enhanced/java/branches/java6/common_resources/make/properties.xml
    harmony/enhanced/java/branches/java6/drlvm/   (props changed)
    harmony/enhanced/java/branches/java6/jdktools/   (props changed)
    harmony/enhanced/java/branches/java6/jdktools/modules/jdktools/build.xml
    harmony/enhanced/java/branches/java6/jdktools/modules/samsa/build.xml

Propchange: harmony/enhanced/java/branches/java6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jul 13 21:38:47 2010
@@ -1,4 +1,4 @@
 /harmony/enhanced/java/branches/mrh:935751-941490
-/harmony/enhanced/java/trunk:929253-961350
+/harmony/enhanced/java/trunk:929253-963699
 /harmony/enhanced/trunk:476395-929252
 /incubator/harmony/enhanced/trunk:292550-476394

Modified: harmony/enhanced/java/branches/java6/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/build.xml?rev=963871&r1=963870&r2=963871&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/build.xml (original)
+++ harmony/enhanced/java/branches/java6/build.xml Tue Jul 13 21:38:47 2010
@@ -21,7 +21,7 @@
 <project name="build-harmony" default="build" basedir=".">
 
     <!-- name of the target directory to use for building and final assembly -->
-    <property name="target.dir" value="target" />
+    <property name="hy.target" value="target" />
 
     <!-- release property file which is added to source release -->
     <property file="release.properties" />
@@ -29,7 +29,7 @@
     <!-- debug or release version -->
     <property name="hy.cfg" value="release" />
 
-    <property name="hy.hdk" location="target/hdk" />
+    <property name="hy.hdk" location="${hy.target}/hdk" />
 
     <!-- property to identify when components are being built by the 
          federated build -->
@@ -55,7 +55,7 @@ Usage:
 
   ant build
     Compiles the java and native code to produce a jdk in
-    "target/hdk".
+    "${hy.target}/hdk".
 
   ant clean
     Removes all the files generated by a build.
@@ -125,10 +125,10 @@ Usage:
             <classpath path="${rat.home}/apache-rat-core/target/apache-rat-core-0.7-SNAPSHOT.jar" />
             <classpath path="${rat.home}/apache-rat/target/apache-rat-0.7-SNAPSHOT.jar" />
         </typedef>
-        <delete file="target/rat.report.txt" />
+        <delete file="${hy.target}/rat.report.txt" />
         <rat:report xmlns:rat="antlib:org.apache.rat.anttasks"
-                    reportFile="target/rat.report.txt" >
-            <fileset dir="target/src" excludesfile="rat.excludes" />
+                    reportFile="${hy.target}/rat.report.txt" >
+            <fileset dir="${hy.target}/src" excludesfile="rat.excludes" />
         </rat:report>
     </target>
 
@@ -165,8 +165,8 @@ Usage:
 
         <!-- create the tar file and then md5 checksum using harmony-hdk-rev as the root,
              and setting exec bits as needed -->
-        <tar tarfile="${target.dir}/${deploy.hdk.tar}" compression="gzip">
-            <tarfileset dir="${target.dir}/hdk"
+        <tar tarfile="${hy.target}/${deploy.hdk.tar}" compression="gzip">
+            <tarfileset dir="${hy.target}/hdk"
                         prefix="${archive.dir.prefix}hdk-${harmony.version}"
                         mode="755">
                 <include name="jdk/jre/bin/java"/>
@@ -176,7 +176,7 @@ Usage:
                 <include name="jdk/jre/bin/unpack200"/>
                 <include name="jdk/bin/*"/>
             </tarfileset>
-            <tarfileset dir="${target.dir}/hdk"
+            <tarfileset dir="${hy.target}/hdk"
                         prefix="${archive.dir.prefix}hdk-${harmony.version}">
                 <include name="**"/>
                 <exclude name="jdk/jre/bin/java"/>
@@ -187,22 +187,22 @@ Usage:
                 <exclude name="jdk/bin/*"/>
                 <exclude name="jdk/jre/README"/>
             </tarfileset>
-            <tarfileset dir="${target.dir}/hdk/jdk/jre"
+            <tarfileset dir="${hy.target}/hdk/jdk/jre"
                         prefix="${archive.dir.prefix}hdk-${harmony.version}">
                 <include name="README"/>
             </tarfileset>
         </tar>
 
-        <chksum dir="${target.dir}" file="${deploy.hdk.tar}" />
-        <chksum dir="${target.dir}" file="${deploy.hdk.tar}" type="sha" />
+        <chksum dir="${hy.target}" file="${deploy.hdk.tar}" />
+        <chksum dir="${hy.target}" file="${deploy.hdk.tar}" type="sha" />
 
     </target>
 
     <target name="bundle-hdk-zip" depends="init" unless="is.unix">
         <!-- create the tar file and then md5 checksum using harmony-hdk-rev as the root,
              and setting exec bits as needed -->
-        <zip destfile="${target.dir}/${deploy.hdk.zip}" >
-            <zipfileset dir="${target.dir}/hdk"
+        <zip destfile="${hy.target}/${deploy.hdk.zip}" >
+            <zipfileset dir="${hy.target}/hdk"
                         prefix="${archive.dir.prefix}hdk-${harmony.version}"
                         filemode="755">
                 <include name="jdk/jre/bin/java.exe"/>
@@ -213,7 +213,7 @@ Usage:
                 <include name="jdk/jre/bin/unpack200.exe"/>
                 <include name="jdk/bin/*"/>
             </zipfileset>
-            <zipfileset dir="${target.dir}/hdk"
+            <zipfileset dir="${hy.target}/hdk"
                         prefix="${archive.dir.prefix}hdk-${harmony.version}">
                 <include name="**"/>
                 <exclude name="jdk/jre/bin/java.exe"/>
@@ -225,14 +225,14 @@ Usage:
                 <exclude name="jdk/bin/*"/>
                 <exclude name="jdk/jre/README"/>
             </zipfileset>
-            <zipfileset dir="${target.dir}/hdk/jdk/jre"
+            <zipfileset dir="${hy.target}/hdk/jdk/jre"
                         prefix="${archive.dir.prefix}hdk-${harmony.version}">
                 <include name="README"/>
             </zipfileset>
         </zip>
 
-        <chksum dir="${target.dir}" file="${deploy.hdk.zip}" />
-        <chksum dir="${target.dir}" file="${deploy.hdk.zip}" type="sha" />
+        <chksum dir="${hy.target}" file="${deploy.hdk.zip}" />
+        <chksum dir="${hy.target}" file="${deploy.hdk.zip}" type="sha" />
     </target>
 
     <!-- ============================================================== -->
@@ -245,8 +245,8 @@ Usage:
 
     <target name="bundle-jdk-tgz" depends="init" if="is.unix">
 
-        <tar tarfile="${target.dir}/${deploy.jdk.tar}" compression="gzip" >
-            <tarfileset dir="${target.dir}/hdk/jdk"
+        <tar tarfile="${hy.target}/${deploy.jdk.tar}" compression="gzip" >
+            <tarfileset dir="${hy.target}/hdk/jdk"
                         prefix="${archive.dir.prefix}jdk-${harmony.version}"
                         mode="755">
                 <include name="jre/bin/java"/>
@@ -256,7 +256,7 @@ Usage:
                 <include name="jre/bin/unpack200"/>
                 <include name="bin/*"/>
             </tarfileset>
-            <tarfileset dir="${target.dir}/hdk/jdk"
+            <tarfileset dir="${hy.target}/hdk/jdk"
                         prefix="${archive.dir.prefix}jdk-${harmony.version}">
                 <include name="**"/>
                 <exclude name="jre/bin/java"/>
@@ -267,20 +267,20 @@ Usage:
                 <exclude name="bin/*"/>
                 <exclude name="jre/README"/>
             </tarfileset>
-            <tarfileset dir="${target.dir}/hdk/jdk/jre"
+            <tarfileset dir="${hy.target}/hdk/jdk/jre"
                         prefix="${archive.dir.prefix}jdk-${harmony.version}">
                 <include name="README"/>
             </tarfileset>
         </tar>
 
-        <chksum dir="${target.dir}" file="${deploy.jdk.tar}" />
-        <chksum dir="${target.dir}" file="${deploy.jdk.tar}" type="sha" />
+        <chksum dir="${hy.target}" file="${deploy.jdk.tar}" />
+        <chksum dir="${hy.target}" file="${deploy.jdk.tar}" type="sha" />
 
     </target>
 
     <target name="bundle-jdk-zip" depends="init" unless="is.unix">
-        <zip destfile="${target.dir}/${deploy.jdk.zip}">
-            <zipfileset dir="${target.dir}/hdk/jdk"
+        <zip destfile="${hy.target}/${deploy.jdk.zip}">
+            <zipfileset dir="${hy.target}/hdk/jdk"
                         prefix="${archive.dir.prefix}jdk-${harmony.version}"
                         filemode="755">
                 <include name="jre/bin/java.exe"/>
@@ -291,7 +291,7 @@ Usage:
                 <include name="jre/bin/unpack200.exe"/>
                 <include name="bin/*"/>
             </zipfileset>
-            <zipfileset dir="${target.dir}/hdk/jdk"
+            <zipfileset dir="${hy.target}/hdk/jdk"
                         prefix="${archive.dir.prefix}jdk-${harmony.version}">
                 <include name="**"/>
                 <exclude name="jre/bin/java.exe"/>
@@ -303,13 +303,13 @@ Usage:
                 <exclude name="bin/*"/>
                 <exclude name="jre/README"/>
             </zipfileset>
-            <zipfileset dir="${target.dir}/hdk/jdk/jre"
+            <zipfileset dir="${hy.target}/hdk/jdk/jre"
                         prefix="${archive.dir.prefix}jdk-${harmony.version}">
                 <include name="README"/>
             </zipfileset>
         </zip>
-        <chksum dir="${target.dir}" file="${deploy.jdk.zip}" />
-        <chksum dir="${target.dir}" file="${deploy.jdk.zip}" type="sha" />
+        <chksum dir="${hy.target}" file="${deploy.jdk.zip}" />
+        <chksum dir="${hy.target}" file="${deploy.jdk.zip}" type="sha" />
     </target>
 
     <!-- ============================================================== -->
@@ -323,8 +323,8 @@ Usage:
 
     <target name="bundle-jre-tgz" depends="init" if="is.unix">
 
-        <tar tarfile="${target.dir}/${deploy.jre.tar}" compression="gzip" >
-            <tarfileset dir="${target.dir}/hdk/jdk/jre"
+        <tar tarfile="${hy.target}/${deploy.jre.tar}" compression="gzip" >
+            <tarfileset dir="${hy.target}/hdk/jdk/jre"
                         prefix="${archive.dir.prefix}jre-${harmony.version}"
                         mode="755">
                 <include name="bin/java"/>
@@ -333,7 +333,7 @@ Usage:
                 <include name="bin/policytool"/>
                 <include name="bin/unpack200"/>
             </tarfileset>
-            <tarfileset dir="${target.dir}/hdk/jdk/jre"
+            <tarfileset dir="${hy.target}/hdk/jdk/jre"
                         prefix="${archive.dir.prefix}jre-${harmony.version}">
                 <include name="**"/>
                 <exclude name="bin/java"/>
@@ -345,14 +345,14 @@ Usage:
             </tarfileset>
         </tar>
 
-        <chksum dir="${target.dir}" file="${deploy.jre.tar}" />
-        <chksum dir="${target.dir}" file="${deploy.jre.tar}" type="sha" />
+        <chksum dir="${hy.target}" file="${deploy.jre.tar}" />
+        <chksum dir="${hy.target}" file="${deploy.jre.tar}" type="sha" />
 
     </target>
 
     <target name="bundle-jre-zip" depends="init" unless="is.unix">
-        <zip destfile="${target.dir}/${deploy.jre.zip}">
-            <zipfileset dir="${target.dir}/hdk/jdk/jre"
+        <zip destfile="${hy.target}/${deploy.jre.zip}">
+            <zipfileset dir="${hy.target}/hdk/jdk/jre"
                         prefix="${archive.dir.prefix}jre-${harmony.version}"
                         filemode="755">
                 <include name="bin/java.exe"/>
@@ -362,7 +362,7 @@ Usage:
                 <include name="bin/policytool.exe"/>
                 <include name="bin/unpack200.exe"/>
             </zipfileset>
-            <zipfileset dir="${target.dir}/hdk/jdk/jre"
+            <zipfileset dir="${hy.target}/hdk/jdk/jre"
                         prefix="${archive.dir.prefix}jre-${harmony.version}">
                 <include name="**"/>
                 <exclude name="bin/java.exe"/>
@@ -374,8 +374,8 @@ Usage:
                 <exclude name="**/*-src.jar"/>
             </zipfileset>
         </zip>
-        <chksum dir="${target.dir}" file="${deploy.jre.zip}" />
-        <chksum dir="${target.dir}" file="${deploy.jre.zip}" type="sha" />
+        <chksum dir="${hy.target}" file="${deploy.jre.zip}" />
+        <chksum dir="${hy.target}" file="${deploy.jre.zip}" type="sha" />
     </target>
 
 
@@ -388,12 +388,12 @@ Usage:
                  chmod-stuff"/>
 
     <target name="chmod-stuff" if="is.unix">
-        <chmod file="${target.dir}/hdk/jdk/bin/*" perm="ugo+x" />
-        <chmod file="${target.dir}/hdk/jdk/jre/bin/java*" perm="ugo+x" />
-        <chmod file="${target.dir}/hdk/jdk/jre/bin/keytool*" perm="ugo+x" />
-        <chmod file="${target.dir}/hdk/jdk/jre/bin/policytool*" perm="ugo+x" />
-        <chmod file="${target.dir}/hdk/jdk/jre/bin/unpack200*" perm="ugo+x" />
-        <chmod file="${target.dir}/hdk/jdk/jre/bin/pack200*" perm="ugo+x" />
+        <chmod file="${hy.target}/hdk/jdk/bin/*" perm="ugo+x" />
+        <chmod file="${hy.target}/hdk/jdk/jre/bin/java*" perm="ugo+x" />
+        <chmod file="${hy.target}/hdk/jdk/jre/bin/keytool*" perm="ugo+x" />
+        <chmod file="${hy.target}/hdk/jdk/jre/bin/policytool*" perm="ugo+x" />
+        <chmod file="${hy.target}/hdk/jdk/jre/bin/unpack200*" perm="ugo+x" />
+        <chmod file="${hy.target}/hdk/jdk/jre/bin/pack200*" perm="ugo+x" />
     </target>
 
     <!-- ============================================================== -->
@@ -401,7 +401,7 @@ Usage:
     <!-- ============================================================== -->
     <target name="assemble-hdk-doc">
 
-        <copy todir="${target.dir}/hdk" overwrite="true">
+        <copy todir="${hy.target}/hdk" overwrite="true">
             <fileset dir=".">
                 <include name="LICENSE" />
                 <include name="NOTICE" />
@@ -415,7 +415,7 @@ Usage:
     <!-- ============================================================== -->
     <target name="assemble-jre-doc">
 
-        <copy todir="${target.dir}/hdk/jdk/jre" overwrite="true">
+        <copy todir="${hy.target}/hdk/jdk/jre" overwrite="true">
             <fileset dir=".">
                 <include name="LICENSE" />
                 <include name="NOTICE" />
@@ -424,7 +424,7 @@ Usage:
     </target>
 
     <target name="assemble-jdk-doc">
-        <copy todir="${target.dir}/hdk/jdk/" overwrite="true">
+        <copy todir="${hy.target}/hdk/jdk/" overwrite="true">
             <fileset dir=".">
                 <include name="LICENSE" />
                 <include name="NOTICE" />
@@ -612,8 +612,8 @@ Usage:
     <!-- recreates distribution dir                                     -->
     <!-- ============================================================== -->
     <target name="setup" depends="init, properties">
-        <delete dir="${target.dir}"/>
-        <mkdir dir="${target.dir}"/>
+        <delete dir="${hy.target}"/>
+        <mkdir dir="${hy.target}"/>
     </target>
 
 
@@ -623,7 +623,7 @@ Usage:
                  clean-classlib,
                  clean-vm,
                  clean-tests" >
-        <delete dir="${target.dir}" failonerror="false" />
+        <delete dir="${hy.target}" failonerror="false" />
     </target>
 
     <!-- ============================================================== -->
@@ -705,7 +705,7 @@ Usage:
             ant os name/arch :  ${os.name}/${os.arch}
             hosting Java     :  ${java.version} (${java.vendor})
             build mode       :  ${hy.cfg}
-            output location  :  ${target.dir}
+            output location  :  ${hy.target}
             SVN root         :  ${svn.root}
             archive.dir      :  ${archive.dir.prefix}
             archive.name     :  ${deploy.file.prefix}
@@ -715,68 +715,68 @@ Usage:
 
     <target name="bundle-src-tgz" depends="init" if="is.unix">
 
-        <tar tarfile="${target.dir}/${deploy.src.tar}" compression="gzip"
+        <tar tarfile="${hy.target}/${deploy.src.tar}" compression="gzip"
              longfile="gnu" >
-            <tarfileset dir="${target.dir}/src" prefix="${deploy.file.prefix}src-r${harmony.version}" mode="755">
+            <tarfileset dir="${hy.target}/src" prefix="${deploy.file.prefix}src-r${harmony.version}" mode="755">
                 <include name="debian/rules"/>
             </tarfileset>
-            <tarfileset dir="${target.dir}/src" prefix="${deploy.file.prefix}src-r${harmony.version}">
+            <tarfileset dir="${hy.target}/src" prefix="${deploy.file.prefix}src-r${harmony.version}">
                 <include name="**"/>
                 <exclude name="debian/rules"/>
             </tarfileset>
         </tar>
 
-        <chksum dir="${target.dir}" file="${deploy.src.tar}" />
-        <chksum dir="${target.dir}" file="${deploy.src.tar}" type="sha" />
+        <chksum dir="${hy.target}" file="${deploy.src.tar}" />
+        <chksum dir="${hy.target}" file="${deploy.src.tar}" type="sha" />
 
     </target>
 
     <target name="bundle-src-zip" depends="init" unless="is.unix">
-        <zip destfile="${target.dir}/${deploy.src.zip}">
-            <zipfileset dir="${target.dir}/src"
+        <zip destfile="${hy.target}/${deploy.src.zip}">
+            <zipfileset dir="${hy.target}/src"
                         prefix="${deploy.file.prefix}src-r${harmony.version}"
                         filemode="755">
                 <include name="debian/rules"/>
             </zipfileset>
-            <zipfileset dir="${target.dir}/src"
+            <zipfileset dir="${hy.target}/src"
                         prefix="${deploy.file.prefix}src-r${harmony.version}">
                 <include name="**"/>
                 <exclude name="debian/rules"/>
             </zipfileset>
         </zip>
-        <chksum dir="${target.dir}" file="${deploy.src.zip}" />
-        <chksum dir="${target.dir}" file="${deploy.src.zip}" type="sha" />
+        <chksum dir="${hy.target}" file="${deploy.src.zip}" />
+        <chksum dir="${hy.target}" file="${deploy.src.zip}" type="sha" />
     </target>
 
     <target name="copy-src" depends="init">
         <exec executable="svn">
             <arg value="export" />
             <arg value="." />
-            <arg value="${target.dir}/src" />
+            <arg value="${hy.target}/src" />
         </exec>
-        <echo file="${target.dir}/src/release.properties">
+        <echo file="${hy.target}/src/release.properties">
 harmony.version=${harmony.version}
 harmony.long.version=${harmony.long.version}
 harmony.deploy.suffix=${harmony.deploy.suffix}
 harmony.java.version=${harmony.java.version}
         </echo>
-        <chmod file="${target.dir}/src/debian/rules" perm="ugo+x" />
+        <chmod file="${hy.target}/src/debian/rules" perm="ugo+x" />
     </target>
 
     <target name="test" depends="clean-tests">
-        <ant antfile="target/hdk/build/test/build.xml"
+        <ant antfile="${hy.target}/hdk/build/test/build.xml"
              target="test" inheritAll="false" >
             <propertyset refid="required.props" />
             <property name="svn.info" value="${harmony.long.version}"/>
             <property name="svn.revision" value="${harmony.version}"/>
             <property name="keep.working" value="true" />
-            <property name="tests.output" location="target/test_report" />
-            <property name="test.jre.home" location="target/hdk/jdk/jre" />
+            <property name="tests.output" location="${hy.target}/test_report" />
+            <property name="test.jre.home" location="${hy.target}/hdk/jdk/jre" />
         </ant>
     </target>
 
     <target name="clean-tests">
-        <delete dir="target/test_report" />
+        <delete dir="${hy.target}/test_report" />
     </target>
 
     <!-- ============================================================== -->

Propchange: harmony/enhanced/java/branches/java6/classlib/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jul 13 21:38:47 2010
@@ -1,7 +1,7 @@
 /harmony/enhanced/classlib/trunk:713674-735919,765923-926091,926318-926838
 /harmony/enhanced/classlib/trunk/working_classlib:884014-884286
 /harmony/enhanced/java/branches/mrh/classlib:935751-941490
-/harmony/enhanced/java/trunk/classlib:929253-961350
+/harmony/enhanced/java/trunk/classlib:929253-963699
 /harmony/enhanced/trunk/classlib:476395-929252
 /harmony/enhanced/trunk/working_classlib:476396-920147
 /incubator/harmony/enhanced/trunk/classlib:292550-476394

Propchange: harmony/enhanced/java/branches/java6/classlib/depends/libs/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jul 13 21:38:47 2010
@@ -1,4 +1,4 @@
 /harmony/enhanced/classlib/trunk/depends/libs:544451-926091
-/harmony/enhanced/java/trunk/classlib/depends/libs:929253-961350
+/harmony/enhanced/java/trunk/classlib/depends/libs:929253-963699
 /harmony/enhanced/trunk/classlib/depends/libs:476395-929252
 /incubator/harmony/enhanced/trunk/classlib/depends/libs:292550-476394

Modified: harmony/enhanced/java/branches/java6/classlib/make/depends-common.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/make/depends-common.xml?rev=963871&r1=963870&r2=963871&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/make/depends-common.xml (original)
+++ harmony/enhanced/java/branches/java6/classlib/make/depends-common.xml Tue Jul 13 21:38:47 2010
@@ -62,10 +62,11 @@
             <antcall target="-remove-file-if-bad">
                 <param name="jar" value="@{dest}" />
             </antcall>
+            <property name="@{dest}.fullpath" location="@{dest}" />
             <fail unless="@{dest}.md5.verified">
 ...
 
-File @{dest} has incorrect md5 checksum.
+File ${@{dest}.fullpath} has incorrect md5 checksum.
     Expected: @{md5} (or @{md5-deprecated})
     Found:    ${@{dest}.md5}
 

Modified: harmony/enhanced/java/branches/java6/classlib/make/properties.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/make/properties.xml?rev=963871&r1=963870&r2=963871&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/make/properties.xml (original)
+++ harmony/enhanced/java/branches/java6/classlib/make/properties.xml Tue Jul 13 21:38:47 2010
@@ -68,6 +68,9 @@
     <property name="hy.test.timeout" value="900000" />
     <property name="hy.test.vmargs" value="" />
     <property name="hy.test.impl" value="true" />
+    <condition property="hy.run.impl.tests" value="true">
+        <istrue value="${hy.test.impl}" />
+    </condition>
 
     <!-- Conditions for operating systems -->
     <condition property="is.windows">
@@ -683,7 +686,7 @@ HY_LINKLIB_SUFFIX=${linklib.suffix}
                     </and>
                 </condition>
 The Eclipse compiler class for Ant could not be found. Please place the ECJ JAR in ANT_HOME/lib.
-The JAR can be downloaded directly from eclipse.org or copied from COMMON_RESOURCES/depends/jars/ecj_3.x folder after the fetch-depends target for JDKTOOLS has been run.
+The JAR can be downloaded directly from eclipse.org or copied from common_resources/depends/jars/ecj_3.x folder after the fetch-depends target for jdktools has been run.
 Alternatively, you can switch to another compiler, e.g. specify '-Dhy.javac.compiler=modern' for classic javac.                
             </fail>
         </sequential>

Modified: harmony/enhanced/java/branches/java6/classlib/modules/archive/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/archive/make/run-test.xml?rev=963871&r1=963870&r2=963871&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/archive/make/run-test.xml (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/archive/make/run-test.xml Tue Jul 13 21:38:47 2010
@@ -31,14 +31,15 @@
 
     <target name="test" depends="test-module" />
 
-    <target name="test-module" depends="test-jre-vm-info">
+    <target name="test-module"
+            depends="test-jre-vm-info,-test-module,-test-module-impl" />
+    <target name="-test-module">
         <convert-test-as-class from="test.case" to="converted.tc.class" />
-        <run-hdk-tests module="archive" jar="archive_internal_tests.jar">
-            <junit-elements>
-                <jvmarg value="-Xbootclasspath/a:archive_internal_tests.jar${path.separator}../junit.jar" />
-            </junit-elements>
-        </run-hdk-tests>
         <run-hdk-tests module="archive" jar="archive_tests.jar" />
     </target>
+
+    <target name="-test-module-impl" if="hy.run.impl.tests">
+        <run-hdk-tests module="archive" jar="archive_internal_tests.jar" />
+    </target>
     
 </project>

Modified: harmony/enhanced/java/branches/java6/classlib/modules/crypto/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/crypto/make/run-test.xml?rev=963871&r1=963870&r2=963871&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/crypto/make/run-test.xml (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/crypto/make/run-test.xml Tue Jul 13 21:38:47 2010
@@ -53,7 +53,7 @@
         </run-hdk-tests>
     </target>
 
-    <target name="-test-module-impl" if="hy.test.impl">
+    <target name="-test-module-impl" if="hy.run.impl.tests">
         <run-hdk-tests module="crypto" jar="crypto_impl_tests.jar">
             <junit-elements>
                 <classpath>

Modified: harmony/enhanced/java/branches/java6/classlib/modules/imageio/src/main/java/javax/imageio/ImageTypeSpecifier.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/imageio/src/main/java/javax/imageio/ImageTypeSpecifier.java?rev=963871&r1=963870&r2=963871&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/imageio/src/main/java/javax/imageio/ImageTypeSpecifier.java (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/imageio/src/main/java/javax/imageio/ImageTypeSpecifier.java Tue Jul 13 21:38:47 2010
@@ -34,7 +34,6 @@ import java.awt.image.SampleModel;
 import java.awt.image.WritableRaster;
 import java.util.Hashtable;
 
-import org.apache.harmony.luni.util.NotImplementedException;
 import org.apache.harmony.x.imageio.internal.nls.Messages;
 
 public class ImageTypeSpecifier {
@@ -284,9 +283,130 @@ public class ImageTypeSpecifier {
        return new ImageTypeSpecifier(model, model.createCompatibleSampleModel(1, 1));
     }
 
-    public static ImageTypeSpecifier createFromBufferedImageType(int bufferedImageType) throws NotImplementedException {
-        // TODO: implement
-        throw new NotImplementedException();
+    public static ImageTypeSpecifier createFromBufferedImageType(int bufferedImageType) {
+        switch (bufferedImageType) {
+        case BufferedImage.TYPE_INT_RGB :
+            return createPacked(ColorSpace.getInstance(ColorSpace.CS_sRGB),
+                                0x00ff0000,
+                                0x0000ff00,
+                                0x000000ff,
+                                0x0,
+                                DataBuffer.TYPE_INT,
+                                false);
+            
+        case BufferedImage.TYPE_INT_ARGB:
+            return createPacked(ColorSpace.getInstance(ColorSpace.CS_sRGB),
+                                0x00ff0000,
+                                0x0000ff00,
+                                0x000000ff,
+                                0xff000000,
+                                DataBuffer.TYPE_INT,
+                                false);
+
+        case BufferedImage.TYPE_INT_ARGB_PRE:
+            return createPacked(ColorSpace.getInstance(ColorSpace.CS_sRGB),
+                                0x00ff0000,
+                                0x0000ff00,
+                                0x000000ff,
+                                0xff000000,
+                                DataBuffer.TYPE_INT,
+                                true);
+            
+        case BufferedImage.TYPE_INT_BGR:
+            return createPacked(ColorSpace.getInstance(ColorSpace.CS_sRGB),
+                                0x00ff0000,
+                                0x0000ff00,
+                                0x000000ff,
+                                0x0,
+                                DataBuffer.TYPE_INT,
+                                false);
+            
+        case BufferedImage.TYPE_3BYTE_BGR:
+            return createInterleaved(ColorSpace.getInstance(ColorSpace.CS_sRGB),
+                                     new int[]{2, 1, 0},
+                                     DataBuffer.TYPE_BYTE,
+                                     false,
+                                     false);
+            
+        case BufferedImage.TYPE_4BYTE_ABGR:
+            return createInterleaved(ColorSpace.getInstance(ColorSpace.CS_sRGB),
+                                     new int[]{3, 2, 1, 0},
+                                     DataBuffer.TYPE_BYTE,
+                                     true,
+                                     false);
+            
+        case BufferedImage.TYPE_4BYTE_ABGR_PRE:
+            return createInterleaved(ColorSpace.getInstance(ColorSpace.CS_sRGB),
+                                     new int[]{3, 2, 1, 0},
+                                     DataBuffer.TYPE_BYTE,
+                                     true,
+                                     true);
+            
+        case BufferedImage.TYPE_USHORT_565_RGB:
+            return createPacked(ColorSpace.getInstance(ColorSpace.CS_sRGB),
+                                0xf800,
+                                0x07e0,
+                                0x001f,
+                                0,
+                                DataBuffer.TYPE_USHORT,
+                                false);
+                                
+        case BufferedImage.TYPE_USHORT_555_RGB:
+            return createPacked(ColorSpace.getInstance(ColorSpace.CS_sRGB),
+                                0x7c00,
+                                0x03e0,
+                                0x001f,
+                                0,
+                                DataBuffer.TYPE_USHORT,
+                                false);
+            
+        case BufferedImage.TYPE_BYTE_GRAY:
+            return createGrayscale(8,
+                                   DataBuffer.TYPE_BYTE,
+                                   false);
+            
+        case BufferedImage.TYPE_USHORT_GRAY:
+            return createGrayscale(16,
+                                   DataBuffer.TYPE_USHORT,
+                                   false);
+            
+        case BufferedImage.TYPE_BYTE_BINARY: {
+            byte[] redLUT = new byte[]{0, (byte)255};
+            byte[] greenLUT = new byte[]{0, (byte)255};
+            byte[] blueLUT = new byte[]{0, (byte)255};
+            
+            return createIndexed(redLUT,
+                                 greenLUT,
+                                 blueLUT,
+                                 null,
+                                 1,
+                                 DataBuffer.TYPE_BYTE);
+        }
+        
+        case BufferedImage.TYPE_BYTE_INDEXED: {
+            BufferedImage bufferedImage = new BufferedImage(1, 1, BufferedImage.TYPE_BYTE_INDEXED);
+            IndexColorModel colorModel = (IndexColorModel) bufferedImage.getColorModel();
+            byte[] redLUT = new byte[256];
+            byte[] greenLUT = new byte[256];
+            byte[] blueLUT = new byte[256];
+            byte[] alphaLUT = new byte[256];
+            
+            colorModel.getReds(redLUT);
+            colorModel.getGreens(greenLUT);
+            colorModel.getBlues(blueLUT);
+            colorModel.getAlphas(alphaLUT);
+            
+            return createIndexed(redLUT,
+                                 greenLUT,
+                                 blueLUT,
+                                 alphaLUT,
+                                 8,
+                                 DataBuffer.TYPE_BYTE);
+        }
+        
+        default:
+            throw new IllegalArgumentException();                                
+        }
     }
 
     public static ImageTypeSpecifier createFromRenderedImage(RenderedImage image) {

Modified: harmony/enhanced/java/branches/java6/classlib/modules/imageio/src/main/java/javax/imageio/spi/ServiceRegistry.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/imageio/src/main/java/javax/imageio/spi/ServiceRegistry.java?rev=963871&r1=963870&r2=963871&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/imageio/src/main/java/javax/imageio/spi/ServiceRegistry.java (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/imageio/src/main/java/javax/imageio/spi/ServiceRegistry.java Tue Jul 13 21:38:47 2010
@@ -106,8 +106,7 @@ public class ServiceRegistry {
 
     @Override
     public void finalize() throws Throwable {
-        //TODO uncomment when deregisterAll is implemented
-        //deregisterAll();
+        deregisterAll();
     }
 
     public boolean contains(Object provider) {

Modified: harmony/enhanced/java/branches/java6/classlib/modules/imageio/src/main/java/javax/imageio/stream/ImageOutputStreamImpl.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/imageio/src/main/java/javax/imageio/stream/ImageOutputStreamImpl.java?rev=963871&r1=963870&r2=963871&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/imageio/src/main/java/javax/imageio/stream/ImageOutputStreamImpl.java (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/imageio/src/main/java/javax/imageio/stream/ImageOutputStreamImpl.java Tue Jul 13 21:38:47 2010
@@ -190,22 +190,71 @@ public abstract class ImageOutputStreamI
 		}
 	}
 
-	public void writeBit(int bit) throws IOException, NotImplementedException {
-        // TODO: implement
-        throw new NotImplementedException();
+	public void writeBit(int bit) throws IOException {
+	    writeBits((long) bit, 1);
 	}
 
-	public void writeBits(long bits, int numBits) throws IOException, NotImplementedException {
-        // TODO: implement
-        throw new NotImplementedException();
+	public void writeBits(long bits, int numBits) throws IOException {
+	    checkClosed();
+	    
+	    if (bitOffset > 0) {
+	        int oldBitOffset = bitOffset;
+	        int currentByte = read();
+	        if (currentByte == -1) {
+	            currentByte = 0;
+	        } else {
+	            seek(getStreamPosition() - 1);
+	        }
+	        
+	        int num = 8 - oldBitOffset;
+	        if (numBits >= num) {
+	            int mask = -1 >>> (32 - num);
+		    currentByte &= ~mask;
+		    numBits -= num;
+		    currentByte |= ((bits >> numBits) & mask);
+		    write(currentByte);
+	        } else {
+	            int offset = oldBitOffset + numBits;
+	            int mask = -1 >>> numBits;
+		    currentByte &= ~(mask << (8 - offset));
+		    currentByte |= ((bits & mask) << (8 - offset));
+		    write(currentByte);
+		    seek(getStreamPosition() - 1);
+		    bitOffset = offset;
+		    numBits = 0;
+	        }
+	    }
+	    
+	    while (numBits > 7) {
+	        int mask = -1 >>> 24;
+	        int currentByte = (int) ((bits >> (numBits - 8)) & mask);
+	        write(currentByte);
+	        numBits -= 8;
+	    }
+	    
+	    if (numBits > 0) {
+	        int mask = -1 >>> 24;
+	        int currentByte = (int) ((bits << (8 - numBits)) & mask);
+	        write(currentByte);
+	        seek(getStreamPosition() - 1);
+	        bitOffset = numBits;
+	    }
 	}
 
-	protected final void flushBits() throws IOException, NotImplementedException {
-		if (bitOffset == 0) {
-			return;
-		}
-
-		// TODO: implement
-        throw new NotImplementedException();
+	protected final void flushBits() throws IOException {
+	    checkClosed();
+	    if (bitOffset == 0) {
+	        return;
+	    }
+	    int offset = bitOffset;
+	    int currentByte = read();
+	    if (currentByte == -1) {
+	        currentByte = 0;
+	        bitOffset = 0;
+	    } else {
+	        seek(getStreamPosition() - 1);
+	        currentByte &= -1 << (8 - offset);
+	    }
+	    write(currentByte);	    
 	}
 }

Modified: harmony/enhanced/java/branches/java6/classlib/modules/imageio/src/test/java/javax/imageio/ImageTypeSpecifierTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/imageio/src/test/java/javax/imageio/ImageTypeSpecifierTest.java?rev=963871&r1=963870&r2=963871&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/imageio/src/test/java/javax/imageio/ImageTypeSpecifierTest.java (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/imageio/src/test/java/javax/imageio/ImageTypeSpecifierTest.java Tue Jul 13 21:38:47 2010
@@ -30,6 +30,21 @@ import java.awt.image.PixelInterleavedSa
 import junit.framework.TestCase;
 
 public class ImageTypeSpecifierTest extends TestCase {
+    public void testCreateFromBufferedImageType() {
+        for (int i = BufferedImage.TYPE_INT_RGB; i <= BufferedImage.TYPE_BYTE_INDEXED; i ++ ) {
+            BufferedImage bi = new BufferedImage(1, 1, i);
+            ColorModel expected = bi.getColorModel();
+            
+            ImageTypeSpecifier typeSpecifier = ImageTypeSpecifier.createFromBufferedImageType(i);
+            ColorModel actual = typeSpecifier.getColorModel();
+            String msg = "Failed to create correct ImageTypeSpecifier, bufferedImageType = " + Integer.toString(i);
+            assertEquals(msg, expected.getClass(), actual.getClass());
+            assertEquals(msg, expected.getColorSpace(), actual.getColorSpace());
+            assertEquals(msg, expected.getTransferType(), actual.getTransferType());
+            assertEquals(msg, expected.getTransparency(), actual.getTransparency());
+        }
+    }
+    
     public void testCreateBanded() {
         int[] bankIndices = new int[]{0, 1, 2};
         int[] bandOffsets = new int[]{1, 1, 1};

Modified: harmony/enhanced/java/branches/java6/classlib/modules/imageio/src/test/java/javax/imageio/stream/ImageOutputStreamImplTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/imageio/src/test/java/javax/imageio/stream/ImageOutputStreamImplTest.java?rev=963871&r1=963870&r2=963871&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/imageio/src/test/java/javax/imageio/stream/ImageOutputStreamImplTest.java (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/imageio/src/test/java/javax/imageio/stream/ImageOutputStreamImplTest.java Tue Jul 13 21:38:47 2010
@@ -17,7 +17,9 @@
 
 package javax.imageio.stream;
 
+import java.io.ByteArrayOutputStream;
 import java.io.IOException;
+import java.io.OutputStream;
 import java.nio.ByteOrder;
 import java.util.Arrays;
 
@@ -176,6 +178,19 @@ public class ImageOutputStreamImplTest e
 		in.readFully(dest, 0, 3);
 		assertTrue(Arrays.equals(src, dest));
 	}
+	
+	public void testWriteBits() throws IOException {
+	    final BasicImageOutputStreamImpl out = new BasicImageOutputStreamImpl(8);
+	    final ImageInputStream in = new BasicImageInputStreamImpl(out.buff);
+	    
+	    out.writeBits(0xff, 7);
+	    out.writeBit(0);
+	    out.writeBits(0xabcdef, 24);
+	    assertEquals("writeBits failed", 0xfe, in.read());
+	    assertEquals("writeBits failed", 0xab, in.read());
+	    assertEquals("writeBits failed", 0xcd, in.read());
+	    assertEquals("writeBits failed", 0xef, in.read());
+	}
 
 	// FIXME: it looks like there is a bug in Double.doubleToLongBits
 	public void _testWriteDoubles() throws IOException {
@@ -249,12 +264,22 @@ public class ImageOutputStreamImplTest e
 
 		@Override
 		public int read() throws IOException {
-			throw new RuntimeException("Write only");
+		    bitOffset = 0;
+                    return (streamPos >= buff.length) ? -1
+                            : (buff[(int) streamPos++] & 0xff);
 		}
 
 		@Override
 		public int read(byte[] b, int off, int len) throws IOException {
-			throw new RuntimeException("Write only");
+		    int i = 0;
+                    int curByte = -1;
+
+                    for (; (i < len) && ((curByte = read()) != -1); i++) {
+                        b[off] = (byte) curByte;
+                        off++;
+                    }
+
+                    return (i == 0) && (curByte == -1) ? -1 : i;
 		}
 	}
 }

Modified: harmony/enhanced/java/branches/java6/classlib/modules/lang-management/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/lang-management/make/run-test.xml?rev=963871&r1=963870&r2=963871&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/lang-management/make/run-test.xml (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/lang-management/make/run-test.xml Tue Jul 13 21:38:47 2010
@@ -39,7 +39,7 @@
                        jar="lang-management_tests.jar" />
     </target>
 
-    <target name="-test-module-impl" if="hy.test.impl">
+    <target name="-test-module-impl" if="hy.run.impl.tests">
         <run-hdk-tests module="lang-management"
                        jar="lang-management_impl_tests.jar" />
     </target>

Modified: harmony/enhanced/java/branches/java6/classlib/modules/luni/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/luni/make/run-test.xml?rev=963871&r1=963870&r2=963871&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/luni/make/run-test.xml (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/luni/make/run-test.xml Tue Jul 13 21:38:47 2010
@@ -49,7 +49,7 @@
         </run-hdk-tests>
     </target>
 
-    <target name="-test-module-impl" if="hy.test.impl">
+    <target name="-test-module-impl" if="hy.run.impl.tests">
         <run-hdk-tests module="luni" jar="luni_tests_impl.jar">
             <junit-elements>
                 <!-- Required by various tests that set security manager etc -->

Modified: harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/java/java/io/BufferedOutputStream.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/java/java/io/BufferedOutputStream.java?rev=963871&r1=963870&r2=963871&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/java/java/io/BufferedOutputStream.java (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/java/java/io/BufferedOutputStream.java Tue Jul 13 21:38:47 2010
@@ -121,8 +121,11 @@ public class BufferedOutputStream extend
     public synchronized void write(byte[] buffer, int offset, int length)
             throws IOException {
         byte[] internalBuffer = buf;
-        if (internalBuffer == null) {
-            throw new IOException(Messages.getString("luni.24")); //$NON-NLS-1$
+
+        if (internalBuffer != null && length >= internalBuffer.length) {
+            flushInternal();
+            out.write(buffer, offset, length);
+            return;
         }
 
         if (buffer == null) {
@@ -130,12 +133,6 @@ public class BufferedOutputStream extend
             throw new NullPointerException(Messages.getString("luni.11")); //$NON-NLS-1$
         }
         
-        if (length >= internalBuffer.length) {
-            flushInternal();
-            out.write(buffer, offset, length);
-            return;
-        }
-        
         if (offset < 0 || offset > buffer.length - length) {
             // luni.12=Offset out of bounds \: {0}
             throw new ArrayIndexOutOfBoundsException(Messages.getString("luni.12", offset)); //$NON-NLS-1$
@@ -146,6 +143,10 @@ public class BufferedOutputStream extend
             throw new ArrayIndexOutOfBoundsException(Messages.getString("luni.18", length)); //$NON-NLS-1$
         }
 
+        if (internalBuffer == null) {
+            throw new IOException(Messages.getString("luni.24")); //$NON-NLS-1$
+        }
+
         // flush the internal buffer first if we have not enough space left
         if (length >= (internalBuffer.length - count)) {
             flushInternal();

Modified: harmony/enhanced/java/branches/java6/classlib/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/BufferedOutputStreamTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/BufferedOutputStreamTest.java?rev=963871&r1=963870&r2=963871&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/BufferedOutputStreamTest.java (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/BufferedOutputStreamTest.java Tue Jul 13 21:38:47 2010
@@ -329,8 +329,22 @@ public class BufferedOutputStreamTest ex
         try {
             bos.write(byteArray, -1, -1);
             fail();
-        } catch (Exception e) {
-            // expected IOException. RI throws IndexOutOfBoundsException
+        } catch (IndexOutOfBoundsException e) {
+            // expected IndexOutOfBoundsException
+        }
+
+        try {
+            bos.write(null, -1, -1);
+            fail("should throw NullPointerException");
+        } catch (NullPointerException e) {
+            // expected NullPointerException.
+        }
+
+        try {
+            bos.write(null, 0, 1);
+            fail("should throw NullPointerException");
+        } catch (NullPointerException e) {
+            // expected NullPointerException.
         }
     }
 

Modified: harmony/enhanced/java/branches/java6/classlib/modules/nio/src/main/java/common/org/apache/harmony/nio/internal/SocketChannelImpl.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/nio/src/main/java/common/org/apache/harmony/nio/internal/SocketChannelImpl.java?rev=963871&r1=963870&r2=963871&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/nio/src/main/java/common/org/apache/harmony/nio/internal/SocketChannelImpl.java (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/nio/src/main/java/common/org/apache/harmony/nio/internal/SocketChannelImpl.java Tue Jul 13 21:38:47 2010
@@ -524,8 +524,8 @@ class SocketChannelImpl extends SocketCh
         for (int i = offset; i < length + offset; i++) {
             if (bytesRemaining > sources[i].remaining()) {
                 int pos = sources[i].limit();
-                sources[i].position(pos);
                 bytesRemaining -= sources[i].remaining();
+                sources[i].position(pos);
             } else {
                 int pos = sources[i].position() + (int) bytesRemaining;
                 sources[i].position(pos);

Modified: harmony/enhanced/java/branches/java6/classlib/modules/nio/src/test/java/common/org/apache/harmony/nio/tests/java/nio/channels/SocketChannelTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/nio/src/test/java/common/org/apache/harmony/nio/tests/java/nio/channels/SocketChannelTest.java?rev=963871&r1=963870&r2=963871&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/nio/src/test/java/common/org/apache/harmony/nio/tests/java/nio/channels/SocketChannelTest.java (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/nio/src/test/java/common/org/apache/harmony/nio/tests/java/nio/channels/SocketChannelTest.java Tue Jul 13 21:38:47 2010
@@ -2772,6 +2772,40 @@ public class SocketChannelTest extends T
     /**
      * @tests java.nio.channels.SocketChannel#write(ByteBuffer[])
      */
+    public void test_writev2() throws Exception {
+        ServerSocketChannel ssc = ServerSocketChannel.open();
+        ssc.configureBlocking(false);
+        ssc.socket().bind(null);
+        SocketChannel sc = SocketChannel.open();
+        sc.configureBlocking(false);
+        boolean connected = sc.connect(ssc.socket().getLocalSocketAddress());
+        SocketChannel sock = ssc.accept();
+        if (!connected) {
+            sc.finishConnect();
+        }
+
+        ByteBuffer buf1 = ByteBuffer.allocate(10);
+        sc.socket().setSendBufferSize(512);
+        int bufSize = sc.socket().getSendBufferSize();
+        ByteBuffer buf2 = ByteBuffer.allocate(bufSize * 10);
+
+        ByteBuffer[] sent = new ByteBuffer[2];
+        sent[0] = buf1;
+        sent[1] = buf2;
+
+        long whole = buf1.remaining() + buf2.remaining();
+
+        long write = sc.write(sent);
+        ssc.close();
+        sc.close();
+        sock.close();
+
+        assertTrue(whole == (write + buf1.remaining() + buf2.remaining()));
+    }
+
+    /**
+     * @tests java.nio.channels.SocketChannel#write(ByteBuffer[])
+     */
     public void test_write$LByteBuffer2() throws IOException {
         // Set-up
         ServerSocketChannel server = ServerSocketChannel.open();

Modified: harmony/enhanced/java/branches/java6/classlib/modules/security/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/security/make/run-test.xml?rev=963871&r1=963870&r2=963871&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/security/make/run-test.xml (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/security/make/run-test.xml Tue Jul 13 21:38:47 2010
@@ -49,7 +49,7 @@
         </run-hdk-tests>
     </target>
 
-    <target name="-test-module-impl" if="hy.test.impl">
+    <target name="-test-module-impl" if="hy.run.impl.tests">
         <run-hdk-tests module="security" jar="security_tests_impl.jar">
             <junit-elements>
                 <classpath>

Modified: harmony/enhanced/java/branches/java6/classlib/modules/x-net/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/x-net/make/run-test.xml?rev=963871&r1=963870&r2=963871&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/x-net/make/run-test.xml (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/x-net/make/run-test.xml Tue Jul 13 21:38:47 2010
@@ -45,7 +45,7 @@
         </run-hdk-tests>
     </target>
 
-    <target name="-test-module-impl" if="hy.test.impl">
+    <target name="-test-module-impl" if="hy.run.impl.tests">
         <run-hdk-tests module="x-net" jar="x-net_impl_tests.jar">
             <junit-elements>
                 <classpath>

Modified: harmony/enhanced/java/branches/java6/common_resources/make/depends.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/common_resources/make/depends.xml?rev=963871&r1=963870&r2=963871&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/common_resources/make/depends.xml (original)
+++ harmony/enhanced/java/branches/java6/common_resources/make/depends.xml Tue Jul 13 21:38:47 2010
@@ -181,10 +181,11 @@
             <antcall target="-remove-file-if-bad">
                 <param name="jar" value="@{dest}" />
             </antcall>
-        <fail unless="@{dest}.md5.verified">
+            <property name="@{dest}.fullpath" location="@{dest}" />
+            <fail unless="@{dest}.md5.verified">
 ...
 
-File @{dest} has incorrect md5 checksum.
+File ${@{dest}.fullpath} has incorrect md5 checksum.
     Expected: @{md5} (or @{md5-deprecated})
     Found:    ${@{dest}.md5}
 

Modified: harmony/enhanced/java/branches/java6/common_resources/make/properties.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/common_resources/make/properties.xml?rev=963871&r1=963870&r2=963871&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/common_resources/make/properties.xml (original)
+++ harmony/enhanced/java/branches/java6/common_resources/make/properties.xml Tue Jul 13 21:38:47 2010
@@ -341,7 +341,7 @@ properties in preference to these:
                     </and>
                 </condition>
 The Eclipse compiler class for Ant could not be found. Please place the ECJ JAR in ANT_HOME/lib.
-The JAR can be downloaded directly from eclipse.org or copied from COMMON_RESOURCES/depends/jars/ecj_3.x folder after the fetch-depends target for JDKTOOLS has been run.
+The JAR can be downloaded directly from eclipse.org or copied from common_resources/depends/jars/ecj_3.x folder after the fetch-depends target for jdktools has been run.
 Alternatively, you can switch to another compiler, e.g. specify '-Dhy.javac.compiler=modern' for classic javac.                
             </fail>
         </sequential>

Propchange: harmony/enhanced/java/branches/java6/drlvm/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jul 13 21:38:47 2010
@@ -1,5 +1,5 @@
 /harmony/enhanced/java/branches/mrh/drlvm:935751-941490
-/harmony/enhanced/java/trunk/drlvm:929253-961350
+/harmony/enhanced/java/trunk/drlvm:929253-963699
 /harmony/enhanced/trunk/drlvm:476395-929252
 /harmony/enhanced/trunk/working_vm:476396-920147
 /incubator/harmony/enhanced/trunk/drlvm:292550-476394

Propchange: harmony/enhanced/java/branches/java6/jdktools/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jul 13 21:38:47 2010
@@ -1,4 +1,4 @@
-/harmony/enhanced/java/trunk/jdktools:929253-961350
+/harmony/enhanced/java/trunk/jdktools:929253-963699
 /harmony/enhanced/jdktools/trunk:630107-925933
 /harmony/enhanced/trunk/jdktools:476395-929252
 /harmony/enhanced/trunk/working_jdktools:476396-920147

Modified: harmony/enhanced/java/branches/java6/jdktools/modules/jdktools/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/jdktools/modules/jdktools/build.xml?rev=963871&r1=963870&r2=963871&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/jdktools/modules/jdktools/build.xml (original)
+++ harmony/enhanced/java/branches/java6/jdktools/modules/jdktools/build.xml Tue Jul 13 21:38:47 2010
@@ -111,6 +111,7 @@
 
             <classpath>
                 <pathelement path="${jdt.jdi.jar}"/>
+                <pathelement path="${jdt.jdimodel.jar}"/>
                 <pathelement path="${ecj.jar}" />
                 <pathelement path="${ant.library.dir}/ant.jar" />
                 <pathelement path="${ant.library.dir}/ant-launcher.jar" />

Modified: harmony/enhanced/java/branches/java6/jdktools/modules/samsa/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/jdktools/modules/samsa/build.xml?rev=963871&r1=963870&r2=963871&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/jdktools/modules/samsa/build.xml (original)
+++ harmony/enhanced/java/branches/java6/jdktools/modules/samsa/build.xml Tue Jul 13 21:38:47 2010
@@ -79,6 +79,9 @@
         <copy file="${hy.samsa.exe}" tofile="${hy.jdk}/bin/jar${exe.suffix}" />
         <chmod file="${hy.jdk}/bin/jar${exe.suffix}" perm="ugo+x" />
 
+        <copy file="${hy.samsa.exe}" tofile="${hy.jdk}/bin/jdb${exe.suffix}" />
+        <chmod file="${hy.jdk}/bin/jdb${exe.suffix}" perm="ugo+x" />
+
         <copy file="${hy.samsa.exe}" tofile="${hy.jre}/bin/keytool${exe.suffix}" />
         <chmod file="${hy.jre}/bin/keytool${exe.suffix}" perm="ugo+x" />
 



Mime
View raw message