Return-Path: Delivered-To: apmail-harmony-commits-archive@www.apache.org Received: (qmail 27211 invoked from network); 31 Oct 2007 08:47:14 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 31 Oct 2007 08:47:14 -0000 Received: (qmail 90133 invoked by uid 500); 31 Oct 2007 08:47:01 -0000 Delivered-To: apmail-harmony-commits-archive@harmony.apache.org Received: (qmail 90084 invoked by uid 500); 31 Oct 2007 08:47:01 -0000 Mailing-List: contact commits-help@harmony.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@harmony.apache.org Delivered-To: mailing list commits@harmony.apache.org Received: (qmail 90014 invoked by uid 99); 31 Oct 2007 08:47:00 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 31 Oct 2007 01:47:00 -0700 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 31 Oct 2007 08:47:11 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 558CE1A9838; Wed, 31 Oct 2007 01:46:24 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r590591 [1/12] - in /harmony/enhanced/classlib/branches/java6: depends/build/platform/ depends/files/ depends/jars/icu4j_3.8/ depends/libs/freebsd.x86/ depends/manifests/icu4j_3.4.4/ depends/manifests/icu4j_3.8/ depends/manifests/icu4j_3.8/... Date: Wed, 31 Oct 2007 08:42:35 -0000 To: commits@harmony.apache.org From: pyang@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20071031084626.558CE1A9838@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: pyang Date: Wed Oct 31 01:42:07 2007 New Revision: 590591 URL: http://svn.apache.org/viewvc?rev=590591&view=rev Log: Merge updates from classlib trunk@589774 since r588193 Added: harmony/enhanced/classlib/branches/java6/depends/jars/icu4j_3.8/ - copied from r589774, harmony/enhanced/classlib/trunk/depends/jars/icu4j_3.8/ harmony/enhanced/classlib/branches/java6/depends/manifests/icu4j_3.8/ - copied from r589774, harmony/enhanced/classlib/trunk/depends/manifests/icu4j_3.8/ harmony/enhanced/classlib/branches/java6/depends/manifests/icu4j_3.8/META-INF/ - copied from r589774, harmony/enhanced/classlib/trunk/depends/manifests/icu4j_3.8/META-INF/ harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/unix/freebsd/ - copied from r589774, harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/unix/freebsd/ harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/unix/linux/ - copied from r589774, harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/unix/linux/ harmony/enhanced/classlib/branches/java6/modules/pack200/src/test/resources/org/apache/harmony/pack200/tests/pack200.pack.gz (with props) harmony/enhanced/classlib/branches/java6/modules/pack200/src/test/resources/org/apache/harmony/pack200/tests/sql.pack.gz (with props) Removed: harmony/enhanced/classlib/branches/java6/depends/manifests/icu4j_3.4.4/ harmony/enhanced/classlib/branches/java6/depends/manifests/icu4jni_3.4/ harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/unix/OSResourcesMonitorLinux.c harmony/enhanced/classlib/branches/java6/modules/text/src/main/java/org/apache/harmony/text/BidiWrapper.java harmony/enhanced/classlib/branches/java6/modules/text/src/main/native/ Modified: harmony/enhanced/classlib/branches/java6/depends/build/platform/freebsd.x86.mk harmony/enhanced/classlib/branches/java6/depends/files/bootclasspath.properties harmony/enhanced/classlib/branches/java6/depends/jars/icu4j_3.8/icu4j-3_8.jar (contents, props changed) harmony/enhanced/classlib/branches/java6/depends/jars/icu4j_3.8/icu4j-charsets-3_8.jar (contents, props changed) harmony/enhanced/classlib/branches/java6/depends/libs/freebsd.x86/ (props changed) harmony/enhanced/classlib/branches/java6/depends/manifests/icu4j_3.8/META-INF/MANIFEST.MF harmony/enhanced/classlib/branches/java6/make/build-java.xml harmony/enhanced/classlib/branches/java6/make/build-native.xml harmony/enhanced/classlib/branches/java6/make/depends.properties harmony/enhanced/classlib/branches/java6/make/depends.xml harmony/enhanced/classlib/branches/java6/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/jar/JarEntryTest.java harmony/enhanced/classlib/branches/java6/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/jar/JarFileTest.java harmony/enhanced/classlib/branches/java6/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/jar/JarInputStreamTest.java harmony/enhanced/classlib/branches/java6/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/jar/JarOutputStreamTest.java harmony/enhanced/classlib/branches/java6/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/InflaterTest.java harmony/enhanced/classlib/branches/java6/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/ZipFileTest.java harmony/enhanced/classlib/branches/java6/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/ZipOutputStreamTest.java harmony/enhanced/classlib/branches/java6/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/module/JndiLoginModuleTest.java harmony/enhanced/classlib/branches/java6/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/module/KeyStoreLoginModuleTest.java harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/ImageSurface.java harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/Surface.java harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/image/GifDecoder.java harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/image/JpegDecoder.java harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/image/OffscreenImage.java harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/image/PngDecoder.java harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/render/NativeImageBlitter.java harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/windows/GDIBlitter.java harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/windows/WinVolatileImage.java harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/gl/shared/SurfaceDataStructure.cpp harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/gl/shared/SurfaceDataStructure.h harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/gl/windows/GDIBlitter.cpp harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/gl/windows/GDIBlitter.h harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/gl/windows/include/org_apache_harmony_awt_gl_windows_GDIBlitter.h harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/jpegdecoder/shared/JPEGDecoder.h harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/jpegdecoder/shared/JpegDecoder.c harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/oglwrapper/shared/org_apache_harmony_awt_gl_opengl_GL.cpp (props changed) harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/win32wrapper/windows/nativelib_common.cpp (contents, props changed) harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/win32wrapper/windows/org_apache_harmony_awt_nativebridge_windows_WGL.cpp (contents, props changed) harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/win32wrapper/windows/org_apache_harmony_awt_nativebridge_windows_WGL.h harmony/enhanced/classlib/branches/java6/modules/awt/src/test/api/java/common/java/awt/BorderLayoutRTest.java harmony/enhanced/classlib/branches/java6/modules/awt/src/test/api/java/common/java/awt/CardLayoutRTest.java harmony/enhanced/classlib/branches/java6/modules/awt/src/test/api/java/common/java/awt/DisplayModeTest.java harmony/enhanced/classlib/branches/java6/modules/awt/src/test/api/java/common/java/awt/FlowLayoutRTest.java harmony/enhanced/classlib/branches/java6/modules/awt/src/test/api/java/common/java/awt/GridBagLayoutRTest.java harmony/enhanced/classlib/branches/java6/modules/awt/src/test/api/java/common/java/awt/GridLayoutRTest.java harmony/enhanced/classlib/branches/java6/modules/awt/src/test/api/java/common/java/awt/MenuBarTest.java harmony/enhanced/classlib/branches/java6/modules/awt/src/test/api/java/common/java/awt/Tools.java harmony/enhanced/classlib/branches/java6/modules/awt/src/test/api/java/common/java/awt/datatransfer/UnsupportedFlavorExceptionTest.java harmony/enhanced/classlib/branches/java6/modules/awt/src/test/api/java/common/java/awt/image/BufferedImageFilterTest.java harmony/enhanced/classlib/branches/java6/modules/awt/src/test/api/java/common/java/awt/image/BufferedImageTest.java harmony/enhanced/classlib/branches/java6/modules/awt/src/test/api/java/unix/org/apache/harmony/awt/gl/font/LineMetricsImplRTest.java harmony/enhanced/classlib/branches/java6/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/EventSetDescriptorTest.java harmony/enhanced/classlib/branches/java6/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/PersistenceDelegateTest.java harmony/enhanced/classlib/branches/java6/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/XMLEncoderTest.java harmony/enhanced/classlib/branches/java6/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/SecretKeyFactoryTest.java harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/ldap/CompareOp.java (props changed) harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/ldap/ExtendedOp.java (props changed) harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/ldap/ModifyDNOp.java (props changed) harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/ldap/ModifyOp.java (props changed) harmony/enhanced/classlib/branches/java6/modules/jndi/src/test/java/org/apache/harmony/jndi/provider/ldap/CompareOpTest.java (props changed) harmony/enhanced/classlib/branches/java6/modules/jndi/src/test/java/org/apache/harmony/jndi/provider/ldap/LdapMessageTest.java (props changed) harmony/enhanced/classlib/branches/java6/modules/jndi/src/test/java/org/apache/harmony/jndi/provider/ldap/ModifyDNOpTest.java (props changed) harmony/enhanced/classlib/branches/java6/modules/jndi/src/test/java/org/apache/harmony/jndi/provider/ldap/ModifyOpTest.java (props changed) harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/io/File.java harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/io/ObjectInputStream.java harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/io/ObjectStreamClass.java harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/internal/nls/messages.properties harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/unix/freebsd/OSResourcesMonitor.c harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/unix/linux/OSResourcesMonitor.c harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/unix/makefile harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/windows/OSResourcesMonitorWin32.c (contents, props changed) harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/lang/CharacterTest.java harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/lang/CompilerTest.java harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/lang/DoubleTest.java harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/lang/FloatTest.java harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/lang/ObjectTest.java harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/lang/RuntimeTest.java harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/lang/String2Test.java harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/lang/StringTest.java harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/lang/SystemTest.java harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/lang/ThreadLocalTest.java harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/lang/ThreadTest.java harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/Inet4AddressTest.java harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/Inet6AddressTest.java harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/InetAddressTest.java harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/ArrayListTest.java harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/tests/api/java/io/BufferedInputStreamTest.java harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/tests/api/java/io/BufferedReaderTest.java harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/tests/api/java/io/BufferedWriterTest.java harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/tests/api/java/io/ByteArrayInputStreamTest.java harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/tests/api/java/io/DataInputStreamTest.java harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/tests/api/java/io/DataOutputStreamTest.java harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/tests/api/java/io/EOFExceptionTest.java harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/tests/api/java/io/FileDescriptorTest.java harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/tests/api/java/io/FileInputStreamTest.java harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/tests/api/java/io/FileReaderTest.java harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/tests/api/java/io/FileTest.java harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/tests/api/java/io/FileWriterTest.java harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/tests/api/java/io/FilterInputStreamTest.java harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/tests/api/java/io/InputStreamReaderTest.java harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/tests/api/java/io/InterruptedIOExceptionTest.java harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/tests/api/java/io/OutputStreamWriterTest.java harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/tests/api/java/io/PipedOutputStreamTest.java harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/tests/api/java/io/PushbackInputStreamTest.java harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/tests/api/java/io/SerializationStressTest.java harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/tests/api/java/io/SerializationStressTest4.java harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/tests/api/java/io/StreamCorruptedExceptionTest.java harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/tests/api/java/io/StringReaderTest.java harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/tests/api/java/io/SyncFailedExceptionTest.java harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/tests/api/java/io/UnsupportedEncodingExceptionTest.java harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/tests/api/java/lang/Process2Test.java harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/tests/api/java/lang/ref/PhantomReferenceTest.java harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/tests/api/java/lang/ref/ReferenceQueueTest.java harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/tests/api/java/lang/ref/ReferenceTest.java harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/tests/api/java/lang/ref/SoftReferenceTest.java harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/tests/api/java/lang/ref/WeakReferenceTest.java harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/tests/api/java/lang/reflect/AccessibleObjectTest.java harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/tests/api/java/lang/reflect/ArrayTest.java harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/tests/api/java/lang/reflect/ConstructorTest.java harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/tests/api/java/lang/reflect/FieldTest.java harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/tests/api/java/lang/reflect/InvocationTargetExceptionTest.java harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/tests/api/java/lang/reflect/MethodTest.java harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/tests/api/java/lang/reflect/ProxyTest.java harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/tests/api/java/net/DatagramPacketTest.java harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/tests/api/java/net/DatagramSocketTest.java harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/tests/api/java/net/MalformedURLExceptionTest.java harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/tests/api/java/net/MulticastSocketTest.java harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/tests/api/java/net/ServerSocketTest.java harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/tests/api/java/net/SocketTest.java harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/tests/api/java/net/URITest.java harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/tests/api/java/net/URLConnectionTest.java harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/tests/api/java/net/URLEncoderTest.java harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/tests/api/java/net/URLTest.java harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/tests/api/java/net/UnknownHostExceptionTest.java harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/tests/api/java/net/UnknownServiceExceptionTest.java harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/tests/api/java/util/ArrayListTest.java harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/tests/api/java/util/LocaleTest.java harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/tests/api/java/util/ObservableTest.java harmony/enhanced/classlib/branches/java6/modules/nio/src/main/java/common/java/nio/channels/spi/AbstractSelectableChannel.java harmony/enhanced/classlib/branches/java6/modules/nio/src/main/native/nio/unix/makefile harmony/enhanced/classlib/branches/java6/modules/nio/src/test/java/common/org/apache/harmony/nio/tests/java/nio/channels/FileChannelWin32OnlyTest.java harmony/enhanced/classlib/branches/java6/modules/nio_char/META-INF/MANIFEST.MF harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/java/org/apache/harmony/niochar/java.nio.charset.spi.CharsetProvider harmony/enhanced/classlib/branches/java6/modules/nio_char/src/test/java/tests/api/java/nio/charset/AbstractCharsetTestCase.java harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/BandSet.java harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/ClassBands.java harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/CodecEncoding.java harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/CpBands.java harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/PopulationCodec.java harmony/enhanced/classlib/branches/java6/modules/pack200/src/test/java/org/apache/harmony/pack200/tests/ClassBandsTest.java harmony/enhanced/classlib/branches/java6/modules/pack200/src/test/java/org/apache/harmony/pack200/tests/SegmentTest.java harmony/enhanced/classlib/branches/java6/modules/pack200/src/test/java/org/apache/harmony/pack200/tests/SegmentUtilsTest.java harmony/enhanced/classlib/branches/java6/modules/portlib/make/hyproperties.xml (props changed) harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/port/unix/freebsd/hyvmem.c harmony/enhanced/classlib/branches/java6/modules/print/src/test/api/java/common/javax/print/IsAttributeValueSupportedTest.java harmony/enhanced/classlib/branches/java6/modules/print/src/test/api/java/common/javax/print/LookupDefaultPrintServiceTest.java harmony/enhanced/classlib/branches/java6/modules/print/src/test/api/java/common/javax/print/LookupMultiDocPrintServicesTest.java harmony/enhanced/classlib/branches/java6/modules/print/src/test/api/java/common/javax/print/LookupPrintServicesTest.java harmony/enhanced/classlib/branches/java6/modules/print/src/test/api/java/common/javax/print/PrintAutosenseTest.java harmony/enhanced/classlib/branches/java6/modules/print/src/test/api/java/common/javax/print/PrintJpegTest.java harmony/enhanced/classlib/branches/java6/modules/print/src/test/api/java/common/javax/print/ValueTests.java harmony/enhanced/classlib/branches/java6/modules/print/src/test/api/java/common/javax/print/attribute/AttributeSetUtilitiesTest.java harmony/enhanced/classlib/branches/java6/modules/print/src/test/api/java/common/javax/print/attribute/EnumSyntaxTest.java harmony/enhanced/classlib/branches/java6/modules/print/src/test/api/java/common/javax/print/attribute/HashAttributeTest.java harmony/enhanced/classlib/branches/java6/modules/print/src/test/api/java/common/javax/print/attribute/SetOfIntegerSyntaxTest.java harmony/enhanced/classlib/branches/java6/modules/print/src/test/api/java/common/javax/print/attribute/URISyntaxTest.java harmony/enhanced/classlib/branches/java6/modules/print/src/test/api/java/common/javax/print/attribute/standard/MediaTest.java harmony/enhanced/classlib/branches/java6/modules/regex/src/test/java/org/apache/harmony/tests/java/util/regex/Matcher2Test.java harmony/enhanced/classlib/branches/java6/modules/regex/src/test/java/org/apache/harmony/tests/java/util/regex/PatternErrorTest.java harmony/enhanced/classlib/branches/java6/modules/regex/src/test/java/org/apache/harmony/tests/java/util/regex/SplitTest.java harmony/enhanced/classlib/branches/java6/modules/rmi/src/test/api/java/org/apache/harmony/rmi/MarshalledObjectTest.java harmony/enhanced/classlib/branches/java6/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/AlgorithmParametersTest.java harmony/enhanced/classlib/branches/java6/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/DigestOutputStreamTest.java harmony/enhanced/classlib/branches/java6/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/KeyFactory2Test.java harmony/enhanced/classlib/branches/java6/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/SecureRandom2Test.java harmony/enhanced/classlib/branches/java6/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/SecurityTest.java harmony/enhanced/classlib/branches/java6/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/cert/CertificateEncodingException2Test.java harmony/enhanced/classlib/branches/java6/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/cert/CertificateException2Test.java harmony/enhanced/classlib/branches/java6/modules/security/src/test/impl/java.injected/java/security/cert/X509CertSelectorTest.java harmony/enhanced/classlib/branches/java6/modules/security/src/test/impl/java/org/apache/harmony/security/tests/java/security/KSBuilder_ImplTest.java harmony/enhanced/classlib/branches/java6/modules/security/src/test/impl/java/org/apache/harmony/security/tests/provider/cert/X509CRLImplTest.java harmony/enhanced/classlib/branches/java6/modules/security/src/test/impl/java/org/apache/harmony/security/tests/provider/cert/X509CertFactoryPerfTest.java harmony/enhanced/classlib/branches/java6/modules/security/src/test/impl/java/org/apache/harmony/security/tests/provider/cert/X509CertImplTest.java harmony/enhanced/classlib/branches/java6/modules/security/src/test/impl/java/org/apache/harmony/security/tests/x509/CertificatePoliciesTest.java harmony/enhanced/classlib/branches/java6/modules/security/src/test/impl/java/org/apache/harmony/security/tests/x509/EDIPartyNameTest.java harmony/enhanced/classlib/branches/java6/modules/security/src/test/impl/java/org/apache/harmony/security/tests/x509/GeneralNameTest.java harmony/enhanced/classlib/branches/java6/modules/security/src/test/impl/java/org/apache/harmony/security/tests/x509/ORAddressTest.java harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/javax/sql/rowset/spi/ProviderImpl.java harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/org/apache/harmony/sql/internal/rowset/HYOptimisticProvider.java harmony/enhanced/classlib/branches/java6/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/DriverManagerTest.java harmony/enhanced/classlib/branches/java6/modules/sql/src/test/java/org/apache/harmony/sql/tests/javax/sql/rowset/RowSetMetaDataImplTest.java harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/basic/MenuKeyBindingProcessor.java harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiButtonUI.java harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiColorChooserUI.java harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiComboBoxUI.java harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiDesktopIconUI.java harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiDesktopPaneUI.java harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiFileChooserUI.java harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiInternalFrameUI.java harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiLabelUI.java harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiListUI.java harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiLookAndFeel.java harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiMenuBarUI.java harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiMenuItemUI.java harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiOptionPaneUI.java harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiPanelUI.java harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiPopupMenuUI.java harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiProgressBarUI.java harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiRootPaneUI.java harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiScrollBarUI.java harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiScrollPaneUI.java harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiSeparatorUI.java harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiSliderUI.java harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiSpinnerUI.java harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiSplitPaneUI.java harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiTabbedPaneUI.java harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiTableHeaderUI.java harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiTableUI.java harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiTextUI.java harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiToolBarUI.java harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiToolTipUI.java harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiTreeUI.java harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/multi/MultiViewportUI.java harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/org/apache/harmony/x/swing/AbstractExtendedListElement.java harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/org/apache/harmony/x/swing/ExtendedListCellRenderer.java harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/org/apache/harmony/x/swing/ExtendedListElement.java harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/org/apache/harmony/x/swing/ExtendedListFactory.java harmony/enhanced/classlib/branches/java6/modules/swing/src/test/api/java.injected/javax/swing/plaf/multi/MultiLookAndFeelTest.java harmony/enhanced/classlib/branches/java6/modules/swing/src/test/api/java.injected/javax/swing/plaf/multi/SyserrButtonUI.java harmony/enhanced/classlib/branches/java6/modules/swing/src/test/api/java.injected/javax/swing/plaf/multi/SyserrLookAndFeel.java harmony/enhanced/classlib/branches/java6/modules/text/build.xml harmony/enhanced/classlib/branches/java6/modules/text/src/main/java/java/text/Bidi.java harmony/enhanced/classlib/branches/java6/modules/text/src/test/java/org/apache/harmony/text/tests/java/text/BidiTest.java harmony/enhanced/classlib/branches/java6/modules/text/src/test/java/org/apache/harmony/text/tests/java/text/DateFormatSymbolsTest.java harmony/enhanced/classlib/branches/java6/modules/text/src/test/java/org/apache/harmony/text/tests/java/text/DecimalFormatTest.java harmony/enhanced/classlib/branches/java6/modules/text/src/test/java/org/apache/harmony/text/tests/java/text/MessageFormatTest.java harmony/enhanced/classlib/branches/java6/modules/text/src/test/java/org/apache/harmony/text/tests/java/text/ParsePositionTest.java harmony/enhanced/classlib/branches/java6/modules/text/src/test/java/org/apache/harmony/text/tests/java/text/SimpleDateFormatTest.java Modified: harmony/enhanced/classlib/branches/java6/depends/build/platform/freebsd.x86.mk URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/depends/build/platform/freebsd.x86.mk?rev=590591&r1=590590&r2=590591&view=diff ============================================================================== --- harmony/enhanced/classlib/branches/java6/depends/build/platform/freebsd.x86.mk (original) +++ harmony/enhanced/classlib/branches/java6/depends/build/platform/freebsd.x86.mk Wed Oct 31 01:42:07 2007 @@ -15,4 +15,4 @@ DEFINES += -DFREEBSD -DFREEBSD_X86 -DHYX86 -DNEEDS_SYS_TYPES OPT += -march=pentium3 -OSLIBS = -lc_r -lm +OSLIBS = -lpthread -lm Modified: harmony/enhanced/classlib/branches/java6/depends/files/bootclasspath.properties URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/depends/files/bootclasspath.properties?rev=590591&r1=590590&r2=590591&view=diff ============================================================================== --- harmony/enhanced/classlib/branches/java6/depends/files/bootclasspath.properties (original) +++ harmony/enhanced/classlib/branches/java6/depends/files/bootclasspath.properties Wed Oct 31 01:42:07 2007 @@ -163,10 +163,10 @@ bootclasspath.source.30=xml-src.jar bootclasspath.source.packageroot.30=/ -# ICU functionality for text/characters is provided by JNI wrappers -# to ICU4C and pure-Java implementation in the ICU4J JAR file. -bootclasspath.32=icu4jni_3.4/icu4jni-3.4.jar -bootclasspath.33=icu4j_3.4.4/icu4j_3_4_4.jar +# ICU functionality for text/characters are provided by the ICU4J +# and ICU4J-charsets JAR files. +bootclasspath.31=icu4j_3.8/icu4j-3_8.jar +bootclasspath.32=icu4j_3.8/icu4j-charsets-3_8.jar # The following JARs are from Xerces/Xalan bootclasspath.34=xalan-j_2.7.0/xalan.jar Modified: harmony/enhanced/classlib/branches/java6/depends/jars/icu4j_3.8/icu4j-3_8.jar URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/depends/jars/icu4j_3.8/icu4j-3_8.jar?rev=590591&r1=589774&r2=590591&view=diff ============================================================================== Binary files - no diff available. Modified: harmony/enhanced/classlib/branches/java6/depends/jars/icu4j_3.8/icu4j-charsets-3_8.jar URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/depends/jars/icu4j_3.8/icu4j-charsets-3_8.jar?rev=590591&r1=589774&r2=590591&view=diff ============================================================================== Binary files - no diff available. Propchange: harmony/enhanced/classlib/branches/java6/depends/libs/freebsd.x86/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Wed Oct 31 01:42:07 2007 @@ -0,0 +1,2 @@ +libicudata.so +libicuuc.so Modified: harmony/enhanced/classlib/branches/java6/depends/manifests/icu4j_3.8/META-INF/MANIFEST.MF URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/depends/manifests/icu4j_3.8/META-INF/MANIFEST.MF?rev=590591&r1=589774&r2=590591&view=diff ============================================================================== (empty) Modified: harmony/enhanced/classlib/branches/java6/make/build-java.xml URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/make/build-java.xml?rev=590591&r1=590590&r2=590591&view=diff ============================================================================== --- harmony/enhanced/classlib/branches/java6/make/build-java.xml (original) +++ harmony/enhanced/classlib/branches/java6/make/build-java.xml Wed Oct 31 01:42:07 2007 @@ -202,8 +202,7 @@ - - + Modified: harmony/enhanced/classlib/branches/java6/make/build-native.xml URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/make/build-native.xml?rev=590591&r1=590590&r2=590591&view=diff ============================================================================== --- harmony/enhanced/classlib/branches/java6/make/build-native.xml (original) +++ harmony/enhanced/classlib/branches/java6/make/build-native.xml Wed Oct 31 01:42:07 2007 @@ -68,8 +68,7 @@ - - + @@ -92,8 +91,7 @@ - - + Modified: harmony/enhanced/classlib/branches/java6/make/depends.properties URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/make/depends.properties?rev=590591&r1=590590&r2=590591&view=diff ============================================================================== --- harmony/enhanced/classlib/branches/java6/make/depends.properties (original) +++ harmony/enhanced/classlib/branches/java6/make/depends.properties Wed Oct 31 01:42:07 2007 @@ -60,11 +60,6 @@ msvcr.url.x86_64=file:///C:/Program%20Files%20(x86)/Microsoft%20Visual%20Studio%208/VC/redist/amd64/Microsoft.VC80.CRT/msvcr80.dll msvcr.md5.x86_64=465cebd7da2ceaba5e552fc9118a1415 -icu4j.dir=${depends.jars}/icu4j_3.4.4 -icu4j.jar=${icu4j.dir}/icu4j_3_4_4.jar -icu4j.url=${maven2.base}/com/ibm/icu/icu4j/3.4.4/icu4j-3.4.4.jar -icu4j.md5=92422a9465ccc608bc7a8ae9cf594509 - mx4j.dir=${depends.jars}/mx4j_3.0.2 mx4j.zip=${mx4j.dir}/mx4j.zip mx4j.url=${sf.base}/mx4j/mx4j-3.0.2.zip @@ -137,4 +132,5 @@ derby.jar=${derby.dir}/derby.jar derby.url=http://www.ibiblio.org/maven/org.apache.derby/jars/derby-10.3.1.4.jar derby.md5=f28d6047ab26445de53c4c96126494df + Modified: harmony/enhanced/classlib/branches/java6/make/depends.xml URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/make/depends.xml?rev=590591&r1=590590&r2=590591&view=diff ============================================================================== --- harmony/enhanced/classlib/branches/java6/make/depends.xml (original) +++ harmony/enhanced/classlib/branches/java6/make/depends.xml Wed Oct 31 01:42:07 2007 @@ -42,7 +42,6 @@ - @@ -371,10 +370,6 @@ - - - e = jarFile.entries(); while (e.hasMoreElements()) { @@ -214,72 +210,58 @@ /** * @tests java.util.jar.JarFile#getManifest() */ - public void test_getManifest() { + public void test_getManifest() throws Exception { // Test for method java.util.jar.Manifest // java.util.jar.JarFile.getManifest() - try { - Support_Resources.copyFile(resources, null, jarName); - JarFile jarFile = new JarFile(new File(resources, jarName)); - assertNotNull("Error--Manifest not returned", - jarFile.getManifest()); - jarFile.close(); - } catch (Exception e) { - fail("Exception during 1st test: " + e.toString()); - } - try { - Support_Resources.copyFile(resources, null, jarName2); - JarFile jarFile = new JarFile(new File(resources, jarName2)); - assertNull("Error--should have returned null", jarFile - .getManifest()); - jarFile.close(); - } catch (Exception e) { - fail("Exception during 2nd test: " + e.toString()); - } + Support_Resources.copyFile(resources, null, jarName); + JarFile jarFile = new JarFile(new File(resources, jarName)); + assertNotNull("Error--Manifest not returned", + jarFile.getManifest()); + jarFile.close(); + + Support_Resources.copyFile(resources, null, jarName2); + jarFile = new JarFile(new File(resources, jarName2)); + assertNull("Error--should have returned null", jarFile + .getManifest()); + jarFile.close(); + + // jarName3 was created using the following test + Support_Resources.copyFile(resources, null, jarName3); + jarFile = new JarFile(new File(resources, jarName3)); + assertNotNull("Should find manifest without verifying", jarFile + .getManifest()); + jarFile.close(); + + // this is used to create jarName3 used in the previous test + Manifest manifest = new Manifest(); + Attributes attributes = manifest.getMainAttributes(); + attributes.put(new Attributes.Name("Manifest-Version"), "1.0"); + ByteArrayOutputStream manOut = new ByteArrayOutputStream(); + manifest.write(manOut); + byte[] manBytes = manOut.toByteArray(); + File file = new File(Support_PlatformFile.getNewPlatformFile( + "hyts_manifest1", ".jar")); + JarOutputStream jarOut = new JarOutputStream(new FileOutputStream( + file.getAbsolutePath())); + ZipEntry entry = new ZipEntry("META-INF/"); + entry.setSize(0); + jarOut.putNextEntry(entry); + entry = new ZipEntry(JarFile.MANIFEST_NAME); + entry.setSize(manBytes.length); + jarOut.putNextEntry(entry); + jarOut.write(manBytes); + entry = new ZipEntry("myfile"); + entry.setSize(1); + jarOut.putNextEntry(entry); + jarOut.write(65); + jarOut.close(); + JarFile jar = new JarFile(file.getAbsolutePath(), false); + assertNotNull("Should find manifest without verifying", jar + .getManifest()); + jar.close(); + file.delete(); - try { - // jarName3 was created using the following test - Support_Resources.copyFile(resources, null, jarName3); - JarFile jarFile = new JarFile(new File(resources, jarName3)); - assertNotNull("Should find manifest without verifying", jarFile - .getManifest()); - jarFile.close(); - } catch (Exception e) { - fail("Exception during 3rd test: " + e.toString()); - } - - try { - // this is used to create jarName3 used in the previous test - Manifest manifest = new Manifest(); - Attributes attributes = manifest.getMainAttributes(); - attributes.put(new Attributes.Name("Manifest-Version"), "1.0"); - ByteArrayOutputStream manOut = new ByteArrayOutputStream(); - manifest.write(manOut); - byte[] manBytes = manOut.toByteArray(); - File file = new File(Support_PlatformFile.getNewPlatformFile( - "hyts_manifest1", ".jar")); - JarOutputStream jarOut = new JarOutputStream(new FileOutputStream( - file.getAbsolutePath())); - ZipEntry entry = new ZipEntry("META-INF/"); - entry.setSize(0); - jarOut.putNextEntry(entry); - entry = new ZipEntry(JarFile.MANIFEST_NAME); - entry.setSize(manBytes.length); - jarOut.putNextEntry(entry); - jarOut.write(manBytes); - entry = new ZipEntry("myfile"); - entry.setSize(1); - jarOut.putNextEntry(entry); - jarOut.write(65); - jarOut.close(); - JarFile jar = new JarFile(file.getAbsolutePath(), false); - assertNotNull("Should find manifest without verifying", jar - .getManifest()); - jar.close(); - file.delete(); - } catch (IOException e) { - fail("IOException 3"); - } - try { + try { Support_Resources.copyFile(resources, null, jarName2); JarFile jF = new JarFile(new File(resources, jarName2)); jF.close(); @@ -287,8 +269,6 @@ fail("FAILED: expected IllegalStateException" ); } catch (IllegalStateException ise) { //expected; - } catch (Exception e) { - fail("Exception during 4th test: " + e.toString()); } } @@ -325,46 +305,33 @@ /** * @tests java.util.jar.JarFile#getInputStream(java.util.zip.ZipEntry) */ - public void test_getInputStreamLjava_util_jar_JarEntry_subtest0() { + public void test_getInputStreamLjava_util_jar_JarEntry_subtest0() throws Exception { File signedFile = null; - try { - Support_Resources.copyFile(resources, null, jarName4); - signedFile = new File(resources, jarName4); - } catch (Exception e) { - fail("Failed to create local file 2: " + e); - } + Support_Resources.copyFile(resources, null, jarName4); + signedFile = new File(resources, jarName4); - try { - JarFile jar = new JarFile(signedFile); - JarEntry entry = new JarEntry(entryName3); - InputStream in = jar.getInputStream(entry); - in.read(); - } catch (Exception e) { - fail("Exception during test 3: " + e); - } - - try { - JarFile jar = new JarFile(signedFile); - JarEntry entry = new JarEntry(entryName3); - InputStream in = jar.getInputStream(entry); - in.read(new byte[1077]); - assertNull("found certificates", entry.getCertificates()); - } catch (Exception e) { - fail("Exception during test 4: " + e); - } + JarFile jar = new JarFile(signedFile); + JarEntry entry = new JarEntry(entryName3); + InputStream in = jar.getInputStream(entry); + in.read(); + + jar = new JarFile(signedFile); + entry = new JarEntry(entryName3); + in = jar.getInputStream(entry); + in.read(new byte[1077]); + assertNull("found certificates", entry.getCertificates()); boolean exception = false; try { - JarFile jar = new JarFile(signedFile); - JarEntry entry = new JarEntry(entryName3); + jar = new JarFile(signedFile); + entry = new JarEntry(entryName3); entry.setSize(1076); - InputStream in = jar.getInputStream(entry); + in = jar.getInputStream(entry); in.read(new byte[2048]); } catch (SecurityException e) { exception = true; - } catch (Exception e) { - fail("Exception during test 5: " + e); } + assertTrue("Failed to throw SecurityException", exception); } Modified: harmony/enhanced/classlib/branches/java6/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/jar/JarInputStreamTest.java URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/jar/JarInputStreamTest.java?rev=590591&r1=590590&r2=590591&view=diff ============================================================================== --- harmony/enhanced/classlib/branches/java6/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/jar/JarInputStreamTest.java (original) +++ harmony/enhanced/classlib/branches/java6/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/jar/JarInputStreamTest.java Wed Oct 31 01:42:07 2007 @@ -53,55 +53,38 @@ /** * @tests java.util.jar.JarInputStream#JarInputStream(java.io.InputStream) */ - public void test_ConstructorLjava_io_InputStream() { + public void test_ConstructorLjava_io_InputStream() throws Exception { // Test for method java.util.jar.JarInputStream(java.io.InputStream) - try { - InputStream is = new URL(jarName).openConnection() - .getInputStream(); - boolean hasCorrectEntry = false; - JarInputStream jis = new JarInputStream(is); - assertNotNull("The jar input stream should have a manifest", jis - .getManifest()); - JarEntry je = jis.getNextJarEntry(); - while (je != null) { - if (je.getName().equals(entryName)) { - hasCorrectEntry = true; + InputStream is = new URL(jarName).openConnection().getInputStream(); + boolean hasCorrectEntry = false; + JarInputStream jis = new JarInputStream(is); + assertNotNull("The jar input stream should have a manifest", jis.getManifest()); + JarEntry je = jis.getNextJarEntry(); + while (je != null) { + if (je.getName().equals(entryName)) { + hasCorrectEntry = true; + } + je = jis.getNextJarEntry(); } - je = jis.getNextJarEntry(); - } - assertTrue( - "The jar input stream does not contain the correct entries", - hasCorrectEntry); - } catch (Exception e) { - fail("Exception during test: " + e.toString()); - } - + assertTrue("The jar input stream does not contain the correct entries", hasCorrectEntry); } /** * @tests java.util.jar.JarInputStream#getManifest() */ - public void test_getManifest() { + public void test_getManifest() throws Exception { // Test for method java.util.jar.Manifest // java.util.jar.JarInputStream.getManifest() - try { - Manifest m; - - InputStream is = new URL(jarName2).openConnection() - .getInputStream(); - JarInputStream jis = new JarInputStream(is); - m = jis.getManifest(); - assertNull("The jar input stream should not have a manifest", - m); - - is = new URL(jarName).openConnection().getInputStream(); - jis = new JarInputStream(is); - m = jis.getManifest(); - assertNotNull("The jar input stream should have a manifest", m); - } catch (Exception e) { - fail("Exception during test: " + e.toString()); - } + Manifest m; + InputStream is = new URL(jarName2).openConnection().getInputStream(); + JarInputStream jis = new JarInputStream(is); + m = jis.getManifest(); + assertNull("The jar input stream should not have a manifest", m); + is = new URL(jarName).openConnection().getInputStream(); + jis = new JarInputStream(is); + m = jis.getManifest(); + assertNotNull("The jar input stream should have a manifest", m); } /** Modified: harmony/enhanced/classlib/branches/java6/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/jar/JarOutputStreamTest.java URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/jar/JarOutputStreamTest.java?rev=590591&r1=590590&r2=590591&view=diff ============================================================================== --- harmony/enhanced/classlib/branches/java6/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/jar/JarOutputStreamTest.java (original) +++ harmony/enhanced/classlib/branches/java6/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/jar/JarOutputStreamTest.java Wed Oct 31 01:42:07 2007 @@ -33,7 +33,7 @@ /** * @tests java.util.jar.JarOutputStream#putNextEntry(java.util.zip.ZipEntry) */ - public void test_putNextEntryLjava_util_zip_ZipEntry() { + public void test_putNextEntryLjava_util_zip_ZipEntry() throws Exception { // testClass file`s actual extension is .class, since having .class // extension files in source dir causes // problems on eclipse, the extension is changed into .ser or it can be @@ -60,47 +60,36 @@ File outputJar = null; JarOutputStream jout = null; - try { - // open the output jarfile - outputJar = File.createTempFile("hyts_", ".jar"); - jout = new JarOutputStream(new FileOutputStream(outputJar), - newman); - jout.putNextEntry(new JarEntry(entryName)); - } catch (Exception e) { - fail("Error creating JarOutputStream: " + e); - } + // open the output jarfile + outputJar = File.createTempFile("hyts_", ".jar"); + jout = new JarOutputStream(new FileOutputStream(outputJar), + newman); + jout.putNextEntry(new JarEntry(entryName)); + File resources = Support_Resources.createTempFolder(); - try { - // read in the class file, and output it to the jar - Support_Resources.copyFile(resources, null, testClass); - URL jarURL = new URL((new File(resources, testClass)).toURL() - .toString()); - InputStream jis = jarURL.openStream(); - - byte[] bytes = new byte[1024]; - int len; - while ((len = jis.read(bytes)) != -1) { - jout.write(bytes, 0, len); - } - - jout.flush(); - jout.close(); - jis.close(); - } catch (Exception e) { - fail("Error writing JAR file for testing: " + e); - } + + // read in the class file, and output it to the jar + Support_Resources.copyFile(resources, null, testClass); + URL jarURL = new URL((new File(resources, testClass)).toURL() + .toString()); + InputStream jis = jarURL.openStream(); + byte[] bytes = new byte[1024]; + int len; + while ((len = jis.read(bytes)) != -1) { + jout.write(bytes, 0, len); + } + jout.flush(); + jout.close(); + jis.close(); + String res = null; // set up the VM parameters String[] args = new String[2]; args[0] = "-jar"; args[1] = outputJar.getAbsolutePath(); - try { - // execute the JAR and read the result - res = Support_Exec.execJava(args, null, true); - } catch (Exception e) { - fail("Exception executing test JAR: " + e); - } + // execute the JAR and read the result + res = Support_Exec.execJava(args, null, true); assertTrue("Error executing JAR test on: " + element + ". Result returned was incorrect.", res Modified: harmony/enhanced/classlib/branches/java6/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/InflaterTest.java URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/InflaterTest.java?rev=590591&r1=590590&r2=590591&view=diff ============================================================================== --- harmony/enhanced/classlib/branches/java6/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/InflaterTest.java (original) +++ harmony/enhanced/classlib/branches/java6/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/InflaterTest.java Wed Oct 31 01:42:07 2007 @@ -366,15 +366,9 @@ */ public void test_Constructor() { // test method of java.util.zip.inflater.Inflater() - try { - Inflater inflate = new Inflater(); - assertNotNull("failed to create the instance of inflater", - inflate); - - } catch (Exception e) { - - assertTrue("Inflate () constructor threw an exception", true); - } + Inflater inflate = new Inflater(); + assertNotNull("failed to create the instance of inflater", + inflate); } /** Modified: harmony/enhanced/classlib/branches/java6/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/ZipFileTest.java URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/ZipFileTest.java?rev=590591&r1=590590&r2=590591&view=diff ============================================================================== --- harmony/enhanced/classlib/branches/java6/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/ZipFileTest.java (original) +++ harmony/enhanced/classlib/branches/java6/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/ZipFileTest.java Wed Oct 31 01:42:07 2007 @@ -121,7 +121,7 @@ /** * @tests java.util.zip.ZipFile#entries() */ - public void test_entries() { + public void test_entries() throws Exception { // Test for method java.util.Enumeration java.util.zip.ZipFile.entries() Enumeration enumer = zfile.entries(); int c = 0; @@ -131,20 +131,16 @@ } assertTrue("Incorrect number of entries returned: " + c, c == 6); + Enumeration enumeration = zfile.entries(); + zfile.close(); + zfile = null; + boolean pass = false; try { - Enumeration enumeration = zfile.entries(); - zfile.close(); - zfile = null; - boolean pass = false; - try { - enumeration.hasMoreElements(); - } catch (IllegalStateException e) { - pass = true; - } - assertTrue("did not detect closed jar file", pass); - } catch (Exception e) { - fail("Exception during entries test: " + e.toString()); + enumeration.hasMoreElements(); + } catch (IllegalStateException e) { + pass = true; } + assertTrue("did not detect closed jar file", pass); } /** Modified: harmony/enhanced/classlib/branches/java6/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/ZipOutputStreamTest.java URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/ZipOutputStreamTest.java?rev=590591&r1=590590&r2=590591&view=diff ============================================================================== --- harmony/enhanced/classlib/branches/java6/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/ZipOutputStreamTest.java (original) +++ harmony/enhanced/classlib/branches/java6/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/ZipOutputStreamTest.java Wed Oct 31 01:42:07 2007 @@ -126,11 +126,8 @@ public void test_setCommentLjava_lang_String() { // There is no way to get the comment back, so no way to determine if // the comment is set correct - try { - zos.setComment("test setComment"); - } catch (Exception e) { - fail("Trying to set comment failed"); - } + zos.setComment("test setComment"); + try { zos.setComment(new String(new byte[0xFFFF + 1])); fail("Comment over 0xFFFF in length should throw exception"); Modified: harmony/enhanced/classlib/branches/java6/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/module/JndiLoginModuleTest.java URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/module/JndiLoginModuleTest.java?rev=590591&r1=590590&r2=590591&view=diff ============================================================================== --- harmony/enhanced/classlib/branches/java6/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/module/JndiLoginModuleTest.java (original) +++ harmony/enhanced/classlib/branches/java6/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/module/JndiLoginModuleTest.java Wed Oct 31 01:42:07 2007 @@ -72,12 +72,9 @@ Subject subject = new Subject(); subject.setReadOnly(); jlm.initialize(subject, null, null, options); - try { - assertFalse("Should return false if login failed or no login", jlm - .abort()); - } catch (Exception e) { - fail("Not any exception here"); - } + + assertFalse("Should return false if login failed or no login", jlm.abort()); + subject = new Subject(); jlm.initialize(subject, new FaultCallbackHandler(), null, options); try { Modified: harmony/enhanced/classlib/branches/java6/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/module/KeyStoreLoginModuleTest.java URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/module/KeyStoreLoginModuleTest.java?rev=590591&r1=590590&r2=590591&view=diff ============================================================================== --- harmony/enhanced/classlib/branches/java6/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/module/KeyStoreLoginModuleTest.java (original) +++ harmony/enhanced/classlib/branches/java6/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/module/KeyStoreLoginModuleTest.java Wed Oct 31 01:42:07 2007 @@ -57,12 +57,9 @@ Subject subject = new Subject(); subject.setReadOnly(); ksm.initialize(subject, null, null, options); - try { - assertFalse("Should return false if login failed or no login", ksm - .abort()); - } catch (Exception e) { - fail("Not any exception here"); - } + + assertFalse("Should return false if login failed or no login", ksm.abort()); + options.remove("keyStorePasswordURL"); options.put("keyStorePasswordURL", KEYSTORE_FAULTPASSWORD_URL); subject = new Subject(); Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/ImageSurface.java URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/ImageSurface.java?rev=590591&r1=590590&r2=590591&view=diff ============================================================================== --- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/ImageSurface.java (original) +++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/ImageSurface.java Wed Oct 31 01:42:07 2007 @@ -22,12 +22,14 @@ */ package org.apache.harmony.awt.gl; +import java.awt.Rectangle; import java.awt.color.ColorSpace; import java.awt.image.BandedSampleModel; import java.awt.image.BufferedImage; import java.awt.image.ColorModel; import java.awt.image.ComponentColorModel; import java.awt.image.ComponentSampleModel; +import java.awt.image.DataBuffer; import java.awt.image.DirectColorModel; import java.awt.image.IndexColorModel; import java.awt.image.MultiPixelPackedSampleModel; @@ -59,6 +61,8 @@ private long cachedDataPtr; // Pointer for cached Image Data private boolean alphaPre; // Cached Image Data alpha premultiplied + + AwtImageBackdoorAccessor ba = AwtImageBackdoorAccessor.getInstance(); public ImageSurface(ColorModel cm, WritableRaster raster){ this(cm, raster, Surface.getType(cm, raster)); @@ -73,12 +77,14 @@ this.raster = raster; surfaceType = type; - data = AwtImageBackdoorAccessor.getInstance(). - getData(raster.getDataBuffer()); + DataBuffer db = raster.getDataBuffer(); + data = ba.getData(db); + ba.addDataBufferListener(db, this); ColorSpace cs = cm.getColorSpace(); transparency = cm.getTransparency(); width = raster.getWidth(); height = raster.getHeight(); + addDirtyRegion(new Rectangle(0, 0, width, height)); // For the moment we can build natively only images which have // sRGB, Linear_RGB, Linear_Gray Color Space and type different @@ -97,6 +103,7 @@ if(type == BufferedImage.TYPE_CUSTOM){ nativeDrawable = false; } + } @Override @@ -219,6 +226,7 @@ @Override public synchronized void dispose() { + ba.removeDataBufferListener(raster.getDataBuffer()); if(surfaceDataPtr != 0L){ dispose(surfaceDataPtr); surfaceDataPtr = 0L; @@ -256,7 +264,9 @@ */ public void setRaster(WritableRaster r) { raster = r; - data = AwtImageBackdoorAccessor.getInstance().getData(r.getDataBuffer()); + DataBuffer db = r.getDataBuffer(); + data = ba.getData(db); + ba.addDataBufferListener(db, this); if (surfaceDataPtr != 0) { setImageSize(surfaceDataPtr, r.getWidth(), r.getHeight()); } @@ -313,11 +323,12 @@ AwtImageBackdoorAccessor ba = AwtImageBackdoorAccessor.getInstance(); ba.validate(raster.getDataBuffer()); } + releaseDurtyRegions(); } @Override public boolean invalidated(){ - return needToRefresh; + return needToRefresh | dataTaken; } } Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/Surface.java URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/Surface.java?rev=590591&r1=590590&r2=590591&view=diff ============================================================================== --- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/Surface.java (original) +++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/Surface.java Wed Oct 31 01:42:07 2007 @@ -23,6 +23,7 @@ package org.apache.harmony.awt.gl; import java.awt.Image; +import java.awt.Rectangle; import java.awt.Transparency; import java.awt.color.ColorSpace; import java.awt.image.BufferedImage; @@ -90,6 +91,8 @@ protected int transparency = OPAQUE; protected int width; protected int height; + + protected MultiRectArea dirtyRegions; /** * This list contains caches with the data of this surface that are valid at the moment. @@ -171,6 +174,28 @@ public void validate(){} public void invalidate(){} + + public void addDirtyRegion(Rectangle r){ + if (dirtyRegions == null) { + dirtyRegions = new MultiRectArea(r); + } else { + Rectangle rects[] = dirtyRegions.getRectangles(); + if (rects.length == 1){ + if (rects[0].contains(r)) return; + } + dirtyRegions.add(r); + } + invalidate(); + } + + public void releaseDurtyRegions(){ + dirtyRegions = null; + } + + public int[] getDirtyRegions(){ + if(dirtyRegions != null) return dirtyRegions.rect; + else return null; + } /** * Computation type of BufferedImage or Surface Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/image/GifDecoder.java URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/image/GifDecoder.java?rev=590591&r1=590590&r2=590591&view=diff ============================================================================== --- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/image/GifDecoder.java (original) +++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/image/GifDecoder.java Wed Oct 31 01:42:07 2007 @@ -54,8 +54,10 @@ static final int IMPOSSIBLE_VALUE = 0x0FFFFFFF; // I/O buffer - private static final int BUFFER_SIZE = 1024; - private byte buffer[] = new byte[BUFFER_SIZE]; + private static final int MIN_BUFFER_SIZE = 1024; + private static final int MAX_BUFFER_SIZE = 2097152; + private int buffer_size; + private byte buffer[]; GifDataStream gifDataStream = new GifDataStream(); GifGraphicBlock currBlock; @@ -79,6 +81,19 @@ public GifDecoder(DecodingImageSource src, InputStream is) { super(src, is); + try { + int available_bytes = is.available(); + if (available_bytes < MIN_BUFFER_SIZE) { + buffer_size = MIN_BUFFER_SIZE; + } else if (available_bytes > MAX_BUFFER_SIZE) { + buffer_size = MAX_BUFFER_SIZE; + } else { + buffer_size = available_bytes; + } + } catch (IOException e) { + buffer_size = MIN_BUFFER_SIZE; + } + buffer = new byte[buffer_size]; } private static native int[] toRGB(byte imageData[], byte colormap[], int transparentColor); @@ -168,7 +183,7 @@ // Read from the input stream for (;;) { - needBytes = BUFFER_SIZE - bytesInBuffer; + needBytes = buffer_size - bytesInBuffer; offset = bytesInBuffer; bytesRead = inputStream.read(buffer, offset, needBytes); Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/image/JpegDecoder.java URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/image/JpegDecoder.java?rev=590591&r1=590590&r2=590591&view=diff ============================================================================== --- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/image/JpegDecoder.java (original) +++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/image/JpegDecoder.java Wed Oct 31 01:42:07 2007 @@ -48,8 +48,10 @@ hintflagsProgressive; // Buffer for the stream - private static final int BUFFER_SIZE = 1024; - private byte buffer[] = new byte[BUFFER_SIZE]; + private static final int MIN_BUFFER_SIZE = 1024; + private static final int MAX_BUFFER_SIZE = 2097152; + private int buffer_size; + private byte buffer[]; // 3 possible color models only private static ColorModel cmRGB; @@ -96,6 +98,19 @@ public JpegDecoder(DecodingImageSource src, InputStream is) { super(src, is); + try { + int available_bytes = is.available(); + if (available_bytes < MIN_BUFFER_SIZE) { + buffer_size = MIN_BUFFER_SIZE; + } else if (available_bytes > MAX_BUFFER_SIZE) { + buffer_size = MAX_BUFFER_SIZE; + } else { + buffer_size = available_bytes; + } + } catch (IOException e) { + buffer_size = MIN_BUFFER_SIZE; + } + buffer = new byte[buffer_size]; } /* @@ -125,7 +140,7 @@ int intOut[] = null; // Read from the input stream for (;;) { - needBytes = BUFFER_SIZE - bytesInBuffer; + needBytes = buffer_size - bytesInBuffer; offset = bytesInBuffer; bytesRead = inputStream.read(buffer, offset, needBytes); Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/image/OffscreenImage.java URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/image/OffscreenImage.java?rev=590591&r1=590590&r2=590591&view=diff ============================================================================== --- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/image/OffscreenImage.java (original) +++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/image/OffscreenImage.java Wed Oct 31 01:42:07 2007 @@ -26,6 +26,7 @@ import java.awt.Graphics; import java.awt.Image; +import java.awt.Rectangle; import java.awt.image.BufferedImage; import java.awt.image.ColorModel; import java.awt.image.ComponentColorModel; @@ -68,7 +69,6 @@ private boolean producing; private boolean done; private ImageSurface imageSurf; - Object surfData; AwtImageBackdoorAccessor ba = AwtImageBackdoorAccessor.getInstance(); @@ -134,6 +134,7 @@ synchronized (this) { imageState = 0; image = null; + imageSurf = null; cm = null; raster = null; hints = 0; @@ -184,13 +185,16 @@ forceToIntARGB(); } + DataBuffer db = raster.getDataBuffer(); + Object surfData = ba.getData(db); + synchronized(surfData){ if(cm == model && model.getTransferType() == DataBuffer.TYPE_INT && raster.getNumDataElements() == 1){ int data[] = (int[])surfData; int scanline = raster.getWidth(); - DataBufferInt dbi = (DataBufferInt) raster.getDataBuffer(); + DataBufferInt dbi = (DataBufferInt) db; int rof = dbi.getOffset() + y * scanline + x; for(int lineOff = off, line = y; line < y + h; line++, lineOff += scansize, rof += scanline){ @@ -202,7 +206,7 @@ int buff[] = new int[w]; int data[] = (int[])surfData; int scanline = raster.getWidth(); - DataBufferInt dbi = (DataBufferInt) raster.getDataBuffer(); + DataBufferInt dbi = (DataBufferInt) db; int rof = dbi.getOffset() + y * scanline + x; for (int sy = y, sOff = off; sy < y + h; sy++, sOff += scansize, rof += scanline) { @@ -223,9 +227,10 @@ } } } - + + ba.releaseData(db); if (imageSurf != null) { - imageSurf.invalidate(); + imageSurf.addDirtyRegion(new Rectangle(x, y, w, h)); } imageUpdate(ImageObserver.SOMEBITS); @@ -251,6 +256,9 @@ forceToIntARGB(); } + DataBuffer db = raster.getDataBuffer(); + Object surfData = ba.getData(db); + synchronized(surfData){ if(isIntRGB){ int buff[] = new int[w]; @@ -259,7 +267,7 @@ icm.getRGBs(colorMap); int data[] = (int[])surfData; int scanline = raster.getWidth(); - DataBufferInt dbi = (DataBufferInt) raster.getDataBuffer(); + DataBufferInt dbi = (DataBufferInt) db; int rof = dbi.getOffset() + y * scanline + x; if(model instanceof IndexColorModel){ @@ -285,7 +293,7 @@ byte data[] = (byte[])surfData; int scanline = raster.getWidth(); - DataBufferByte dbb = (DataBufferByte)raster.getDataBuffer(); + DataBufferByte dbb = (DataBufferByte) db; int rof = dbb.getOffset() + y * scanline + x; for(int lineOff = off, line = y; line < y + h; line++, lineOff += scansize, rof += scanline){ @@ -310,8 +318,9 @@ } } + ba.releaseData(db); if (imageSurf != null) { - imageSurf.invalidate(); + imageSurf.addDirtyRegion(new Rectangle(x, y, w, h)); } imageUpdate(ImageObserver.SOMEBITS); @@ -475,7 +484,6 @@ raster = cm.createCompatibleWritableRaster(width, height); isIntRGB = true; } - surfData = ba.getData(raster.getDataBuffer()); } private void imageUpdate(int state){ @@ -548,7 +556,6 @@ } cm = rgbCM; raster = destRaster; - surfData = ba.getData(raster.getDataBuffer()); isIntRGB = true; } } Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/image/PngDecoder.java URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/image/PngDecoder.java?rev=590591&r1=590590&r2=590591&view=diff ============================================================================== --- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/image/PngDecoder.java (original) +++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/image/PngDecoder.java Wed Oct 31 01:42:07 2007 @@ -57,8 +57,10 @@ // Each pixel is an R,G,B triple, followed by an alpha sample. private static final int PNG_COLOR_TYPE_RGBA = 6; - private static final int INPUT_BUFFER_SIZE = 4096; - private byte buffer[] = new byte[INPUT_BUFFER_SIZE]; + private static final int MIN_BUFFER_SIZE = 4096; + private static final int MAX_BUFFER_SIZE = 2097152; + private int buffer_size; + private byte buffer[]; // Buffers for decoded image data byte byteOut[]; @@ -86,6 +88,19 @@ public PngDecoder(DecodingImageSource src, InputStream is) { super(src, is); + try { + int available_bytes = is.available(); + if (available_bytes < MIN_BUFFER_SIZE) { + buffer_size = MIN_BUFFER_SIZE; + } else if (available_bytes > MAX_BUFFER_SIZE) { + buffer_size = MAX_BUFFER_SIZE; + } else { + buffer_size = available_bytes; + } + } catch (IOException e) { + buffer_size = MIN_BUFFER_SIZE; + } + buffer = new byte[buffer_size]; } @Override @@ -95,7 +110,7 @@ int needBytes, offset, bytesInBuffer = 0; // Read from the input stream for (;;) { - needBytes = INPUT_BUFFER_SIZE - bytesInBuffer; + needBytes = buffer_size - bytesInBuffer; offset = bytesInBuffer; bytesRead = inputStream.read(buffer, offset, needBytes); Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/render/NativeImageBlitter.java URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/render/NativeImageBlitter.java?rev=590591&r1=590590&r2=590591&view=diff ============================================================================== --- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/render/NativeImageBlitter.java (original) +++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/render/NativeImageBlitter.java Wed Oct 31 01:42:07 2007 @@ -25,6 +25,7 @@ import java.awt.AlphaComposite; import java.awt.Color; import java.awt.Composite; +import java.awt.Rectangle; import java.awt.geom.AffineTransform; import java.awt.image.BufferedImage; @@ -151,15 +152,13 @@ dstX, dstY, dstSurfStruct, dstData, width, height, bgcolor.getRGB(), compType, alpha, clipRects, srcSurf.invalidated()); - dstSurf.invalidate(); - srcSurf.validate(); + dstSurf.addDirtyRegion(new Rectangle(dstX, dstY, width, height)); }else{ blt(srcX, srcY, srcSurfStruct, srcData, dstX, dstY, dstSurfStruct, dstData, width, height, compType, alpha, clipRects, srcSurf.invalidated()); - dstSurf.invalidate(); - srcSurf.validate(); + dstSurf.addDirtyRegion(new Rectangle(dstX, dstY, width, height)); } }else if(comp instanceof XORComposite){ XORComposite xcomp = (XORComposite) comp; @@ -167,8 +166,7 @@ dstX, dstY, dstSurfStruct, dstData, width, height, xcomp.getXORColor().getRGB(), clipRects, srcSurf.invalidated()); - dstSurf.invalidate(); - srcSurf.validate(); + dstSurf.addDirtyRegion(new Rectangle(dstX, dstY, width, height)); }else{ if(srcSurf instanceof ImageSurface){ JavaBlitter.inst.blit(srcX, srcY, srcSurf, dstX, dstY, @@ -189,7 +187,6 @@ tmpSurfStruct, tmpData, w, h, AlphaComposite.SRC_OVER, 1.0f, tmpClip, srcSurf.invalidated()); - srcSurf.validate(); JavaBlitter.inst.blit(srcX, srcY, tmpSurf, dstX, dstY, dstSurf, width, height, comp, bgcolor, clip); Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/windows/GDIBlitter.java URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/windows/GDIBlitter.java?rev=590591&r1=590590&r2=590591&view=diff ============================================================================== --- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/windows/GDIBlitter.java (original) +++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/windows/GDIBlitter.java Wed Oct 31 01:42:07 2007 @@ -102,19 +102,24 @@ float alpha = ac.getAlpha(); if(srcSurf instanceof ImageSurface){ Object data = srcSurf.getData(); + + int dirtyRegions[] = ((ImageSurface) srcSurf).getDirtyRegions(); + int regCount = 0; + if(dirtyRegions != null) regCount = dirtyRegions[0] - 1; + synchronized(data){ if(bgcolor == null || srcSurf.getTransparency() == Transparency.OPAQUE){ bltImage(srcX, srcY, srcSurfStruct, srcSurf.getData(), dstX, dstY, dstSurfStruct, width, height, compType, alpha, matrix, clipRects, numVertex, - srcSurf.invalidated()); + srcSurf.invalidated(), dirtyRegions, regCount); }else{ bltBGImage(srcX, srcY, srcSurfStruct, srcSurf.getData(), dstX, dstY, dstSurfStruct, width, height, bgcolor.getRGB(), compType, alpha, matrix, clipRects, - numVertex, srcSurf.invalidated()); + numVertex, srcSurf.invalidated(), dirtyRegions, regCount); } } srcSurf.validate(); @@ -128,11 +133,17 @@ XORComposite xcomp = (XORComposite) comp; if(srcSurf instanceof ImageSurface){ Object data = srcSurf.getData(); + + int dirtyRegions[] = ((ImageSurface) srcSurf).getDirtyRegions(); + int regCount = 0; + if(dirtyRegions != null) regCount = dirtyRegions[0] - 1; + synchronized(data){ xorImage(srcX, srcY, srcSurfStruct, data, dstX, dstY, dstSurfStruct, width, height, xcomp.getXORColor().getRGB(), - matrix, clipRects, numVertex, srcSurf.invalidated()); + matrix, clipRects, numVertex, + srcSurf.invalidated(), dirtyRegions, regCount); } srcSurf.validate(); }else{ @@ -175,13 +186,13 @@ Object srcData, int dstX, int dstY, long dstSurfDataPtr, int width, int height, int bgcolor, int compType, float alpha, double matrix[], - int clip[], int numVertex, boolean invalidated); + int clip[], int numVertex, boolean invalidated, int[] dirtyRegions, int regCount); private native void bltImage(int srcX, int srcY, long srsSurfDataPtr, Object srcData, int dstX, int dstY, long dstSurfDataPtr, int width, int height, int compType, float alpha, double matrix[], - int clip[], int numVertex, boolean invalidated); + int clip[], int numVertex, boolean invalidated, int[] dirtyRegions, int regCount); private native void bltBitmap(int srcX, int srcY, long srsSurfDataPtr, int dstX, int dstY, long dstSurfDataPtr, @@ -192,7 +203,7 @@ private native void xorImage(int srcX, int srcY, long srsSurfDataPtr, Object srcData, int dstX, int dstY, long dstSurfDataPtr, int width, int height, int xorcolor, double matrix[], - int clip[], int numVertex, boolean invalidated); + int clip[], int numVertex, boolean invalidated, int[] dirtyRegions, int regCount); private native void xorBitmap(int srcX, int srcY, long srsSurfDataPtr, int dstX, int dstY, long dstSurfDataPtr,