harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r936526 [1/2] - in /harmony/enhanced/java/branches/java6: ./ classlib/ classlib/depends/libs/ classlib/make/ classlib/modules/awt/src/main/native/linuxfont/unix/ classlib/modules/logging/src/main/java/java/util/logging/ classlib/modules/log...
Date Wed, 21 Apr 2010 21:45:01 GMT
Author: hindessm
Date: Wed Apr 21 21:44:58 2010
New Revision: 936526

URL: http://svn.apache.org/viewvc?rev=936526&view=rev
Log:
Merging from trunk@936298.

Added:
    harmony/enhanced/java/branches/java6/jdktools/modules/jdktools/src/main/java/org/apache/harmony/tools/serialver/
      - copied from r936298, harmony/enhanced/java/trunk/jdktools/modules/jdktools/src/main/java/org/apache/harmony/tools/serialver/
    harmony/enhanced/java/branches/java6/jdktools/modules/jdktools/src/main/java/org/apache/harmony/tools/serialver/Clazz.java
      - copied unchanged from r936298, harmony/enhanced/java/trunk/jdktools/modules/jdktools/src/main/java/org/apache/harmony/tools/serialver/Clazz.java
    harmony/enhanced/java/branches/java6/jdktools/modules/jdktools/src/main/java/org/apache/harmony/tools/serialver/Main.java
      - copied unchanged from r936298, harmony/enhanced/java/trunk/jdktools/modules/jdktools/src/main/java/org/apache/harmony/tools/serialver/Main.java
    harmony/enhanced/java/branches/java6/jdktools/modules/jdktools/src/main/java/org/apache/harmony/tools/serialver/ShowGui.java
      - copied unchanged from r936298, harmony/enhanced/java/trunk/jdktools/modules/jdktools/src/main/java/org/apache/harmony/tools/serialver/ShowGui.java
    harmony/enhanced/java/branches/java6/jdktools/modules/jdktools/src/test/java/org/apache/harmony/tests/tools/serialver/
      - copied from r936298, harmony/enhanced/java/trunk/jdktools/modules/jdktools/src/test/java/org/apache/harmony/tests/tools/serialver/
    harmony/enhanced/java/branches/java6/jdktools/modules/jdktools/src/test/java/org/apache/harmony/tests/tools/serialver/NoSerialize.java
      - copied unchanged from r936298, harmony/enhanced/java/trunk/jdktools/modules/jdktools/src/test/java/org/apache/harmony/tests/tools/serialver/NoSerialize.java
    harmony/enhanced/java/branches/java6/jdktools/modules/jdktools/src/test/java/org/apache/harmony/tests/tools/serialver/Point.java
      - copied unchanged from r936298, harmony/enhanced/java/trunk/jdktools/modules/jdktools/src/test/java/org/apache/harmony/tests/tools/serialver/Point.java
    harmony/enhanced/java/branches/java6/jdktools/modules/jdktools/src/test/java/org/apache/harmony/tests/tools/serialver/Test.java
      - copied unchanged from r936298, harmony/enhanced/java/trunk/jdktools/modules/jdktools/src/test/java/org/apache/harmony/tests/tools/serialver/Test.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/run-test.xml
    harmony/enhanced/java/branches/java6/classlib/modules/awt/src/main/native/linuxfont/unix/LinuxNativeFont.c
    harmony/enhanced/java/branches/java6/classlib/modules/logging/src/main/java/java/util/logging/FileHandler.java
    harmony/enhanced/java/branches/java6/classlib/modules/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/FileHandlerTest.java
    harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/java/java/io/FileInputStream.java
    harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/file/FileURLConnection.java
    harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/java/org/apache/harmony/luni/platform/IFileSystem.java
    harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/java/org/apache/harmony/luni/platform/OSFileSystem.java
    harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/native/luni/shared/OSFileSystem.c
    harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/native/luni/unix/OSFileSystemLinux32.c
    harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/native/luni/unix/OSNetworkSystemLinux.c
    harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/native/luni/unix/exports.txt
    harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/native/luni/windows/OSFileSystemWin32.c
    harmony/enhanced/java/branches/java6/classlib/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/internal/net/www/protocol/file/FileURLConnectionTest.java
    harmony/enhanced/java/branches/java6/classlib/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/internal/net/www/protocol/http/HttpURLConnectionTest.java
    harmony/enhanced/java/branches/java6/classlib/modules/misc/build.xml
    harmony/enhanced/java/branches/java6/classlib/modules/nio/src/main/java/common/org/apache/harmony/nio/internal/FileChannelImpl.java
    harmony/enhanced/java/branches/java6/classlib/modules/swing/build.xml
    harmony/enhanced/java/branches/java6/common_resources/   (props changed)
    harmony/enhanced/java/branches/java6/common_resources/make/properties.xml
    harmony/enhanced/java/branches/java6/drlvm/   (props changed)
    harmony/enhanced/java/branches/java6/drlvm/vm/gc_gen/src/common/gc_concurrent.cpp
    harmony/enhanced/java/branches/java6/drlvm/vm/include/open/platform_types.h
    harmony/enhanced/java/branches/java6/drlvm/vm/jitrino/src/main/PMF.cpp
    harmony/enhanced/java/branches/java6/drlvm/vm/vmcore/src/exception/exceptions.cpp
    harmony/enhanced/java/branches/java6/drlvm/vm/vmcore/src/init/finalize.cpp
    harmony/enhanced/java/branches/java6/drlvm/vm/vmcore/src/jvmti/jvmti_thread.cpp
    harmony/enhanced/java/branches/java6/drlvm/vm/vmcore/src/jvmti/jvmti_thread_group.cpp
    harmony/enhanced/java/branches/java6/jdktools/   (props changed)
    harmony/enhanced/java/branches/java6/jdktools/modules/jretools/.classpath   (props changed)
    harmony/enhanced/java/branches/java6/jdktools/modules/jretools/.project   (props changed)
    harmony/enhanced/java/branches/java6/jdktools/modules/jretools/.settings/org.eclipse.jdt.core.prefs   (props changed)
    harmony/enhanced/java/branches/java6/jdktools/modules/jretools/.settings/org.eclipse.jdt.ui.prefs   (props changed)
    harmony/enhanced/java/branches/java6/jdktools/modules/jretools/META-INF/MANIFEST.MF   (props changed)
    harmony/enhanced/java/branches/java6/jdktools/modules/jretools/build.xml   (contents, props changed)
    harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/internal/nls/Messages.java   (props changed)
    harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/internal/nls/messages.properties   (props changed)
    harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/ArgumentsParser.java   (props changed)
    harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CRLManager.java   (props changed)
    harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CSRGenerator.java   (props changed)
    harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertChainVerifier.java   (props changed)
    harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertExporter.java   (props changed)
    harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertImporter.java   (props changed)
    harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertReader.java   (props changed)
    harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/Command.java   (props changed)
    harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/EntryManager.java   (props changed)
    harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/HelpPrinter.java   (props changed)
    harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyCertGenerator.java   (props changed)
    harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyStoreCertPrinter.java   (props changed)
    harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyStoreConverter.java   (props changed)
    harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolException.java   (props changed)
    harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolKSLoaderSaver.java   (props changed)
    harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolParameters.java   (props changed)
    harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/Main.java   (props changed)
    harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/Consts.java   (props changed)
    harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/Main.java   (props changed)
    harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/control/Controller.java   (props changed)
    harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/control/InvalidPolicyTextException.java   (props changed)
    harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/control/PolicyFileHandler.java   (props changed)
    harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/control/PolicyTextParser.java   (props changed)
    harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/model/CommentEntry.java   (props changed)
    harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/model/GrantEntry.java   (props changed)
    harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/model/KeystoreEntry.java   (props changed)
    harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/model/KeystorePasswordURLEntry.java   (props changed)
    harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/model/Permission.java   (props changed)
    harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/model/PolicyEntry.java   (props changed)
    harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/model/Principal.java   (props changed)
    harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/BaseFormDialog.java   (props changed)
    harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/DirectTextEditorPanel.java   (props changed)
    harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/EditorPanel.java   (props changed)
    harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/GrantEntryEditFormDialog.java   (props changed)
    harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/GraphicalEditorPanel.java   (props changed)
    harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/KeystoreEntryEditFormDialog.java   (props changed)
    harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/LAEFormDialog.java   (props changed)
    harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/ListAndEditPanel.java   (props changed)
    harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/MainFrame.java   (props changed)
    harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/PermissionEditFormDialog.java   (props changed)
    harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/PrincipalEditFormDialog.java   (props changed)
    harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/WarningLogDialog.java   (props changed)
    harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/apache.gif   (props changed)
    harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/toolutils/KeyStoreLoaderSaver.java   (props changed)
    harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/toolutils/Util.java   (props changed)
    harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/unpack200/Main.java   (props changed)
    harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/test/java/org/apache/harmony/jretools/tests/keytool/GenKeyTest.java   (props changed)
    harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/test/java/org/apache/harmony/jretools/tests/keytool/TestUtils.java   (props changed)
    harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/test/java/org/apache/harmony/jretools/tests/toolutils/KeyStoreLoaderSaverTest.java   (props changed)
    harmony/enhanced/java/branches/java6/jdktools/modules/samsa/build.xml

Propchange: harmony/enhanced/java/branches/java6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Apr 21 21:44:58 2010
@@ -1,2 +1,2 @@
-/harmony/enhanced/java/trunk:929253-934903
+/harmony/enhanced/java/trunk:929253-936298
 /harmony/enhanced/trunk:810871-929252

Modified: harmony/enhanced/java/branches/java6/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/build.xml?rev=936526&r1=936525&r2=936526&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/build.xml (original)
+++ harmony/enhanced/java/branches/java6/build.xml Wed Apr 21 21:44:58 2010
@@ -835,7 +835,7 @@ harmony.java.version=${harmony.java.vers
             depends="test-classlib,test-jdktools,process-test-output" />
 
     <target name="clean-tests">
-        <delete dir="build/test_report" />
+        <delete dir="target/test_report" />
     </target>
 
     <target name="test-classlib" depends="clean-tests">
@@ -845,7 +845,7 @@ harmony.java.version=${harmony.java.vers
             <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="build/test_report" />
+            <property name="tests.output" location="target/test_report" />
             <property name="test.jre.home" location="target/hdk/jdk/jre" />
         </ant>
     </target>
@@ -857,7 +857,7 @@ harmony.java.version=${harmony.java.vers
             <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="build/test_report" />
+            <property name="tests.output" location="target/test_report" />
             <property name="test.jre.home" location="target/hdk/jdk/jre" />
         </ant>
     </target>
@@ -869,7 +869,7 @@ harmony.java.version=${harmony.java.vers
             <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="build/test_report" />
+            <property name="tests.output" location="target/test_report" />
             <property name="test.jre.home" location="target/hdk/jdk/jre" />
         </ant>
     </target>

Propchange: harmony/enhanced/java/branches/java6/classlib/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Apr 21 21:44:58 2010
@@ -1,6 +1,6 @@
 /harmony/enhanced/classlib/trunk:713674-735919,765923-926091,926318-926838
 /harmony/enhanced/classlib/trunk/working_classlib:884014-884286
-/harmony/enhanced/java/trunk/classlib:929253-934903
+/harmony/enhanced/java/trunk/classlib:929253-936298
 /harmony/enhanced/trunk/classlib:810871-929252
 /harmony/enhanced/trunk/working_classlib:476396-920147
 /incubator/harmony/enhanced/trunk/working_classlib:423974-476394

Propchange: harmony/enhanced/java/branches/java6/classlib/depends/libs/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Apr 21 21:44:58 2010
@@ -1,3 +1,3 @@
 /harmony/enhanced/classlib/trunk/depends/libs:544451-926091
-/harmony/enhanced/java/trunk/classlib/depends/libs:929253-934903
+/harmony/enhanced/java/trunk/classlib/depends/libs:929253-936298
 /harmony/enhanced/trunk/classlib/depends/libs:810871-929252

Modified: harmony/enhanced/java/branches/java6/classlib/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/make/run-test.xml?rev=936526&r1=936525&r2=936526&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/make/run-test.xml (original)
+++ harmony/enhanced/java/branches/java6/classlib/make/run-test.xml Wed Apr 21 21:44:58 2010
@@ -26,12 +26,31 @@
     <property name="target.dir" value="." />
     <property name="work.dir" value="${target.dir}" />
     <property name="tests.output" value="${work.dir}/report" />
+    <property name="report.dir" value="${tests.output}/html" />
     <property name="junit.jar" value="${target.dir}/junit.jar" />
 
+    <property name="gen.report" value="true" />
+    <condition property="do.full.report" value="true">
+        <and>
+            <equals arg1="${gen.report}" arg2="true" />
+            <not><equals arg1="${short.report}" arg2="true" /></not>
+        </and>
+    </condition>
+    <condition property="do.short.report" value="true">
+        <and>
+            <equals arg1="${gen.report}" arg2="true" />
+            <equals arg1="${short.report}" arg2="true" />
+        </and>
+    </condition>
+
     <import file="../ant/properties.xml" />
 
     <target name="test"
-            depends="test-jre-vm-info,-test,gen-report,check-test-result" />
+            depends="test-jre-vm-info,-test,check-test-result" />
+
+    <target name="clean">
+        <delete dir="${tests.output}" />
+    </target>
 
     <target name="-test">
         <echo message="Test Work Dir: ${work.dir}" />
@@ -41,23 +60,94 @@
         <poll-modules dir="." target="test-module" />
     </target>
 
-    <target name="check-test-result">
-        <available property="test.errors" file="${work.dir}/report/test.errors" />
-        <available property="test.failures" file="${work.dir}/report/test.failures" />
+    <target name="check-test-result" depends="-check-crashed,gen-report">
+        <fail if="test.crashes"
+              message="There were test crashes: ${crashed.tests}"/>
+        <available property="test.errors"
+                   file="${tests.output}/test.errors" />
+        <available property="test.failures"
+                   file="${tests.output}/test.failures" />
         <fail if="test.errors" message="There were test errors." />
         <fail if="test.failures" message="There were test failures." />
     </target>
 
-    <target name="gen-report">
-        <junitreport todir="${tests.output}">
+    <target name="-check-crashed" depends="-check-for-empty, -process-empty"/>
+    <target name="-check-for-empty">
+        <fileset id="empty.test.reports" dir="${tests.output}">
+            <patternset>
+                <include name="TEST-*.xml"/>
+            </patternset>
+            <size value="0" when="equal"/>
+        </fileset>
+
+        <pathconvert refid="empty.test.reports" pathsep="${path.separator}"
+                     property="crashed.tests"/>
+        <condition property="test.crashes">
+            <not>
+                <equals arg1="" arg2="${crashed.tests}" />
+            </not>
+        </condition>
+    </target>
+    <target name="-process-empty" if="test.crashes">
+       <property name="per.crashed.tests.file" 
+                 value="${tests.output}${file.separator}TEST-crashed.xml"/>
+
+       <property name="per.header"
+                 value="&lt;?xml version='1.0' encoding='UTF-8' ?&gt;&lt;testsuite errors='1' name='vmcrash.CrashedTests' time='0'&gt;"/>
+       <property name="per.prefix" value="&lt;testcase classname='"/>
+       <property name="per.middle" value="' name='"/>
+       <property name="per.suffix" 
+                 value="' time='0.0'&gt;&lt;error message='VM crash?'/&gt;&lt;/testcase&gt;"/>
+       <property name="per.footer" value="&lt;/testsuite&gt;"/>
+
+       <echo message="${crashed.tests}" file="${per.crashed.tests.file}"/>
+
+       <replaceregexp file="${per.crashed.tests.file}" flags="g">
+            <regexp pattern="[^${path.separator}]*TEST-([^${path.separator}]*)\.xml${path.separator}?"/>
+            <substitution expression="${per.prefix}\1${per.middle}\1${per.suffix}"/>
+       </replaceregexp>
+       <replaceregexp file="${per.crashed.tests.file}" match="\A"
+                      replace="${per.header}"/>
+       <echo file="${per.crashed.tests.file}" append="yes"
+             message="${per.footer}"/>
+
+       <!-- now let's delete empty reports -->
+       <delete><fileset refid="empty.test.reports"/></delete>
+
+       <!-- Need to ensure the file is UTF-8 on non-ASCII platforms -->
+        <move file="${per.crashed.tests.file}"
+              tofile="${per.crashed.tests.file}.orig" />
+        <copy file="${per.crashed.tests.file}.orig"
+              tofile="${per.crashed.tests.file}" outputencoding="UTF-8" />
+        <delete file="${per.crashed.tests.file}.orig" />
+
+    </target>
+
+    <target name="gen-report" depends="-short-report,-full-report">
+        <!-- this property is simply to fix slashes in displayed string -->
+        <property name="display-location" location="${report.dir}/index.html"/>
+        <echo message="The test report is in ${display-location}"/>
+    </target>
+
+    <target name="-full-report" if="do.full.report">
+        <mkdir dir="${report.dir}" />
+        <junitreport todir="${report.dir}">
             <fileset dir="${tests.output}">
                 <include name="TEST*-*.xml" />
             </fileset>
-            <report format="frames" todir="${tests.output}" />
+            <report format="frames" todir="${report.dir}" />
+        </junitreport>
+    </target>
+
+    <target name="-short-report" unless="do.full.report">
+        <mkdir dir="${report.dir}" />
+        <junitreport todir="${report.dir}">
+            <fileset dir="${tests.output}" includes="TEST*-*.xml">
+                <containsregexp expression='(errors|failures)=.[1-9]' />
+                <exclude name="TESTS-TestSuites.xml" />
+            </fileset>
+            <report format="frames" todir="${report.dir}" />
         </junitreport>
-        <property name="display-location"
-                  location="${tests.output}/index.html"/>
-        <echo message="The test report is in ${display-location}"/>
     </target>
     
 </project>

Modified: harmony/enhanced/java/branches/java6/classlib/modules/awt/src/main/native/linuxfont/unix/LinuxNativeFont.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/awt/src/main/native/linuxfont/unix/LinuxNativeFont.c?rev=936526&r1=936525&r2=936526&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/awt/src/main/native/linuxfont/unix/LinuxNativeFont.c (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/awt/src/main/native/linuxfont/unix/LinuxNativeFont.c Wed Apr 21 21:44:58 2010
@@ -504,6 +504,7 @@ JNIEXPORT jlong JNICALL 
     if (fid == 0) {
         (*env)->ExceptionDescribe(env);
         (*env)->ExceptionClear(env);
+        free(buffer);
         return (jlong)(IDATA)NULL;
     }
     scr = (*env)->GetIntField(env, linuxFont, fid);

Modified: harmony/enhanced/java/branches/java6/classlib/modules/logging/src/main/java/java/util/logging/FileHandler.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/logging/src/main/java/java/util/logging/FileHandler.java?rev=936526&r1=936525&r2=936526&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/logging/src/main/java/java/util/logging/FileHandler.java (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/logging/src/main/java/java/util/logging/FileHandler.java Wed Apr 21 21:44:58 2010
@@ -277,14 +277,15 @@ public class FileHandler extends StreamH
         boolean hasGeneration = false;
 
         // TODO privilege code?
+        String homePath = System.getProperty("user.home"); //$NON-NLS-1$
+        if (homePath == null) {
+            throw new NullPointerException();
+        }
+        boolean homePathHasSepEnd = homePath.endsWith(File.separator);
 
         String tempPath = System.getProperty("java.io.tmpdir"); //$NON-NLS-1$
-        boolean tempPathHasSepEnd = (tempPath == null ? false : tempPath
-                .endsWith(File.separator));
-
-        String homePath = System.getProperty("user.home"); //$NON-NLS-1$
-        boolean homePathHasSepEnd = (homePath == null ? false : homePath
-                .endsWith(File.separator));
+        tempPath = tempPath == null ? homePath : tempPath;
+        boolean tempPathHasSepEnd = tempPath.endsWith(File.separator);
 
         StringBuilder sb = new StringBuilder();
         pattern = pattern.replace('/', File.separatorChar);

Modified: harmony/enhanced/java/branches/java6/classlib/modules/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/FileHandlerTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/FileHandlerTest.java?rev=936526&r1=936525&r2=936526&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/FileHandlerTest.java (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/FileHandlerTest.java Wed Apr 21 21:44:58 2010
@@ -60,9 +60,13 @@ public class FileHandlerTest extends Tes
 
     final static SecurityManager securityManager = new MockLogSecurityManager();
 
-    final static String HOMEPATH = System.getProperty("user.home");
+    final static String USR_HOME_KEY = "user.home";
 
-    final static String TEMPPATH = System.getProperty("java.io.tmpdir");
+    final static String TMP_DIR_KEY = "java.io.tmpdir";
+
+    final static String HOMEPATH = System.getProperty(USR_HOME_KEY);
+
+    final static String TEMPPATH = System.getProperty(TMP_DIR_KEY);
 
     final static String SEP = File.separator;
 
@@ -125,6 +129,55 @@ public class FileHandlerTest extends Tes
         super.tearDown();
     }
 
+    public void testConstructor_NoUsrHome() throws IOException {
+        System.clearProperty(USR_HOME_KEY);
+
+        try {
+            new FileHandler("%h/log_NoUsrHome.log");
+            fail("should throw NullPointerException");
+        } catch (NullPointerException e) {
+            // Expected
+        } finally {
+            if (HOMEPATH != null) {
+                System.setProperty(USR_HOME_KEY, HOMEPATH);
+            }
+        }
+    }
+
+    public void testConstructor_NoTmpDir() throws IOException {
+        System.clearProperty(TMP_DIR_KEY);
+
+        try {
+            new FileHandler("%t/log_NoTmpDir.log");
+        } finally {
+            if (TEMPPATH != null) {
+                System.setProperty(TMP_DIR_KEY, TEMPPATH);
+            }
+        }
+        assertFalse(new File(TEMPPATH, "log_NoTmpDir.log").exists());
+        assertTrue(new File(HOMEPATH, "log_NoTmpDir.log").exists());
+        new File(HOMEPATH, "log_NoTmpDir.log").delete();
+    }
+
+    public void testConstructor_NoTmpDir_NoUsrHome() throws IOException {
+        System.clearProperty(TMP_DIR_KEY);
+        System.clearProperty(USR_HOME_KEY);
+
+        try {
+            new FileHandler("%t/log_NoTmpDir_NoUsrHome.log");
+            fail("should throw NullPointerException");
+        } catch (NullPointerException e) {
+            // Expected
+        } finally {
+            if (TEMPPATH != null) {
+                System.setProperty(TMP_DIR_KEY, TEMPPATH);
+            }
+            if (HOMEPATH != null) {
+                System.setProperty(USR_HOME_KEY, HOMEPATH);
+            }
+        }
+    }
+
     public void testLock() throws Exception {
         FileOutputStream output = new FileOutputStream(TEMPPATH + SEP + "log"
                 + SEP + "java1.test.0");

Modified: harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/java/java/io/FileInputStream.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/java/java/io/FileInputStream.java?rev=936526&r1=936525&r2=936526&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/java/java/io/FileInputStream.java (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/java/java/io/FileInputStream.java Wed Apr 21 21:44:58 2010
@@ -148,14 +148,7 @@ public class FileInputStream extends Inp
             if (fd == FileDescriptor.in) {
                 return (int) fileSystem.ttyAvailable();
             }
-
-            long currentPosition = fileSystem.seek(fd.descriptor, 0L,
-                    IFileSystem.SEEK_CUR);
-            long endOfFilePosition = fileSystem.seek(fd.descriptor, 0L,
-                    IFileSystem.SEEK_END);
-            fileSystem.seek(fd.descriptor, currentPosition,
-                    IFileSystem.SEEK_SET);
-            return (int) (endOfFilePosition - currentPosition);
+            return (int) fileSystem.available(fd.descriptor);
         }
     }
 

Modified: harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/file/FileURLConnection.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/file/FileURLConnection.java?rev=936526&r1=936525&r2=936526&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/file/FileURLConnection.java (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/file/FileURLConnection.java Wed Apr 21 21:44:58 2010
@@ -28,6 +28,9 @@ import java.io.InputStream;
 import java.io.PrintStream;
 import java.net.URL;
 import java.net.URLConnection;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.LinkedHashMap;
 
 import org.apache.harmony.luni.internal.net.www.MimeTable;
 import org.apache.harmony.luni.util.Util;
@@ -48,8 +51,12 @@ public class FileURLConnection extends U
 
     private boolean isDir;
 
+    private long lastModified = 0;
+
     private FilePermission permission;
 
+    private final LinkedHashMap<String, String> header;
+
     /**
      * Creates an instance of <code>FileURLConnection</code> for establishing
      * a connection to the file pointed by this <code>URL<code>
@@ -63,6 +70,7 @@ public class FileURLConnection extends U
             fileName = ""; //$NON-NLS-1$
         }
         fileName = Util.decode(fileName, false);
+        header = new LinkedHashMap<String, String>();
     }
 
     /**
@@ -76,15 +84,90 @@ public class FileURLConnection extends U
     @Override
     public void connect() throws IOException {
         File f = new File(fileName);
-        if (f.isDirectory()) {
-            isDir = true;
+        if (isDir = f.isDirectory()) {
             is = getDirectoryListing(f);
-            // use -1 for the contentLength
         } else {
             is = new BufferedInputStream(new FileInputStream(f));
             length = is.available();
+            lastModified = f.lastModified();
         }
         connected = true;
+        // updaetHeader must be after "connected = true", for updateHeader
+        // invokes getContentType which back invokes connect causing
+        // StackOverflow
+        updateHeader();
+    }
+
+    /**
+     * Function updates the header fields of a file.
+     */
+    private void updateHeader() {
+        String contentType = getContentType();
+        if (contentType != null) {
+            header.put("content-type", contentType); //$NON-NLS-1$
+        }
+        if (length >= 0) {
+            header.put("content-length", Integer.toString(length)); //$NON-NLS-1$
+        }
+        if (lastModified != 0) {
+            SimpleDateFormat dateFormat = new SimpleDateFormat(
+                    "EEE, dd MMM yyyy HH:mm:ss 'GMT'"); //$NON-NLS-1$
+            header.put("last-modified", dateFormat.format(new Date( //$NON-NLS-1$
+                    lastModified)));
+        }
+    }
+
+    @Override
+    public String getHeaderField(String key) {
+        try {
+            if (!connected) {
+                connect();
+            }
+        } catch (IOException e) {
+            // Ignored
+        }
+        return header.get(key);
+    }
+
+    @Override
+    public String getHeaderField(int index) {
+        try {
+            if (!connected) {
+                connect();
+            }
+        } catch (IOException e) {
+            // Ignored
+        }
+        if (index > -1 && index < header.size()) {
+            return header.values().toArray(new String[0])[index];
+        }
+        return null;
+    }
+
+    @Override
+    public String getHeaderFieldKey(int index) {
+        try {
+            if (!connected) {
+                connect();
+            }
+        } catch (IOException e) {
+            // Ignored
+        }
+        if (index > -1 && index < header.size()) {
+            return header.keySet().toArray(new String[0])[index];
+        }
+        return null;
+    }
+
+    public long getLastModified() {
+        try {
+            if (!connected) {
+                connect();
+            }
+        } catch (IOException e) {
+            // default is -1
+        }
+        return lastModified;
     }
 
     /**

Modified: harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/java/org/apache/harmony/luni/platform/IFileSystem.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/java/org/apache/harmony/luni/platform/IFileSystem.java?rev=936526&r1=936525&r2=936526&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/java/org/apache/harmony/luni/platform/IFileSystem.java (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/java/org/apache/harmony/luni/platform/IFileSystem.java Wed Apr 21 21:44:58 2010
@@ -66,7 +66,7 @@ public interface IFileSystem {
     public long readv(long fileDescriptor, long[] addresses, int[] offsets,
             int[] lengths, int size) throws IOException;
 
-    public long writev(long fileDescriptor, long[] addresses, int[] offsets,
+    public long writev(long fileDescriptor, Object[] buffers, int[] offsets,
             int[] lengths, int size) throws IOException;
 
     // Required to support direct byte buffers
@@ -103,6 +103,8 @@ public interface IFileSystem {
             long offset, long count) throws IOException;
 
     public long ttyAvailable() throws IOException;
+
+    public long available(long fileDescriptor) throws IOException;
     
     public long ttyRead(byte[] bytes, int offset, int length) throws IOException;
 }

Modified: harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/java/org/apache/harmony/luni/platform/OSFileSystem.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/java/org/apache/harmony/luni/platform/OSFileSystem.java?rev=936526&r1=936525&r2=936526&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/java/org/apache/harmony/luni/platform/OSFileSystem.java (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/java/org/apache/harmony/luni/platform/OSFileSystem.java Wed Apr 21 21:44:58 2010
@@ -28,6 +28,10 @@ import java.io.UnsupportedEncodingExcept
  */
 class OSFileSystem implements IFileSystem {
 
+    static {
+        oneTimeInitializationImpl();
+    }
+
     private static final OSFileSystem singleton = new OSFileSystem();
 
     public static OSFileSystem getOSFileSystem() {
@@ -38,6 +42,8 @@ class OSFileSystem implements IFileSyste
         super();
     }
 
+    private native static void oneTimeInitializationImpl();
+
     private final void validateLockArgs(int type, long start, long length) {
         if ((type != IFileSystem.SHARED_LOCK_TYPE)
                 && (type != IFileSystem.EXCLUSIVE_LOCK_TYPE)) {
@@ -194,18 +200,8 @@ class OSFileSystem implements IFileSyste
     private native long readvImpl(long fileDescriptor, long[] addresses,
             int[] offsets, int[] lengths, int size);
 
-    public long writev(long fileDescriptor, long[] addresses, int[] offsets,
-            int[] lengths, int size) throws IOException {
-        long bytesWritten = writevImpl(fileDescriptor, addresses, offsets,
-                lengths, size);
-        if (bytesWritten < 0) {
-            throw new IOException();
-        }
-        return bytesWritten;
-    }
-
-    private native long writevImpl(long fileDescriptor, long[] addresses,
-            int[] offsets, int[] lengths, int size);
+    public native long writev(long fileDescriptor, Object[] buffers,
+            int[] offsets, int[] lengths, int size) throws IOException;
 
     private native int closeImpl(long fileDescriptor);
 
@@ -271,6 +267,16 @@ class OSFileSystem implements IFileSyste
 
     private native long ttyAvailableImpl();
 
+    public long available(long fileDescriptor) throws IOException {
+        long nChar = availableImpl(fileDescriptor);
+        if (nChar < 0) {
+            throw new IOException();
+        }
+        return nChar;
+    }
+
+    private native long availableImpl(long fileDescriptor);
+
     public long ttyRead(byte[] bytes, int offset, int length) throws IOException {
         long nChar = ttyReadImpl(bytes, offset, length);
         if (nChar < 0) {

Modified: harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/native/luni/shared/OSFileSystem.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/native/luni/shared/OSFileSystem.c?rev=936526&r1=936525&r2=936526&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/native/luni/shared/OSFileSystem.c (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/native/luni/shared/OSFileSystem.c Wed Apr 21 21:44:58 2010
@@ -23,11 +23,37 @@
 #include "iohelp.h"
 #include "exceptions.h"
 #include "nethelp.h"
+#include "harmonyglob.h"
 #include "OSFileSystem.h"
 #include "IFileSystem.h"
 
 /*
  * Class:     org_apache_harmony_luni_platform_OSFileSystem
+ * Method:    oneTimeInitializationImpl
+ * Signature: ()V
+ */
+JNIEXPORT void JNICALL
+Java_org_apache_harmony_luni_platform_OSFileSystem_oneTimeInitializationImpl
+  (JNIEnv * env, jclass clazz)
+{
+  jclass lookupClass;
+  jobject globalRef;
+
+  if (HARMONY_CACHE_GET (env, CLS_java_nio_DirectByteBuffer)) {
+    /* Cache is already initialized */
+    return;
+  }
+  lookupClass = (*env)->FindClass (env, "java/nio/DirectByteBuffer");
+  if (!lookupClass)
+    return;
+  globalRef = (*env)->NewGlobalRef (env, lookupClass);
+  if (!globalRef)
+    return;
+  HARMONY_CACHE_SET (env, CLS_java_nio_DirectByteBuffer, globalRef);
+}
+
+/*
+ * Class:     org_apache_harmony_luni_platform_OSFileSystem
  * Method:    readDirectImpl
  * Signature: (JJI)J
  */
@@ -259,6 +285,33 @@ JNIEXPORT jlong JNICALL Java_org_apache_
 }
 
 /*
+ * Answers the number of remaining chars in the stdin.
+ *
+ * Class:     org_apache_harmony_luni_platform_OSFileSystem
+ * Method:    AvailableImpl
+ * Signature: ()J
+ */
+JNIEXPORT jlong JNICALL Java_org_apache_harmony_luni_platform_OSFileSystem_availableImpl
+(JNIEnv *env, jobject thiz, jlong fd)
+{
+    jlong currentPosition =
+      Java_org_apache_harmony_luni_platform_OSFileSystem_seekImpl(env,
+          thiz, fd, 0,
+          org_apache_harmony_luni_platform_IFileSystem_SEEK_CUR);
+
+    jlong endPosition =
+      Java_org_apache_harmony_luni_platform_OSFileSystem_seekImpl(env,
+          thiz, fd, 0,
+          org_apache_harmony_luni_platform_IFileSystem_SEEK_END);
+    
+    Java_org_apache_harmony_luni_platform_OSFileSystem_seekImpl(env,
+          thiz, fd, currentPosition,
+          org_apache_harmony_luni_platform_IFileSystem_SEEK_SET);
+    
+    return (jlong) (endPosition - currentPosition);
+}
+
+/*
  * Reads the number of bytes from stdin.
  *
  * Class:     org_apache_harmony_luni_platform_OSFileSystem

Modified: harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/native/luni/unix/OSFileSystemLinux32.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/native/luni/unix/OSFileSystemLinux32.c?rev=936526&r1=936525&r2=936526&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/native/luni/unix/OSFileSystemLinux32.c (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/native/luni/unix/OSFileSystemLinux32.c Wed Apr 21 21:44:58 2010
@@ -32,7 +32,9 @@
 #include "vmi.h"
 #include "iohelp.h"
 #include "nethelp.h"
+#include "harmonyglob.h"
 #include "hysock.h"
+#include "exceptions.h"
 
 #include "IFileSystem.h"
 #include "OSFileSystem.h"
@@ -190,44 +192,101 @@ JNIEXPORT jlong JNICALL Java_org_apache_
 
 /*
  * Class:     org_apache_harmony_luni_platform_OSFileSystem
- * Method:    writevImpl
+ * Method:    writev
  * Signature: (J[J[I[I)J
  */
-JNIEXPORT jlong JNICALL Java_org_apache_harmony_luni_platform_OSFileSystem_writevImpl
-  (JNIEnv *env, jobject thiz, jlong fd, jlongArray jbuffers, jintArray joffsets, jintArray jlengths, jint size){
+JNIEXPORT jlong JNICALL
+Java_org_apache_harmony_luni_platform_OSFileSystem_writev
+  (JNIEnv *env, jobject thiz, jlong fd, jobjectArray buffers, jintArray offset, jintArray counts, jint length){
   PORT_ACCESS_FROM_ENV (env);
-  jboolean bufsCopied = JNI_FALSE;
-  jboolean offsetsCopied = JNI_FALSE;
-  jboolean lengthsCopied = JNI_FALSE;
-  jlong *bufs;
-  jint *offsets;
-  jint *lengths;
-  int i = 0;
-  long totalWritten = 0;
-  struct iovec *vectors = (struct iovec *)hymem_allocate_memory(size * sizeof(struct iovec));
-  if(vectors == NULL){
-    return -1;
-  }
-  bufs = (*env)->GetLongArrayElements(env, jbuffers, &bufsCopied);
-  offsets = (*env)->GetIntArrayElements(env, joffsets, &offsetsCopied);
-  lengths = (*env)->GetIntArrayElements(env, jlengths, &lengthsCopied);
-  while(i < size){
-    vectors[i].iov_base = (void *)((IDATA)(bufs[i]+offsets[i]));
-    vectors[i].iov_len = lengths[i];
-    i++;
+  jobject buffer;
+  jobject* toBeReleasedBuffers;
+  jint *noffset;
+  jboolean isDirectBuffer = JNI_FALSE;
+  jint result = 0;
+  jclass byteBufferClass;
+  struct iovec* vect;
+  int i;
+
+  vect = (struct iovec*) hymem_allocate_memory(sizeof(struct iovec) * length);
+  if (vect == NULL) {
+    throwNewOutOfMemoryError(env, "");
+    return 0;
+  }
+
+  toBeReleasedBuffers =
+    (jobject*) hymem_allocate_memory(sizeof(jobject) * length);
+  if (toBeReleasedBuffers == NULL) {
+    throwNewOutOfMemoryError(env, "");
+    goto free_resources;
+  }
+  memset(toBeReleasedBuffers, 0, sizeof(jobject)*length);
+
+  byteBufferClass = HARMONY_CACHE_GET (env, CLS_java_nio_DirectByteBuffer);
+  noffset = (*env)->GetIntArrayElements(env, offset, NULL);
+  if (noffset == NULL) {
+    throwNewOutOfMemoryError(env, "");
+    goto free_resources;
+  }
+
+  for (i = 0; i < length; ++i) {
+    jint *cts;
+    U_8* base;
+    buffer = (*env)->GetObjectArrayElement(env, buffers, i);
+    isDirectBuffer = (*env)->IsInstanceOf(env, buffer, byteBufferClass);
+    if (isDirectBuffer) {
+      base =
+        (U_8 *)(jbyte *)(IDATA) (*env)->GetDirectBufferAddress(env, buffer);
+      if (base == NULL) {
+        throwNewOutOfMemoryError(env, "");
+        goto free_resources;
+      }
+      toBeReleasedBuffers[i] = NULL;
+    } else {
+      base =
+        (U_8 *)(jbyte *)(IDATA) (*env)->GetByteArrayElements(env, buffer, NULL);
+      if (base == NULL) {
+        throwNewOutOfMemoryError(env, "");
+        goto free_resources;
+      }
+      toBeReleasedBuffers[i] = buffer;
+    }
+    vect[i].iov_base = base + noffset[i];
+
+    cts = (*env)->GetPrimitiveArrayCritical(env, counts, NULL);
+    vect[i].iov_len = cts[i];
+    (*env)->ReleasePrimitiveArrayCritical(env, counts, cts, JNI_ABORT);
   }
-  totalWritten = writev(fd - FD_BIAS, vectors, size);
-  if(bufsCopied){
-    (*env)->ReleaseLongArrayElements(env, jbuffers, bufs, JNI_ABORT);
+
+  result = writev(fd - FD_BIAS, vect, length);
+
+  if (0 > result) {
+    if (errno != EAGAIN) {
+      throwJavaIoIOException(env, "");
+    }
+    result = 0;
   }
-  if(offsetsCopied){
-    (*env)->ReleaseIntArrayElements(env, joffsets, offsets, JNI_ABORT);
+
+ free_resources:
+  
+  if (toBeReleasedBuffers != NULL) {
+    for (i = 0; i < length; ++i) {
+      if (toBeReleasedBuffers[i] != NULL) {
+        (*env)->ReleaseByteArrayElements(env, toBeReleasedBuffers[i],
+                                         vect[i].iov_base - noffset[i],
+                                         JNI_ABORT);
+      }
+    }
   }
-  if(lengthsCopied){
-    (*env)->ReleaseIntArrayElements(env, jlengths, lengths, JNI_ABORT);
+
+  if (noffset != NULL) {
+    (*env)->ReleaseIntArrayElements(env, offset, noffset, JNI_ABORT);
   }
-  hymem_free_memory(vectors);
-  return totalWritten;
+
+  hymem_free_memory(toBeReleasedBuffers);
+  hymem_free_memory(vect);
+
+  return (jint) result;
 }
 
 /*

Modified: harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/native/luni/unix/OSNetworkSystemLinux.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/native/luni/unix/OSNetworkSystemLinux.c?rev=936526&r1=936525&r2=936526&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/native/luni/unix/OSNetworkSystemLinux.c (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/native/luni/unix/OSNetworkSystemLinux.c Wed Apr 21 21:44:58 2010
@@ -803,6 +803,7 @@ Java_org_apache_harmony_luni_platform_OS
   result = writev(SOCKET_CAST (socketP), vect, length);
 
   if (0 > result) {
+    /* TOFIX? man write(2) on linux implies we should check EWOULDBLOCK too */
     if (errno != EAGAIN) {
       throwJavaNetSocketException(env, result);
     }

Modified: harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/native/luni/unix/exports.txt
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/native/luni/unix/exports.txt?rev=936526&r1=936525&r2=936526&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/native/luni/unix/exports.txt (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/native/luni/unix/exports.txt Wed Apr 21 21:44:58 2010
@@ -136,9 +136,10 @@ JNI_OnUnload
 Java_org_apache_harmony_luni_util_FloatingPointParser_parseDblImpl
 Java_org_apache_harmony_luni_util_FloatingPointParser_parseFltImpl
 Java_org_apache_harmony_luni_util_NumberConverter_bigIntDigitGeneratorInstImpl
+Java_org_apache_harmony_luni_platform_OSFileSystem_oneTimeInitializationImpl
 Java_org_apache_harmony_luni_platform_OSFileSystem_truncateImpl
 Java_org_apache_harmony_luni_platform_OSFileSystem_getAllocGranularity
-Java_org_apache_harmony_luni_platform_OSFileSystem_writevImpl
+Java_org_apache_harmony_luni_platform_OSFileSystem_writev
 Java_org_apache_harmony_luni_platform_OSFileSystem_readvImpl
 Java_org_apache_harmony_luni_platform_OSFileSystem_writeImpl
 Java_org_apache_harmony_luni_platform_OSFileSystem_openImpl
@@ -152,6 +153,7 @@ Java_org_apache_harmony_luni_platform_OS
 Java_org_apache_harmony_luni_platform_OSFileSystem_unlockImpl
 Java_org_apache_harmony_luni_platform_OSFileSystem_transferImpl
 Java_org_apache_harmony_luni_platform_OSFileSystem_ttyAvailableImpl
+Java_org_apache_harmony_luni_platform_OSFileSystem_availableImpl
 Java_org_apache_harmony_luni_platform_OSFileSystem_ttyReadImpl
 Java_org_apache_harmony_luni_platform_OSMemory_isLoadedImpl
 Java_org_apache_harmony_luni_platform_OSMemory_loadImpl

Modified: harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/native/luni/windows/OSFileSystemWin32.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/native/luni/windows/OSFileSystemWin32.c?rev=936526&r1=936525&r2=936526&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/native/luni/windows/OSFileSystemWin32.c (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/native/luni/windows/OSFileSystemWin32.c Wed Apr 21 21:44:58 2010
@@ -27,6 +27,7 @@
 #include <stdio.h>
 #include "IFileSystem.h"
 #include "OSFileSystem.h"
+#include "harmonyglob.h"
 
 /**
  * Lock the file identified by the given handle.
@@ -173,19 +174,62 @@ JNIEXPORT jlong JNICALL Java_org_apache_
  * Method:    writevImpl
  * Signature: (J[J[I[I)J
  */
-JNIEXPORT jlong JNICALL Java_org_apache_harmony_luni_platform_OSFileSystem_writevImpl
-  (JNIEnv *env, jobject thiz, jlong fd, jlongArray jbuffers, jintArray joffsets, jintArray jlengths, jint size){
+JNIEXPORT jlong JNICALL
+Java_org_apache_harmony_luni_platform_OSFileSystem_writev
+  (JNIEnv *env, jobject thiz, jlong fd, jobjectArray buffers, jintArray offset, jintArray counts, jint length){
   PORT_ACCESS_FROM_ENV (env);
-  jboolean bufsCopied = JNI_FALSE;
-  jboolean offsetsCopied = JNI_FALSE;
-  jboolean lengthsCopied = JNI_FALSE;
-  jlong *bufs = (*env)->GetLongArrayElements(env, jbuffers, &bufsCopied);
-  jint *offsets = (*env)->GetIntArrayElements(env, joffsets, &offsetsCopied);
-  jint *lengths = (*env)->GetIntArrayElements(env, jlengths, &lengthsCopied);
-  long totalWritten = 0;  
-  int i = 0;
-  while(i<size){
-    long bytesWritten = hyfile_write ((IDATA) fd, (void *) (*(bufs+i)+*(offsets+i)), (IDATA) *(lengths+i));
+  jint *noffset = NULL;
+  jint *lengths = NULL;
+  jboolean isDirectBuffer = JNI_FALSE;
+  long totalWritten = 0;
+  int i;
+  jclass byteBufferClass;
+
+  byteBufferClass = HARMONY_CACHE_GET (env, CLS_java_nio_DirectByteBuffer);
+
+  noffset = (*env)->GetIntArrayElements(env, offset, NULL);
+  if (noffset == NULL) {
+    throwNewOutOfMemoryError(env, "");
+    goto free_resources;
+  }
+
+  lengths = (*env)->GetIntArrayElements(env, counts, NULL);
+  if (lengths == NULL) {
+    throwNewOutOfMemoryError(env, "");
+    goto free_resources;
+  }
+
+  for (i = 0; i < length; ++i) {
+    long bytesWritten;
+    jobject toRelease = NULL;
+    U_8* buf;
+    jobject buffer = (*env)->GetObjectArrayElement(env, buffers, i);
+    isDirectBuffer = (*env)->IsInstanceOf(env, buffer, byteBufferClass);
+    if (isDirectBuffer) {
+      buf =
+        (U_8 *)(jbyte *)(IDATA) (*env)->GetDirectBufferAddress(env, buffer);
+      if (buf == NULL) {
+        throwNewOutOfMemoryError(env, "Failed to get direct buffer address");
+        goto free_resources;
+      }
+      toRelease = NULL;
+    } else {
+      buf =
+        (U_8 *)(jbyte *)(IDATA) (*env)->GetByteArrayElements(env, buffer, NULL);
+      if (buf == NULL) {
+        throwNewOutOfMemoryError(env, "");
+        goto free_resources;
+      }
+      toRelease = buffer;
+    }
+          
+    bytesWritten =
+      hyfile_write ((IDATA) fd,
+                    (void *) (buf + noffset[i]), (IDATA) lengths[i]);
+    if (toRelease != NULL) {
+      (*env)->ReleaseByteArrayElements(env, toRelease, buf, JNI_ABORT);
+    }
+
     if(bytesWritten == -1 && hyerror_last_error_number() == HYPORT_ERROR_FILE_LOCKED){
         throwNewExceptionByName(env, "java/io/IOException", netLookupErrorString(env, HYPORT_ERROR_FILE_LOCKED));
 	break;
@@ -195,17 +239,19 @@ JNIEXPORT jlong JNICALL Java_org_apache_
         break;
     }
     totalWritten += bytesWritten;
-    i++;
+   
   }
-  if(bufsCopied){
-    (*env)->ReleaseLongArrayElements(env, jbuffers, bufs, JNI_ABORT);
-  }
-  if(offsetsCopied){
-    (*env)->ReleaseIntArrayElements(env, joffsets, offsets, JNI_ABORT);
+
+ free_resources:
+
+  if (noffset != NULL) {
+    (*env)->ReleaseIntArrayElements(env, offset, noffset, JNI_ABORT);
   }
-  if(lengthsCopied){
-    (*env)->ReleaseIntArrayElements(env, jlengths, lengths, JNI_ABORT);
+
+  if (lengths != NULL) {
+    (*env)->ReleaseIntArrayElements(env, counts, lengths, JNI_ABORT);
   }
+
   return totalWritten;
 }
 

Modified: harmony/enhanced/java/branches/java6/classlib/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/internal/net/www/protocol/file/FileURLConnectionTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/internal/net/www/protocol/file/FileURLConnectionTest.java?rev=936526&r1=936525&r2=936526&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/internal/net/www/protocol/file/FileURLConnectionTest.java (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/internal/net/www/protocol/file/FileURLConnectionTest.java Wed Apr 21 21:44:58 2010
@@ -18,6 +18,7 @@ package org.apache.harmony.luni.tests.in
 
 import java.io.IOException;
 import java.net.URL;
+import java.net.URLConnection;
 
 import junit.framework.TestCase;
 
@@ -63,4 +64,36 @@ public class FileURLConnectionTest exten
         assertNotNull(conn.getInputStream());
         assertEquals("file",conn.getURL().getProtocol());
     }
+
+    public void testHeaderFunctions() throws IOException {
+        String resourceName = "org/apache/harmony/luni/tests/";  //folder name
+        URL url = ClassLoader.getSystemClassLoader().getResource(resourceName);
+        FileURLConnection conn = new FileURLConnection(url);
+        assertNotNull(conn.getInputStream());
+        assertEquals(conn.getContentType(),  conn.getHeaderField("content-type")) ;
+        
+        resourceName = "org/apache/harmony/luni/tests/" +  "test.rtf";;  //folder name
+        url = ClassLoader.getSystemClassLoader().getResource(resourceName);
+        conn = new FileURLConnection(url);
+        assertNotNull(conn.getInputStream());
+        assertEquals(conn.getContentType(),  conn.getHeaderField("content-type")) ;
+        assertEquals(Integer.toString(conn.getContentLength()),  conn.getHeaderField("content-length")) ;
+        assertEquals(conn.getHeaderField(0), conn.getHeaderField("content-type"));
+        assertEquals(conn.getHeaderField(1), conn.getHeaderField("content-length"));
+        assertEquals(conn.getHeaderField(2), conn.getHeaderField("last-modified"));
+        assertEquals("last-modified", conn.getHeaderFieldKey(2));
+        assertEquals("content-length", conn.getHeaderFieldKey(1));
+        assertEquals("content-type", conn.getHeaderFieldKey(0));
+    }
+
+    public void testHeader_BoundaryCheck() throws IOException {
+        String resourceName = "org/apache/harmony/luni/tests/";
+        URL url = ClassLoader.getSystemClassLoader().getResource(resourceName);
+        URLConnection urlConnection = url.openConnection();
+        assertNull(urlConnection.getHeaderField(Integer.MIN_VALUE));
+        assertNull(urlConnection.getHeaderField(Integer.MAX_VALUE));
+        assertNull(urlConnection.getHeaderFieldKey(Integer.MIN_VALUE));
+        assertNull(urlConnection.getHeaderFieldKey(Integer.MAX_VALUE));
+        assertNull(urlConnection.getHeaderField(null));
+    }
 }

Modified: harmony/enhanced/java/branches/java6/classlib/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/internal/net/www/protocol/http/HttpURLConnectionTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/internal/net/www/protocol/http/HttpURLConnectionTest.java?rev=936526&r1=936525&r2=936526&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/internal/net/www/protocol/http/HttpURLConnectionTest.java (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/internal/net/www/protocol/http/HttpURLConnectionTest.java Wed Apr 21 21:44:58 2010
@@ -437,13 +437,18 @@ public class HttpURLConnectionTest exten
             urlConnect.getInputStream();
             assertTrue(urlConnect.usingProxy());
             
-            System.setProperty("http.proxyPort", "81");
+            // find a free port
+            ServerSocket serverSocket = new ServerSocket(0);
+            int port = serverSocket.getLocalPort();
+            serverSocket.close();
+            
+            System.setProperty("http.proxyPort", port + "");
             url = new URL(jettyURL);
             urlConnect = (HttpURLConnection) url.openConnection();
             urlConnect.getInputStream();
             assertFalse(urlConnect.usingProxy());
             
-            url = new URL("http://localhost");
+            url = new URL("http://localhost:" + port);
             urlConnect = (HttpURLConnection) url.openConnection();
             try {
                 urlConnect.getInputStream();

Modified: harmony/enhanced/java/branches/java6/classlib/modules/misc/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/misc/build.xml?rev=936526&r1=936525&r2=936526&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/misc/build.xml (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/misc/build.xml Wed Apr 21 21:44:58 2010
@@ -43,7 +43,7 @@
     <target name="-test-module" depends="build, run-tests" />
 
     <target name="clean" depends="clean-java,clean-native,clean-test" />
-    <target name="clean-java">
+    <target name="clean-java" depends="class-patternset">
         <delete file="${hy.jdk}/jre/lib/boot/misc.jar" />
         <delete file="${hy.jdk}/jre/lib/boot/misc-src.jar" />
         <delete failonerror="false">

Modified: harmony/enhanced/java/branches/java6/classlib/modules/nio/src/main/java/common/org/apache/harmony/nio/internal/FileChannelImpl.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/nio/src/main/java/common/org/apache/harmony/nio/internal/FileChannelImpl.java?rev=936526&r1=936525&r2=936526&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/nio/src/main/java/common/org/apache/harmony/nio/internal/FileChannelImpl.java (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/nio/src/main/java/common/org/apache/harmony/nio/internal/FileChannelImpl.java Wed Apr 21 21:44:58 2010
@@ -577,25 +577,25 @@ public abstract class FileChannelImpl ex
         if (0 == count) {
             return 0;
         }
-        long[] handles = new long[length];
+        Object[] src = new Object[length];
         int[] offsets = new int[length];
         int[] lengths = new int[length];
-        ByteBuffer[] bufferRefs = new ByteBuffer[length];
         for (int i = 0; i < length; i++) {
             ByteBuffer buffer = buffers[i + offset];
             if (!buffer.isDirect()) {
                 ByteBuffer directBuffer = ByteBuffer.allocateDirect(buffer
                         .remaining());
+                int oldPosition = buffer.position();
                 directBuffer.put(buffer);
+                buffer.position(oldPosition);
                 directBuffer.flip();
-                buffer = directBuffer;
+                src[i] = directBuffer;
                 offsets[i] = 0;
             } else {
+                src[i] = buffer;
                 offsets[i] = buffer.position();
             }
-            handles[i] = ((DirectBuffer) buffer).getEffectiveAddress().toLong();
             lengths[i] = buffer.remaining();
-            bufferRefs[i] = buffer;
         }
 
         long bytesWritten = 0;
@@ -603,7 +603,7 @@ public abstract class FileChannelImpl ex
         synchronized (repositioningLock) {
             try {
                 begin();
-                bytesWritten = fileSystem.writev(handle, handles, offsets,
+                bytesWritten = fileSystem.writev(handle, src, offsets,
                         lengths, length);
                 completed = true;
             } finally {

Modified: harmony/enhanced/java/branches/java6/classlib/modules/swing/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/swing/build.xml?rev=936526&r1=936525&r2=936526&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/swing/build.xml (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/swing/build.xml Wed Apr 21 21:44:58 2010
@@ -116,7 +116,7 @@
         <copy file="make/run-test.xml" tofile="${tests.hdk.dir}/build.xml" />
         
         <hy.jar.bin destfile="${tests.hdk.dir}/swing_tests.jar">
-            <fileset dir="bin/test" />
+            <fileset dir="bin/test/injected" />
         </hy.jar.bin>
 
         <mkdir dir="${tests.excludes.hdk.dir}"/>
@@ -135,7 +135,8 @@
     </target>
 
     <target name="compile-tests">
-        <compile-tests description="swing tests">
+        <compile-tests description="swing tests"
+                       destdir="bin/test/injected">
             <javac-elements>
                 <src>
                     <pathelement location="src/test/api/java" />

Propchange: harmony/enhanced/java/branches/java6/common_resources/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Apr 21 21:44:58 2010
@@ -1,3 +1,3 @@
-/harmony/enhanced/java/trunk/common_resources:929253-934903
+/harmony/enhanced/java/trunk/common_resources:929253-936298
 /harmony/enhanced/trunk/common_resources:476396-929252
 /incubator/harmony/enhanced/trunk/common_resources:423974-476394

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=936526&r1=936525&r2=936526&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/common_resources/make/properties.xml (original)
+++ harmony/enhanced/java/branches/java6/common_resources/make/properties.xml Wed Apr 21 21:44:58 2010
@@ -359,9 +359,13 @@ Alternatively, you can switch to another
     </macrodef>
    
     <presetdef name="hy.javac">
-        <javac target="${hy.javac.target}" source="${hy.javac.source}" 
-               compiler="${hy.javac.compiler}" debug="${hy.javac.debug}"
-               memoryMaximumSize="${hy.javac.maxmem}">
+        <javac compiler="${hy.javac.compiler}"
+               memoryMaximumSize="${hy.javac.maxmem}"
+               source="${hy.javac.source}"
+               target="${hy.javac.target}"
+               debug="${hy.javac.debug}"
+               debuglevel="${hy.javac.debuglevel}"
+               includeantruntime="false">
             <compilerarg line="${build.compilerarg}" />
         </javac>
     </presetdef>

Propchange: harmony/enhanced/java/branches/java6/drlvm/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Apr 21 21:44:58 2010
@@ -1,4 +1,4 @@
-/harmony/enhanced/java/trunk/drlvm:929253-934903
+/harmony/enhanced/java/trunk/drlvm:929253-936298
 /harmony/enhanced/trunk/drlvm:810871-929252
 /harmony/enhanced/trunk/working_vm:476396-920147
 /incubator/harmony/enhanced/trunk/working_vm:423974-476394

Modified: harmony/enhanced/java/branches/java6/drlvm/vm/gc_gen/src/common/gc_concurrent.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/drlvm/vm/gc_gen/src/common/gc_concurrent.cpp?rev=936526&r1=936525&r2=936526&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/drlvm/vm/gc_gen/src/common/gc_concurrent.cpp (original)
+++ harmony/enhanced/java/branches/java6/drlvm/vm/gc_gen/src/common/gc_concurrent.cpp Wed Apr 21 21:44:58 2010
@@ -35,7 +35,7 @@ struct Con_Collection_Statistics;
 volatile Boolean gc_sweep_global_normal_chunk = FALSE;
 
 //just debugging
-inline void gc_ms_get_current_heap_usage(GC_MS *gc)
+void gc_ms_get_current_heap_usage(GC_MS *gc)
 {
   Con_Collection_Statistics *con_collection_stat = gc_ms_get_con_collection_stat(gc);
   unsigned int new_obj_size = gc_get_mutator_new_obj_size((GC *)gc);

Modified: harmony/enhanced/java/branches/java6/drlvm/vm/include/open/platform_types.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/drlvm/vm/include/open/platform_types.h?rev=936526&r1=936525&r2=936526&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/drlvm/vm/include/open/platform_types.h (original)
+++ harmony/enhanced/java/branches/java6/drlvm/vm/include/open/platform_types.h Wed Apr 21 21:44:58 2010
@@ -74,6 +74,7 @@ typedef unsigned Boolean;
 #ifndef __WORDSIZE // exclude remark #193: zero used for undefined preprocessing identifier
 #define __WORDSIZE 0
 #endif
+#if !defined(__INT64_C)
 # if __WORDSIZE == 64 || defined(WIN32)
 #  define __INT64_C(c)  c ## L
 #  define __UINT64_C(c) c ## UL
@@ -81,6 +82,7 @@ typedef unsigned Boolean;
 #  define __INT64_C(c)  c ## LL
 #  define __UINT64_C(c) c ## ULL
 # endif
+# endif
 
 #ifdef PLATFORM_POSIX
 typedef unsigned short uint16;

Modified: harmony/enhanced/java/branches/java6/drlvm/vm/jitrino/src/main/PMF.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/drlvm/vm/jitrino/src/main/PMF.cpp?rev=936526&r1=936525&r2=936526&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/drlvm/vm/jitrino/src/main/PMF.cpp (original)
+++ harmony/enhanced/java/branches/java6/drlvm/vm/jitrino/src/main/PMF.cpp Wed Apr 21 21:44:58 2010
@@ -1383,7 +1383,7 @@ void PMF::init (bool first_)
 {
     assert(!initialized);
     first = first_;
-    help_requested = false;
+    help_requested = NULL;
     processVMProperties();
     initialized = true;
 

Modified: harmony/enhanced/java/branches/java6/drlvm/vm/vmcore/src/exception/exceptions.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/drlvm/vm/vmcore/src/exception/exceptions.cpp?rev=936526&r1=936525&r2=936526&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/drlvm/vm/vmcore/src/exception/exceptions.cpp (original)
+++ harmony/enhanced/java/branches/java6/drlvm/vm/vmcore/src/exception/exceptions.cpp Wed Apr 21 21:44:58 2010
@@ -445,7 +445,7 @@ inline void exn_jni_print_stack_trace(FI
     tmn_suspend_disable();
     const char* exceptionNameChars = exc->object->vt()->clss->get_name()->bytes;
     tmn_suspend_enable();
-    const char *messageChars = GetStringUTFChars(jenv, message, false);
+    const char *messageChars = GetStringUTFChars(jenv, message, NULL);
     fprintf(f, "\n%s : %s\n", exceptionNameChars, messageChars);
 
     // gets stack trace to print it
@@ -497,10 +497,10 @@ inline void exn_jni_print_stack_trace(FI
         if (ExceptionCheck(jenv))
             return;
         const char *classNameChars =
-            GetStringUTFChars(jenv, className, false);
+            GetStringUTFChars(jenv, className, NULL);
         fprintf(f, "%s.", classNameChars);
         const char *methodNameChars =
-            GetStringUTFChars(jenv, methodName, false);
+            GetStringUTFChars(jenv, methodName, NULL);
         fprintf(f, "%s", methodNameChars);
 
         // gets information about java file name
@@ -514,7 +514,7 @@ inline void exn_jni_print_stack_trace(FI
         if (fileName) {
             // gets line number and prints it after file name
             const char *fileNameChars =
-                GetStringUTFChars(jenv, fileName, false);
+                GetStringUTFChars(jenv, fileName, NULL);
             jint sourceLineNumber =
                 CallIntMethod(jenv, stackTraceElement, getLineNumberId);
             if (ExceptionCheck(jenv))

Modified: harmony/enhanced/java/branches/java6/drlvm/vm/vmcore/src/init/finalize.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/drlvm/vm/vmcore/src/init/finalize.cpp?rev=936526&r1=936525&r2=936526&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/drlvm/vm/vmcore/src/init/finalize.cpp (original)
+++ harmony/enhanced/java/branches/java6/drlvm/vm/vmcore/src/init/finalize.cpp Wed Apr 21 21:44:58 2010
@@ -143,7 +143,7 @@ public:
 
 
 Object_Queue::Object_Queue() {
-    Object_Queue::Object_Queue("unknown");
+    Object_Queue("unknown");
 }
 
 Object_Queue::Object_Queue(const char* log_domain)

Modified: harmony/enhanced/java/branches/java6/drlvm/vm/vmcore/src/jvmti/jvmti_thread.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/drlvm/vm/vmcore/src/jvmti/jvmti_thread.cpp?rev=936526&r1=936525&r2=936526&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/drlvm/vm/vmcore/src/jvmti/jvmti_thread.cpp (original)
+++ harmony/enhanced/java/branches/java6/drlvm/vm/vmcore/src/jvmti/jvmti_thread.cpp Wed Apr 21 21:44:58 2010
@@ -509,7 +509,7 @@ jvmtiGetThreadInfo(jvmtiEnv* env,
     jfieldID id = jvmti_test_jenv->GetFieldID(cl, "name", "Ljava/lang/String;");
     assert(id != NULL); // field must exist in kernel class
     jstring name = jvmti_test_jenv->GetObjectField(thread, id);
-    info_ptr->name = (char*)jvmti_test_jenv->GetStringUTFChars(name, false);
+    info_ptr->name = (char*)jvmti_test_jenv->GetStringUTFChars(name, NULL);
 
     id = jvmti_test_jenv->GetFieldID(cl, "priority", "I");
     assert(id != NULL); // field must exist in kernel class

Modified: harmony/enhanced/java/branches/java6/drlvm/vm/vmcore/src/jvmti/jvmti_thread_group.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/drlvm/vm/vmcore/src/jvmti/jvmti_thread_group.cpp?rev=936526&r1=936525&r2=936526&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/drlvm/vm/vmcore/src/jvmti/jvmti_thread_group.cpp (original)
+++ harmony/enhanced/java/branches/java6/drlvm/vm/vmcore/src/jvmti/jvmti_thread_group.cpp Wed Apr 21 21:44:58 2010
@@ -132,7 +132,7 @@ jvmtiGetThreadGroupInfo(jvmtiEnv* env,
     id = jvmti_test_jenv->GetFieldID(cl, "name","Ljava/lang/String;");
     assert(id != NULL);
     jstring name = jvmti_test_jenv->GetObjectField(group, id);
-    info_ptr->name = (char*)jvmti_test_jenv->GetStringUTFChars(name, false);
+    info_ptr->name = (char*)jvmti_test_jenv->GetStringUTFChars(name, NULL);
 
     id = jvmti_test_jenv->GetFieldID(cl, "maxPriority","I");
     assert(id != NULL);

Propchange: harmony/enhanced/java/branches/java6/jdktools/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Apr 21 21:44:58 2010
@@ -1,4 +1,4 @@
-/harmony/enhanced/java/trunk/jdktools:929253-934903
+/harmony/enhanced/java/trunk/jdktools:929253-936298
 /harmony/enhanced/jdktools/trunk:630107-925933
 /harmony/enhanced/trunk/jdktools:810871-929252
 /harmony/enhanced/trunk/working_jdktools:476396-920147

Propchange: harmony/enhanced/java/branches/java6/jdktools/modules/jretools/.classpath
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Apr 21 21:44:58 2010
@@ -1,4 +1,4 @@
-/harmony/enhanced/java/trunk/jdktools/modules/jretools/.classpath:929253-934903
+/harmony/enhanced/java/trunk/jdktools/modules/jretools/.classpath:929253-936298
 /harmony/enhanced/jdktools/trunk/modules/jretools/.classpath:702140-925933
 /harmony/enhanced/trunk/jdktools/modules/jretools/.classpath:810871-929252
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/.classpath:467609-476394

Propchange: harmony/enhanced/java/branches/java6/jdktools/modules/jretools/.project
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Apr 21 21:44:58 2010
@@ -1,4 +1,4 @@
-/harmony/enhanced/java/trunk/jdktools/modules/jretools/.project:929253-934903
+/harmony/enhanced/java/trunk/jdktools/modules/jretools/.project:929253-936298
 /harmony/enhanced/jdktools/trunk/modules/jretools/.project:702140-925933
 /harmony/enhanced/trunk/jdktools/modules/jretools/.project:810871-929252
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/.project:467609-476394

Propchange: harmony/enhanced/java/branches/java6/jdktools/modules/jretools/.settings/org.eclipse.jdt.core.prefs
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Apr 21 21:44:58 2010
@@ -1,4 +1,4 @@
-/harmony/enhanced/java/trunk/jdktools/modules/jretools/.settings/org.eclipse.jdt.core.prefs:929253-934903
+/harmony/enhanced/java/trunk/jdktools/modules/jretools/.settings/org.eclipse.jdt.core.prefs:929253-936298
 /harmony/enhanced/jdktools/trunk/modules/jretools/.settings/org.eclipse.jdt.core.prefs:702140-925933
 /harmony/enhanced/trunk/jdktools/modules/jretools/.settings/org.eclipse.jdt.core.prefs:810871-929252
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/.settings/org.eclipse.jdt.core.prefs:467609-476394

Propchange: harmony/enhanced/java/branches/java6/jdktools/modules/jretools/.settings/org.eclipse.jdt.ui.prefs
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Apr 21 21:44:58 2010
@@ -1,4 +1,4 @@
-/harmony/enhanced/java/trunk/jdktools/modules/jretools/.settings/org.eclipse.jdt.ui.prefs:929253-934903
+/harmony/enhanced/java/trunk/jdktools/modules/jretools/.settings/org.eclipse.jdt.ui.prefs:929253-936298
 /harmony/enhanced/jdktools/trunk/modules/jretools/.settings/org.eclipse.jdt.ui.prefs:702140-925933
 /harmony/enhanced/trunk/jdktools/modules/jretools/.settings/org.eclipse.jdt.ui.prefs:810871-929252
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/.settings/org.eclipse.jdt.ui.prefs:467609-476394

Propchange: harmony/enhanced/java/branches/java6/jdktools/modules/jretools/META-INF/MANIFEST.MF
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Apr 21 21:44:58 2010
@@ -1,4 +1,4 @@
-/harmony/enhanced/java/trunk/jdktools/modules/jretools/META-INF/MANIFEST.MF:929253-934903
+/harmony/enhanced/java/trunk/jdktools/modules/jretools/META-INF/MANIFEST.MF:929253-936298
 /harmony/enhanced/jdktools/trunk/modules/jretools/META-INF/MANIFEST.MF:702140-925933
 /harmony/enhanced/trunk/jdktools/modules/jretools/META-INF/MANIFEST.MF:810871-929252
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/META-INF/MANIFEST.MF:467609-476394

Modified: harmony/enhanced/java/branches/java6/jdktools/modules/jretools/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/jdktools/modules/jretools/build.xml?rev=936526&r1=936525&r2=936526&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/jdktools/modules/jretools/build.xml (original)
+++ harmony/enhanced/java/branches/java6/jdktools/modules/jretools/build.xml Wed Apr 21 21:44:58 2010
@@ -75,10 +75,6 @@
                     <include name="**/*.jar" />
                 </fileset>
             </bootclasspath>
-
-            <classpath>
-                <pathelement path="${jdt.jdi.jar}"/>
-            </classpath>
         </hy.javac>
     </target>
 
@@ -92,11 +88,6 @@
             <fileset dir="src/main/java">
                 <exclude name="**/*.java" />
             </fileset>
-            
-            <zipfileset src="${jdt.jdi.jar}">
-                <exclude name="com/sun/jdi/Bootstrap.class"/>
-                <exclude name="META-INF/*"/>
-            </zipfileset>
         </hy.jar.bin>
 
         <hy.jar.src destfile="${jretools.deploy.dir}/lib/tools-src.jar">

Propchange: harmony/enhanced/java/branches/java6/jdktools/modules/jretools/build.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Apr 21 21:44:58 2010
@@ -1,4 +1,4 @@
-/harmony/enhanced/java/trunk/jdktools/modules/jretools/build.xml:929253-934903
+/harmony/enhanced/java/trunk/jdktools/modules/jretools/build.xml:929253-936298
 /harmony/enhanced/jdktools/trunk/modules/jretools/build.xml:702140-925933
 /harmony/enhanced/trunk/jdktools/modules/jretools/build.xml:810871-929252
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/build.xml:467609-476394

Propchange: harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/internal/nls/Messages.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Apr 21 21:44:58 2010
@@ -1,4 +1,4 @@
-/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/internal/nls/Messages.java:929253-934903
+/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/internal/nls/Messages.java:929253-936298
 /harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/internal/nls/Messages.java:702140-925933
 /harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/internal/nls/Messages.java:810871-929252
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/internal/nls/Messages.java:467609-476394

Propchange: harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/internal/nls/messages.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Apr 21 21:44:58 2010
@@ -1,4 +1,4 @@
-/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/internal/nls/messages.properties:929253-934903
+/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/internal/nls/messages.properties:929253-936298
 /harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/internal/nls/messages.properties:702140-925933
 /harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/internal/nls/messages.properties:810871-929252
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/internal/nls/messages.properties:467609-476394

Propchange: harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/ArgumentsParser.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Apr 21 21:44:58 2010
@@ -1,4 +1,4 @@
-/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/ArgumentsParser.java:929253-934903
+/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/ArgumentsParser.java:929253-936298
 /harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/ArgumentsParser.java:702140-925933
 /harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/ArgumentsParser.java:810871-929252
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/ArgumentsParser.java:467609-476394

Propchange: harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CRLManager.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Apr 21 21:44:58 2010
@@ -1,4 +1,4 @@
-/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CRLManager.java:929253-934903
+/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CRLManager.java:929253-936298
 /harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CRLManager.java:702140-925933
 /harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CRLManager.java:810871-929252
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CRLManager.java:467609-476394

Propchange: harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CSRGenerator.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Apr 21 21:44:58 2010
@@ -1,4 +1,4 @@
-/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CSRGenerator.java:929253-934903
+/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CSRGenerator.java:929253-936298
 /harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CSRGenerator.java:702140-925933
 /harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CSRGenerator.java:810871-929252
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CSRGenerator.java:467609-476394

Propchange: harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertChainVerifier.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Apr 21 21:44:58 2010
@@ -1,4 +1,4 @@
-/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertChainVerifier.java:929253-934903
+/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertChainVerifier.java:929253-936298
 /harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertChainVerifier.java:702140-925933
 /harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertChainVerifier.java:810871-929252
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertChainVerifier.java:467609-476394

Propchange: harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertExporter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Apr 21 21:44:58 2010
@@ -1,4 +1,4 @@
-/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertExporter.java:929253-934903
+/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertExporter.java:929253-936298
 /harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertExporter.java:702140-925933
 /harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertExporter.java:810871-929252
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertExporter.java:467609-476394

Propchange: harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertImporter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Apr 21 21:44:58 2010
@@ -1,4 +1,4 @@
-/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertImporter.java:929253-934903
+/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertImporter.java:929253-936298
 /harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertImporter.java:702140-925933
 /harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertImporter.java:810871-929252
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertImporter.java:467609-476394

Propchange: harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertReader.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Apr 21 21:44:58 2010
@@ -1,4 +1,4 @@
-/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertReader.java:929253-934903
+/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertReader.java:929253-936298
 /harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertReader.java:702140-925933
 /harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertReader.java:810871-929252
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertReader.java:467609-476394



Mime
View raw message