harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ton...@apache.org
Subject svn commit: r617085 [1/14] - in /harmony/enhanced/classlib/branches/java6: depends/build/ depends/build/platform/ depends/libs/ depends/oss/ make/ make/linux.x86_64.libstdc++6/ make/windows.x86/ make/windows.x86_64/ modules/archive/META-INF/ modules/ar...
Date Thu, 31 Jan 2008 10:04:22 GMT
Author: tonywu
Date: Thu Jan 31 02:04:05 2008
New Revision: 617085

URL: http://svn.apache.org/viewvc?rev=617085&view=rev
Log:
Merge updates from classlib trunk@617064 since r613200

Added:
    harmony/enhanced/classlib/branches/java6/depends/oss/icu4c-3.4-harmony-includes.zip
      - copied unchanged from r617064, harmony/enhanced/classlib/trunk/depends/oss/icu4c-3.4-harmony-includes.zip
    harmony/enhanced/classlib/branches/java6/make/linux.x86_64.libstdc++6/
      - copied from r617064, harmony/enhanced/classlib/trunk/make/linux.x86_64.libstdc++6/
    harmony/enhanced/classlib/branches/java6/make/linux.x86_64.libstdc++6/depends.properties
      - copied unchanged from r617064, harmony/enhanced/classlib/trunk/make/linux.x86_64.libstdc++6/depends.properties
    harmony/enhanced/classlib/branches/java6/modules/archive/make/exclude.linux.x86_64.ibm
      - copied unchanged from r617064, harmony/enhanced/classlib/trunk/modules/archive/make/exclude.linux.x86_64.ibm
    harmony/enhanced/classlib/branches/java6/modules/auth/make/exclude.linux.x86_64.ibm
      - copied unchanged from r617064, harmony/enhanced/classlib/trunk/modules/auth/make/exclude.linux.x86_64.ibm
    harmony/enhanced/classlib/branches/java6/modules/awt/make/exclude.linux.x86_64.ibm
      - copied unchanged from r617064, harmony/enhanced/classlib/trunk/modules/awt/make/exclude.linux.x86_64.ibm
    harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/gl/unix/LockingKeys.cpp
      - copied unchanged from r617064, harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/unix/LockingKeys.cpp
    harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/gl/unix/include/org_apache_harmony_awt_wtk_linux_LinuxWTK.h
      - copied unchanged from r617064, harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/unix/include/org_apache_harmony_awt_wtk_linux_LinuxWTK.h
    harmony/enhanced/classlib/branches/java6/modules/beans/make/exclude.linux.x86_64.ibm
      - copied unchanged from r617064, harmony/enhanced/classlib/trunk/modules/beans/make/exclude.linux.x86_64.ibm
    harmony/enhanced/classlib/branches/java6/modules/instrument/make/exclude.linux.x86_64.ibm
      - copied unchanged from r617064, harmony/enhanced/classlib/trunk/modules/instrument/make/exclude.linux.x86_64.ibm
    harmony/enhanced/classlib/branches/java6/modules/lang-management/make/exclude.linux.x86_64.ibm
      - copied unchanged from r617064, harmony/enhanced/classlib/trunk/modules/lang-management/make/exclude.linux.x86_64.ibm
    harmony/enhanced/classlib/branches/java6/modules/logging/make/exclude.linux.x86_64.ibm
      - copied unchanged from r617064, harmony/enhanced/classlib/trunk/modules/logging/make/exclude.linux.x86_64.ibm
    harmony/enhanced/classlib/branches/java6/modules/luni/make/exclude.linux.x86_64.ibm
      - copied unchanged from r617064, harmony/enhanced/classlib/trunk/modules/luni/make/exclude.linux.x86_64.ibm
    harmony/enhanced/classlib/branches/java6/modules/nio/make/exclude.linux.x86_64.ibm
      - copied unchanged from r617064, harmony/enhanced/classlib/trunk/modules/nio/make/exclude.linux.x86_64.ibm
    harmony/enhanced/classlib/branches/java6/modules/nio_char/make/exclude.linux.x86_64.ibm
      - copied unchanged from r617064, harmony/enhanced/classlib/trunk/modules/nio_char/make/exclude.linux.x86_64.ibm
    harmony/enhanced/classlib/branches/java6/modules/pack200/make/exclude.linux.x86_64.ibm
      - copied unchanged from r617064, harmony/enhanced/classlib/trunk/modules/pack200/make/exclude.linux.x86_64.ibm
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/Archive.java
      - copied unchanged from r617064, harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/Archive.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/IcTuple.java
      - copied unchanged from r617064, harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/IcTuple.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/InnerClassesAttribute.java
      - copied unchanged from r617064, harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/InnerClassesAttribute.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/test/java/org/apache/harmony/pack200/tests/ArchiveTest.java
      - copied unchanged from r617064, harmony/enhanced/classlib/trunk/modules/pack200/src/test/java/org/apache/harmony/pack200/tests/ArchiveTest.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/test/java/org/apache/harmony/pack200/tests/ICTupleTest.java
      - copied unchanged from r617064, harmony/enhanced/classlib/trunk/modules/pack200/src/test/java/org/apache/harmony/pack200/tests/ICTupleTest.java
    harmony/enhanced/classlib/branches/java6/modules/prefs/make/exclude.linux.x86_64.ibm
      - copied unchanged from r617064, harmony/enhanced/classlib/trunk/modules/prefs/make/exclude.linux.x86_64.ibm
    harmony/enhanced/classlib/branches/java6/modules/print/make/exclude.linux.x86_64.ibm
      - copied unchanged from r617064, harmony/enhanced/classlib/trunk/modules/print/make/exclude.linux.x86_64.ibm
    harmony/enhanced/classlib/branches/java6/modules/rmi/make/exclude.linux.x86_64.ibm
      - copied unchanged from r617064, harmony/enhanced/classlib/trunk/modules/rmi/make/exclude.linux.x86_64.ibm
    harmony/enhanced/classlib/branches/java6/modules/sound/make/exclude.linux.x86_64.ibm
      - copied unchanged from r617064, harmony/enhanced/classlib/trunk/modules/sound/make/exclude.linux.x86_64.ibm
    harmony/enhanced/classlib/branches/java6/modules/suncompat/src/main/java/sun/rmi/
      - copied from r617064, harmony/enhanced/classlib/trunk/modules/suncompat/src/main/java/sun/rmi/
    harmony/enhanced/classlib/branches/java6/modules/suncompat/src/main/java/sun/rmi/server/
      - copied from r617064, harmony/enhanced/classlib/trunk/modules/suncompat/src/main/java/sun/rmi/server/
    harmony/enhanced/classlib/branches/java6/modules/suncompat/src/main/java/sun/rmi/server/MarshalInputStream.java
      - copied unchanged from r617064, harmony/enhanced/classlib/trunk/modules/suncompat/src/main/java/sun/rmi/server/MarshalInputStream.java
    harmony/enhanced/classlib/branches/java6/modules/suncompat/src/main/java/sun/rmi/server/MarshalOutputStream.java
      - copied unchanged from r617064, harmony/enhanced/classlib/trunk/modules/suncompat/src/main/java/sun/rmi/server/MarshalOutputStream.java
    harmony/enhanced/classlib/branches/java6/modules/swing/make/exclude.linux.x86_64.ibm
      - copied unchanged from r617064, harmony/enhanced/classlib/trunk/modules/swing/make/exclude.linux.x86_64.ibm
    harmony/enhanced/classlib/branches/java6/modules/text/make/exclude.linux.x86_64.ibm
      - copied unchanged from r617064, harmony/enhanced/classlib/trunk/modules/text/make/exclude.linux.x86_64.ibm
Modified:
    harmony/enhanced/classlib/branches/java6/depends/build/defines.mk
    harmony/enhanced/classlib/branches/java6/depends/build/platform/aix.ppc32.mk
    harmony/enhanced/classlib/branches/java6/depends/build/platform/aix.ppc64.mk
    harmony/enhanced/classlib/branches/java6/depends/build/platform/freebsd.x86.mk
    harmony/enhanced/classlib/branches/java6/depends/build/platform/linux.ppc64.mk
    harmony/enhanced/classlib/branches/java6/depends/build/platform/linux.x86_64.mk
    harmony/enhanced/classlib/branches/java6/depends/build/platform/macosx.ppc32.mk
    harmony/enhanced/classlib/branches/java6/depends/libs/   (props changed)
    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/make/windows.x86/depends.properties
    harmony/enhanced/classlib/branches/java6/make/windows.x86_64/depends.properties
    harmony/enhanced/classlib/branches/java6/modules/archive/META-INF/MANIFEST.MF
    harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/java/util/jar/InitManifest.java
    harmony/enhanced/classlib/branches/java6/modules/archive/src/main/native/zip/shared/zipsup.c
    harmony/enhanced/classlib/branches/java6/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/jar/ManifestTest.java
    harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/Component.java
    harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/theme/DefaultCheckbox.java
    harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/unix/org/apache/harmony/awt/wtk/linux/LinuxWTK.java
    harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/gl/unix/exports.txt
    harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/gl/unix/makefile
    harmony/enhanced/classlib/branches/java6/modules/beans/src/main/java/java/beans/Beans.java
    harmony/enhanced/classlib/branches/java6/modules/imageio/src/main/java/org/apache/harmony/x/imageio/plugins/jpeg/JPEGImageReader.java
    harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/ldap/parser/FilterParser.java
    harmony/enhanced/classlib/branches/java6/modules/luni/make/exclude.common
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/io/CharArrayWriter.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/io/DataInputStream.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/io/PrintStream.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/io/PrintWriter.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/io/PushbackInputStream.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/lang/AbstractMethodError.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/lang/AbstractStringBuilder.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/lang/Appendable.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/lang/ArithmeticException.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/lang/ArrayStoreException.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/lang/AssertionError.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/lang/Boolean.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/lang/Byte.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/lang/NumberFormatException.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/lang/OutOfMemoryError.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/lang/Override.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/lang/Process.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/lang/StringBuffer.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/lang/StringBuilder.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/net/Authenticator.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/net/DatagramSocketImpl.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/Arrays.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/Collections.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/Currency.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/Scanner.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/Stack.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/file/Handler.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/http/Header.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/jar/Handler.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/internal/reflect/ProxyClassFile.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/internal/reflect/ProxyConstantPool.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/internal/reflect/ProxyMethod.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/util/TwoKeyHashMap.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/shared/luniglob.c
    harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/FileDescriptorTest.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/FileInputStreamTest.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/FileNotFoundExceptionTest.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/FileOutputStreamTest.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/FilePermissionTest.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/FileReaderTest.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/FileTest.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/FileWriterTest.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/FilterInputStreamTest.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/FilterOutputStreamTest.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/IOExceptionTest.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/InputStreamReaderTest.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/InterruptedIOExceptionTest.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/InvalidClassExceptionTest.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/LineNumberInputStreamTest.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/LineNumberReaderTest.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/NotActiveExceptionTest.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/NotSerializableExceptionTest.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/ObjectInputStream2Test.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/ObjectInputStreamTest.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/ObjectOutputStreamTest.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/ObjectStreamClassTest.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/ObjectStreamConstantsTest.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/ObjectStreamFieldTest.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/OpenRandomFileTest.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/OutputStreamWriterTest.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/PipedInputStreamTest.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/PipedOutputStreamTest.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/PipedReaderTest.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/DatagramPacketTest.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/SocketTest.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/ArraysTest.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/CurrencyTest.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/GregorianCalendarTest.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/LocaleTest.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/ScannerTest.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/StackTest.java
    harmony/enhanced/classlib/branches/java6/modules/nio/src/main/java/common/java/nio/ByteBuffer.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/AttrDefinitionBands.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/AttributeLayout.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/AttributeLayoutMap.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/BHSDCodec.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/BcBands.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/Codec.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/FileBands.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/IcBands.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/MetadataBandGroup.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/NewAttributeBands.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/Pack200Exception.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/main/java/org/apache/harmony/pack200/RunCodec.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/Segment.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/SegmentConstantPool.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/SegmentHeader.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/SegmentOptions.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/SegmentUtils.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/AnnotationDefaultAttribute.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/AnnotationsAttribute.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/Attribute.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/BCIRenumberedAttribute.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/ByteCode.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/CPClass.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/CPConstant.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/CPDouble.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/CPFieldRef.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/CPFloat.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/CPInteger.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/CPInterfaceMethodRef.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/CPLong.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/CPMember.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/CPNameAndType.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/CPRef.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/CPString.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/CPUTF8.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/ClassConstantPool.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/ClassFileEntry.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/ClassPoolSet.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/CodeAttribute.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/ConstantPoolEntry.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/ConstantValueAttribute.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/EnclosingMethodAttribute.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/ExceptionTableEntry.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/ExceptionsAttribute.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/LineNumberTableAttribute.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/LocalVariableTableAttribute.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/LocalVariableTypeTableAttribute.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/NewAttribute.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/OperandManager.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/RuntimeVisibleorInvisibleParameterAnnotationsAttribute.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/SignatureAttribute.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/ByteCodeForm.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/ClassRefForm.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/ClassSpecificReferenceForm.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/DoubleForm.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/FieldRefForm.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/IMethodRefForm.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/IincForm.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/InitMethodReferenceForm.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/IntRefForm.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/LabelForm.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/LocalForm.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/LongForm.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/LookupSwitchForm.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/MultiANewArrayForm.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/NewInitMethodRefForm.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/NoArgumentForm.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/ReferenceForm.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/ShortForm.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/SingleByteReferenceForm.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/StringRefForm.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/SuperFieldRefForm.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/SuperInitMethodRefForm.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/SuperMethodRefForm.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/SwitchForm.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/TableSwitchForm.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/ThisFieldRefForm.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/ThisMethodRefForm.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/VariableInstructionForm.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/WideForm.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java5/org/apache/harmony/pack200/Pack200Adapter.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java5/org/apache/harmony/pack200/Pack200UnpackerAdapter.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/test/java/org/apache/harmony/pack200/tests/AbstractBandsTestCase.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/test/java/org/apache/harmony/pack200/tests/AttributeLayoutMapTest.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/test/java/org/apache/harmony/pack200/tests/AttributeLayoutTest.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/test/java/org/apache/harmony/pack200/tests/BHSDCodecTest.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/test/java/org/apache/harmony/pack200/tests/BandSetTest.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/test/java/org/apache/harmony/pack200/tests/BcBandsTest.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/CodeAttributeTest.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/test/java/org/apache/harmony/pack200/tests/CodecEncodingTest.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/test/java/org/apache/harmony/pack200/tests/CodecTest.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/test/java/org/apache/harmony/pack200/tests/PopulationCodecTest.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/test/java/org/apache/harmony/pack200/tests/SegmentConstantPoolTest.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/test/java/org/apache/harmony/pack200/tests/SegmentOptionsTest.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/bytecode/ClassFileEntryTest.java
    harmony/enhanced/classlib/branches/java6/modules/rmi/META-INF/MANIFEST.MF
    harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/java/sql/Connection.java
    harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/javax/sql/rowset/serial/SQLOutputImpl.java
    harmony/enhanced/classlib/branches/java6/modules/suncompat/META-INF/MANIFEST.MF
    harmony/enhanced/classlib/branches/java6/modules/text/src/main/java/java/text/MessageFormat.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/SimpleDateFormatTest.java

Modified: harmony/enhanced/classlib/branches/java6/depends/build/defines.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/depends/build/defines.mk?rev=617085&r1=617084&r2=617085&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/depends/build/defines.mk (original)
+++ harmony/enhanced/classlib/branches/java6/depends/build/defines.mk Thu Jan 31 02:04:05 2008
@@ -27,7 +27,7 @@
 CXX_DLL_LD = $(CXX)
 STDCLIBS = -lstdc++
 OSLIBS = -lc -lm
-XLIBS = -L/usr/X11R6/lib -lX11 -lXft -lXext
+XLIBS = -L/usr/X11R6/lib -lX11 -lXft -lXext -lXtst
 MDLLIBPREFIX = -Xlinker --start-group
 MDLLIBSUFFIX = -Xlinker --end-group
 EXELDFLAGS = $(LDFLAGS)
@@ -63,7 +63,12 @@
 INCLUDES += -I$(HY_HDK)/include -I$(HY_HDK)/jdk/include -I. -I$(SHAREDSUB)
 
 ifndef HYDEBUGCFLAGS
+ifneq ($(HY_OS),zos)
 HYDEBUGCFLAGS = -ggdb -O0
+else
+# z/OS has different debug flags
+HYDEBUGCFLAGS = -g -O0
+endif
 endif
 
 ifndef HYRELEASECFLAGS  

Modified: harmony/enhanced/classlib/branches/java6/depends/build/platform/aix.ppc32.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/depends/build/platform/aix.ppc32.mk?rev=617085&r1=617084&r2=617085&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/depends/build/platform/aix.ppc32.mk (original)
+++ harmony/enhanced/classlib/branches/java6/depends/build/platform/aix.ppc32.mk Thu Jan 31 02:04:05 2008
@@ -16,7 +16,7 @@
 DEFINES += -DAIX -DAIX_PPC32 -DHYPPC32 -D_Xconst="" -DIPv6_FUNCTION_SUPPORT
 OPT += -fpic -qcpluscmt -O3 -s -q mbcs -qlanglvl=extended -qarch=ppc -qinfo=pro -qalias=noansi -D_XOPEN_SOURCE_EXTENDED=1 -D_ALL_SOURCE -D_LARGE_FILES -qsuppress=1500-010
 OSLIBS = -lc_r -lC_r -lm -lpthread -liconv
-XLIBS = -L/opt/freeware/lib -lX11 -lXft -lfreetype -lfontconfig
+XLIBS = -L/opt/freeware/lib -lX11 -lXft -lfreetype -lfontconfig -lXext -lXtst
 STDCLIBS = 
 
 ARFLAGS = -X32 rcv

Modified: harmony/enhanced/classlib/branches/java6/depends/build/platform/aix.ppc64.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/depends/build/platform/aix.ppc64.mk?rev=617085&r1=617084&r2=617085&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/depends/build/platform/aix.ppc64.mk (original)
+++ harmony/enhanced/classlib/branches/java6/depends/build/platform/aix.ppc64.mk Thu Jan 31 02:04:05 2008
@@ -16,7 +16,7 @@
 DEFINES += -DAIX -DAIX_PPC64 -DHYPPC64 -D_Xconst="" -DIPv6_FUNCTION_SUPPORT
 OPT += -fpic -q64 -qcpluscmt -O3 -s -q64 -DPPC64 -q mbcs -qlanglvl=extended -qarch=ppc -qinfo=pro -qalias=noansi -D_XOPEN_SOURCE_EXTENDED=1 -D_ALL_SOURCE -D_LARGE_FILES -qsuppress=1500-010
 OSLIBS = -lc_r -lC_r -lm -lpthread -liconv
-XLIBS = -L/opt/freeware/lib -lX11 -lXft -lfreetype -lfontconfig
+XLIBS = -L/opt/freeware/lib -lX11 -lXft -lfreetype -lfontconfig -lXext -lXtst
 STDCLIBS = 
 
 ARFLAGS = -X64 rcv

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=617085&r1=617084&r2=617085&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 Thu Jan 31 02:04:05 2008
@@ -16,3 +16,5 @@
 DEFINES += -DFREEBSD -DFREEBSD_X86 -DHYX86 -DNEEDS_SYS_TYPES -DIPv6_FUNCTION_SUPPORT
 OPT += -fpic -march=pentium3
 OSLIBS = -lpthread -lm
+INCLUDES += -I/usr/local/include
+XLIBS = -L/usr/local/lib -lX11 -lXft -lXext -lXtst

Modified: harmony/enhanced/classlib/branches/java6/depends/build/platform/linux.ppc64.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/depends/build/platform/linux.ppc64.mk?rev=617085&r1=617084&r2=617085&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/depends/build/platform/linux.ppc64.mk (original)
+++ harmony/enhanced/classlib/branches/java6/depends/build/platform/linux.ppc64.mk Thu Jan 31 02:04:05 2008
@@ -15,7 +15,7 @@
 
 DEFINES += -DLINUX -DLINUX_PPC64 -DHYPPC64 -DIPv6_FUNCTION_SUPPORT
 OPT += -fpic -m64
-XLIBS = -L/usr/X11R6/lib64 -lX11 -lXft
+XLIBS = -L/usr/X11R6/lib64 -lX11 -lXft -lXext -lXtst
 
 ASFLAGS += -a64
 LDFLAGS += -m64

Modified: harmony/enhanced/classlib/branches/java6/depends/build/platform/linux.x86_64.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/depends/build/platform/linux.x86_64.mk?rev=617085&r1=617084&r2=617085&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/depends/build/platform/linux.x86_64.mk (original)
+++ harmony/enhanced/classlib/branches/java6/depends/build/platform/linux.x86_64.mk Thu Jan 31 02:04:05 2008
@@ -15,4 +15,4 @@
 
 DEFINES += -DLINUX -DLINUX_X86_64 -DHYX86_64 -DIPv6_FUNCTION_SUPPORT
 OPT += -fpic
-XLIBS = -L/usr/X11R6/lib64 -lX11 -lXft
+XLIBS = -L/usr/X11R6/lib64 -lX11 -lXft -lXext -lXtst

Modified: harmony/enhanced/classlib/branches/java6/depends/build/platform/macosx.ppc32.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/depends/build/platform/macosx.ppc32.mk?rev=617085&r1=617084&r2=617085&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/depends/build/platform/macosx.ppc32.mk (original)
+++ harmony/enhanced/classlib/branches/java6/depends/build/platform/macosx.ppc32.mk Thu Jan 31 02:04:05 2008
@@ -16,7 +16,7 @@
 DEFINES += -DMACOSX -DMACOSX_PPC32 -DPPC32 -DIPv6_FUNCTION_SUPPORT
 OPT += -fpic -fno-common
 OSLIBS = -lc -lm -ldl -liconv
-XLIBS = -L/usr/X11R6/lib -lX11 -lXft -lXext -lXrender -lexpat \
+XLIBS = -L/usr/X11R6/lib -lX11 -lXft -lXext -lXtst -lXrender -lexpat \
         -L/sw/lib/freetype2/lib -lfreetype -lfontconfig
 MDLLIBPREFIX =
 MDLLIBSUFFIX =

Propchange: harmony/enhanced/classlib/branches/java6/depends/libs/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Jan 31 02:04:05 2008
@@ -0,0 +1,11 @@
+freebsd.x86
+linux.ia64
+linux.ppc32
+linux.ppc64
+linux.x86
+linux.x86_64
+linux.x86.libstdc++6
+macosx.ppc32
+windows.x86
+windows.x86_64
+linux.x86_64.libstdc++6

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=617085&r1=617084&r2=617085&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/make/build-native.xml (original)
+++ harmony/enhanced/classlib/branches/java6/make/build-native.xml Thu Jan 31 02:04:05 2008
@@ -108,7 +108,7 @@
     <!-- ================================= 
           target: layout              
          ================================= -->
-    <target name="layout" depends="layout.windows,layout.zos"
+    <target name="layout" depends="-layout.windows,-layout.linklib"
         description="Construct the correct directory structure for native binaries">
 
     	<!-- Create the target directory structure -->
@@ -130,16 +130,18 @@
 
     </target>
 
-    <target name="layout.windows" if="is.windows" depends="-select-win-deps-x86_64,-select-win-deps-x86">
+    <target name="-layout.windows" if="is.windows"
+            depends="-select-win-deps-x86_64,-select-win-deps-x86">
         <!-- workaround until msdll is moved. -->
         <copy file="${msvcr.dll}" todir="${hy.jdk}/jre/bin" overwrite="yes" />
         <copy file="${msvcp.dll}" todir="${hy.jdk}/jre/bin" overwrite="yes" />
     </target>
 
-    <target name="layout.zos" if="is.zos">
-        <!-- on z/OS copy across .x files to link against -->
+    <target name="-layout.linklib" unless="shlib.is.linklib">
+        <!-- on windows copy .lib files and on z/OS copy across .x files
+             to link against -->
         <copy todir="${hy.hdk}/lib" overwrite="yes">
-            <fileset dir="${depends.libs}${hy.libstdc++.suffix}" includes="*${linklib.suffix}*" />
+            <fileset dir="${icudll.dir}" includes="*${linklib.suffix}*" />
         </copy>
     </target>
 
@@ -161,15 +163,6 @@
     <!-- ================================= 
           target: overlay-oss              
          ================================= -->
-    <condition property="iculib.zip"
-        value="${depends.oss}/icu4c-3.4-harmony-windows.x86_64.zip"
-        else="${depends.oss}/icu4c-3.4-harmony.zip">
-        <and>
-            <isset property="is.windows"/>
-            <isset property="is.x86_64"/>
-        </and>
-    </condition>
-
     <target name="overlay-oss">
         <ant dir="modules/luni" antfile="build.xml"
              target="overlay-oss" />
@@ -178,9 +171,8 @@
 	     target="overlay-oss" />        
     	
         <mkdir dir="${hy.hdk}/include/icu4c/unicode" />
-        <unzip src="${iculib.zip}" dest="${hy.hdk}/include/icu4c/unicode" />
+        <unzip src="${icuhdr.zip}" dest="${hy.hdk}/include/icu4c/unicode" />
         <chmod dir="${hy.hdk}/include/icu4c/unicode" perm="ugo+r" />
-        <copy file="${hy.hdk}/include/icu4c/unicode/icuuc.lib" todir="${native.lib.target}" overwrite="yes"/>
     </target>
 
     <!-- ================================= 

Modified: harmony/enhanced/classlib/branches/java6/make/depends.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/make/depends.properties?rev=617085&r1=617084&r2=617085&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/make/depends.properties (original)
+++ harmony/enhanced/classlib/branches/java6/make/depends.properties Thu Jan 31 02:04:05 2008
@@ -38,12 +38,6 @@
 junit.url=${maven2.base}/junit/junit/3.8.2/junit-3.8.2.jar
 junit.md5=28e7eb9eeefe31a657c68755bfccc541
 
-bcprov.dir=${depends.jars}/bcprov-jdk15-138
-bcprov.orig.jar=${bcprov.dir}/bcprov.jar
-bcprov.jar=${bcprov.dir}/bcprov.noidea.jar
-bcprov.url=http://www.bouncycastle.org/download/bcprov-jdk15-138.jar
-bcprov.md5=9c32fec75f2de26cfc18213b20461933
-
 msvcr.dir.x86=${depends.dir}/libs/windows.x86
 msvcr.dll.x86=${msvcr.dir.x86}/msvcr71.dll
 msvcr.url.x86=file:///${hyenv.SystemRoot}/system32/msvcr71.dll
@@ -149,3 +143,10 @@
 icudll.dir=${depends.dir}/libs/${hy.platform.variant}/icu-3.4
 icudll.zip=${depends.dir}/libs/${hy.platform.variant}/icu-3.4/icu-3.4.zip
 icudll.url=${depends.url}/libs/${hy.platform.variant}/icu-3.4.zip
+icuhdr.zip=${depends.dir}/oss/icu4c-3.4-harmony-includes.zip
+
+bcprov.ver=bcprov-jdk15-138
+bcprov.dir=${depends.jars}/${bcprov.ver}
+bcprov.jar=${bcprov.dir}/bcprov.noidea.jar
+bcprov.url=${depends.url}/jars/bcprov/${bcprov.ver}/bcprov.noidea.jar
+bcprov.md5=7e2cf5f39012b303b4246e33a66bf078

Modified: harmony/enhanced/classlib/branches/java6/make/depends.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/make/depends.xml?rev=617085&r1=617084&r2=617085&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/make/depends.xml (original)
+++ harmony/enhanced/classlib/branches/java6/make/depends.xml Thu Jan 31 02:04:05 2008
@@ -42,7 +42,7 @@
         <check-one-file src="${xerces.url}" dest="${xerces.zip}" />
         <check-one-file src="${xmlsec.url}" dest="${xmlsec.zip}" />
         <check-one-file src="${junit.url}" dest="${junit.jar}" />
-        <check-one-file src="${bcprov.url}" dest="${bcprov.orig.jar}" />
+        <check-one-file src="${bcprov.url}" dest="${bcprov.jar}" />
         <check-one-file src="${mx4j.url}" dest="${mx4j.zip}" />
         <check-one-file src="${jetty.url}" dest="${jetty.jar}" />
         <check-one-file src="${jetty-util.url}" dest="${jetty-util.jar}" />
@@ -108,8 +108,29 @@
         <antcall target="-awt-tar-extract" />
     </target>
 
+    <target name="-temporary-warning" if="is.windows">
+        <!-- TODO: Remove this target in a week or two or when we
+             update to icu4c 3.8
+          -->
+        <condition property="windows.warn">
+            <not><available file="${icudll.dir}/icuuc.lib" /></not>
+        </condition>
+        <fail if="windows.warn">
+...
+
+
+Please remove the directory:
+
+  ${icudll.dir}
+
+and re-run "ant fetch-depends" to get a new version of icu-3.4.zip.  Sorry
+for the inconvinience.
+
+        </fail>
+    </target>
+
     <target name="-extract"
-         depends="-extract-props,-extract-mx4j,-extract-dejavu-fonts,-extract-xerces,-extract-idea-from-bcprov,-extract-icudlls" />
+         depends="-extract-props,-extract-mx4j,-extract-dejavu-fonts,-extract-xerces,-extract-icudlls,-temporary-warning" />
 
     <target name="-extract-props">
         <uptodate property="dejavu-fonts.uptodate"
@@ -121,18 +142,13 @@
         <uptodate property="xerces.uptodate"
                   srcfile="${xerces.zip}"
                   targetfile="${xerces.dir}/xercesImpl.jar" />
-        <uptodate property="bcprov.uptodate"
-                  targetfile="${bcprov.jar}">
-            <srcfiles file="${bcprov.orig.jar}" />
-            <srcfiles dir="depends/files/bcprov"
-                      includes="**/IDEAEngine.class" />
-        </uptodate>
         <uptodate property="icudlls.uptodate"
                   srcfile="${icudll.zip}"
                   targetfile="${icudll.dir}/uptodate" />
 
     </target>
 
+
     <target name="-extract-dejavu-fonts" unless="dejavu-fonts.uptodate">
         <unzip src="${dejavu-fonts.zip}" dest="${dejavu-fonts.dir}" />
         <touch file="${dejavu-fonts.fonts.dir}/DejaVuSerif.ttf" />
@@ -176,18 +192,6 @@
 	<touch file="${xerces.dir}/xercesImpl.jar" />
     </target>
 
-    <target name="-extract-idea-from-bcprov" unless="bcprov.uptodate">
-        <zip destfile="${bcprov.jar}">
-            <zipfileset src="${bcprov.orig.jar}">
-                <exclude name="**/BCKEY.*" />
-                <exclude name="**/IDEAEngine.class" />
-            </zipfileset>
-            <fileset dir="depends/files/bcprov">
-                <include name="**/IDEAEngine.class" />
-            </fileset>
-        </zip>
-    </target>
-
     <target name="-extract-icudlls" unless="icudlls.uptodate">
         <unzip src="${icudll.zip}" dest="${icudll.dir}" />
         <touch file="${icudll.dir}/uptodate" />
@@ -400,7 +404,7 @@
                            md5="${junit.md5}" />
 
     <mkdir dir="${bcprov.dir}" />
-    <download-one-file src="${bcprov.url}" dest="${bcprov.orig.jar}"
+    <download-one-file src="${bcprov.url}" dest="${bcprov.jar}"
                            md5="${bcprov.md5}" />
 
     <mkdir dir="${mx4j.dir}" />

Modified: harmony/enhanced/classlib/branches/java6/make/windows.x86/depends.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/make/windows.x86/depends.properties?rev=617085&r1=617084&r2=617085&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/make/windows.x86/depends.properties (original)
+++ harmony/enhanced/classlib/branches/java6/make/windows.x86/depends.properties Thu Jan 31 02:04:05 2008
@@ -1 +1 @@
-icudll.md5=f8b46d05e08ca98e42738f159ae1dd40
+icudll.md5=4ab256e309d1ceb9779b10cf32c79dab

Modified: harmony/enhanced/classlib/branches/java6/make/windows.x86_64/depends.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/make/windows.x86_64/depends.properties?rev=617085&r1=617084&r2=617085&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/make/windows.x86_64/depends.properties (original)
+++ harmony/enhanced/classlib/branches/java6/make/windows.x86_64/depends.properties Thu Jan 31 02:04:05 2008
@@ -1 +1 @@
-icudll.md5=53b383e6424103823493087e5dddff54
+icudll.md5=39b2bb43ec0ec6f31567fd020e2c5338

Modified: harmony/enhanced/classlib/branches/java6/modules/archive/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/archive/META-INF/MANIFEST.MF?rev=617085&r1=617084&r2=617085&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/archive/META-INF/MANIFEST.MF (original)
+++ harmony/enhanced/classlib/branches/java6/modules/archive/META-INF/MANIFEST.MF Thu Jan 31 02:04:05 2008
@@ -23,9 +23,10 @@
  java.security.cert,
  java.util,
  javax.security.auth.x500,
+ org.apache.harmony.kernel.vm,
+ org.apache.harmony.luni.platform,
  org.apache.harmony.luni.util,
  org.apache.harmony.security.utils,
- org.apache.harmony.kernel.vm,
  tests.support;hy_usage=test;resolution:=optional,
  tests.support.resource;hy_usage=test;resolution:=optional
 Export-Package: java.util.jar,

Modified: harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/java/util/jar/InitManifest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/java/util/jar/InitManifest.java?rev=617085&r1=617084&r2=617085&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/java/util/jar/InitManifest.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/java/util/jar/InitManifest.java Thu Jan 31 02:04:05 2008
@@ -85,7 +85,7 @@
             }
             it = list.iterator();
             String line = it.next();
-            if (line.length() < 7
+            if (line.length() < 6
                     || !Util.toASCIILowerCase(line.substring(0, 5)).equals(
                             "name:")) { //$NON-NLS-1$
                 throw new IOException(Messages.getString("archive.23")); //$NON-NLS-1$

Modified: harmony/enhanced/classlib/branches/java6/modules/archive/src/main/native/zip/shared/zipsup.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/archive/src/main/native/zip/shared/zipsup.c?rev=617085&r1=617084&r2=617085&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/archive/src/main/native/zip/shared/zipsup.c (original)
+++ harmony/enhanced/classlib/branches/java6/modules/archive/src/main/native/zip/shared/zipsup.c Thu Jan 31 02:04:05 2008
@@ -1396,7 +1396,7 @@
                   return ZIP_ERR_FILE_CORRUPT;  /* should never happen! */
                 }
               result = zip_establishCache (portLib, zipFile);
-              if (result)
+              if (!result)
                 {
                   /* (silently start operating without a cache if we couldn't make a new one) */
                 }

Modified: harmony/enhanced/classlib/branches/java6/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/jar/ManifestTest.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/ManifestTest.java?rev=617085&r1=617084&r2=617085&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/jar/ManifestTest.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/jar/ManifestTest.java Thu Jan 31 02:04:05 2008
@@ -16,6 +16,7 @@
  */
 package org.apache.harmony.archive.tests.java.util.jar;
 
+import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
@@ -85,7 +86,7 @@
 	/**
 	 * @tests java.util.jar.Manifest#Manifest(java.io.InputStream)
 	 */
-	public void test_ConstructorLjava_io_InputStream() {
+	public void test_ConstructorLjava_io_InputStream() throws IOException {
 		// Test for method java.util.jar.Manifest(java.io.InputStream)
 		/*
 		 * ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -138,6 +139,23 @@
 				);
 		assertEquals("Bundle-Version not correct", "1.2.0", main
 				.getValue("Bundle-Version"));
+
+        // Regression test for HARMONY-5424
+        String manifestContent = "Manifest-Version: 1.0\nCreated-By: Apache\nPackage: \nBuild-Jdk: 1.4.1_01\n\n"
+                + "Name: \nSpecification-Title: foo\nSpecification-Version: 1.0\nSpecification-Vendor: \n"
+                + "Implementation-Title: \nImplementation-Version: 1.0\nImplementation-Vendor: \n\n";
+        ByteArrayInputStream bis = new ByteArrayInputStream(manifestContent
+                .getBytes());
+        Manifest mf = new Manifest(bis);
+
+        assertTrue("Wrong number of main attributes", mf.getMainAttributes().size() == 4);
+
+        Map<String, Attributes> entries = mf.getEntries();
+        assertTrue("Wrong number of named entries", entries.size() == 1);
+
+        Attributes namedEntryAttributes = (Attributes) (entries.get(""));
+        assertTrue("Wrong number of named entry attributes",
+                namedEntryAttributes.size() == 6);
 	}
 
 	/**

Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/Component.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/Component.java?rev=617085&r1=617084&r2=617085&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/Component.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/Component.java Thu Jan 31 02:04:05 2008
@@ -1888,7 +1888,7 @@
                 ((Graphics2D)g).setBackground(this.getBackground());
             }
             g.setColor(foreColor);
-            g.setFont(font);
+            g.setFont(getFont());
             return g;
         } finally {
             toolkit.unlockAWT();

Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/theme/DefaultCheckbox.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/theme/DefaultCheckbox.java?rev=617085&r1=617084&r2=617085&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/theme/DefaultCheckbox.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/theme/DefaultCheckbox.java Thu Jan 31 02:04:05 2008
@@ -86,10 +86,13 @@
     }
 
     public static void drawText(Graphics g, TextState s, Rectangle r) {
+        String text = s.getText();
+        if (text == null){
+            return;
+        }
         int baseX = r.x;
         int h = getTextSize(s).height;
         int baseY = r.y + r.height - h / 5;
-        String text = s.getText();
         g.setFont(s.getFont());
         g.setColor(s.getTextColor());
         if (s.isEnabled()) {

Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/unix/org/apache/harmony/awt/wtk/linux/LinuxWTK.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/unix/org/apache/harmony/awt/wtk/linux/LinuxWTK.java?rev=617085&r1=617084&r2=617085&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/unix/org/apache/harmony/awt/wtk/linux/LinuxWTK.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/unix/org/apache/harmony/awt/wtk/linux/LinuxWTK.java Thu Jan 31 02:04:05 2008
@@ -29,6 +29,10 @@
 
 public final class LinuxWTK extends WTK {
 
+    static {
+        System.loadLibrary("gl");
+    }
+
     /**
      * @see org.apache.harmony.awt.wtk.WTK#getGraphicsFactory()
      */
@@ -89,14 +93,9 @@
         return null;
     }
 
-    public boolean getLockingState(int keyCode) {
-        // TODO implement
-        return false;
-    }
+    public native boolean getLockingState(int keyCode);
 
-    public void setLockingState(int keyCode, boolean on) {
-        // TODO implement
-    }
+    public native void setLockingState(int keyCode, boolean on);
 
     private final LinuxWindowFactory windowFactory = new LinuxWindowFactory();
     private final LinuxEventQueue eventQueue = new LinuxEventQueue(windowFactory);

Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/gl/unix/exports.txt
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/gl/unix/exports.txt?rev=617085&r1=617084&r2=617085&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/gl/unix/exports.txt (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/gl/unix/exports.txt Thu Jan 31 02:04:05 2008
@@ -41,3 +41,5 @@
 Java_org_apache_harmony_awt_gl_linux_XBlitter_xorImage
 Java_org_apache_harmony_awt_gl_linux_XBlitter_xorPixmap
 Java_org_apache_harmony_awt_wtk_linux_XServerConnection_init
+Java_org_apache_harmony_awt_wtk_linux_LinuxWTK_getLockingState
+Java_org_apache_harmony_awt_wtk_linux_LinuxWTK_setLockingState

Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/gl/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/gl/unix/makefile?rev=617085&r1=617084&r2=617085&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/gl/unix/makefile (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/gl/unix/makefile Thu Jan 31 02:04:05 2008
@@ -28,6 +28,7 @@
   gl.o \
   XBlitter.o \
   XGraphics2D.o \
+  LockingKeys.o \
   libpng.a
 
 ifneq ($(HY_ZIP_API),true)

Modified: harmony/enhanced/classlib/branches/java6/modules/beans/src/main/java/java/beans/Beans.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/beans/src/main/java/java/beans/Beans.java?rev=617085&r1=617084&r2=617085&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/beans/src/main/java/java/beans/Beans.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/beans/src/main/java/java/beans/Beans.java Thu Jan 31 02:04:05 2008
@@ -84,11 +84,11 @@
      * If the specified class loader is null, the system class loader is used.
      * </p>
      * 
-     * @param loader
+     * @param cls
      *            the specified class loader. It can be null.
-     * @param name
+     * @param beanName
      *            the name of the JavaBean
-     * @param context
+     * @param beanContext
      *            the beancontext in which the bean instance will be added.
      * @return an instance of the specified JavaBean.
      * @throws IOException
@@ -139,9 +139,9 @@
      * called.)
      * </p>
      * 
-     * @param loader
+     * @param cls
      *            the specified class loader. It can be null.
-     * @param name
+     * @param beanName
      *            the name of the JavaBean
      * @param context
      *            the beancontext in which the bean instance will be added.
@@ -219,12 +219,12 @@
      * 
      * @param bean
      *            the original bean object.
-     * @param type
+     * @param targetType
      *            the specified view type.
      * @return a type view of the given bean.
      */
-    public static Object getInstanceOf(Object bean, @SuppressWarnings("unused")
-    Class<?> targetType) {
+    @SuppressWarnings("unused")
+    public static Object getInstanceOf(Object bean, Class<?> targetType) {
         return bean;
     }
 
@@ -234,7 +234,7 @@
      * 
      * @param bean
      *            the specified bean object.
-     * @param type
+     * @param targetType
      *            the specifed view type.
      * @return true if the specified bean object can be viewed as the specified
      *         type; otherwise, return false;
@@ -250,7 +250,7 @@
     /**
      * Set whether or not a GUI is available in the bean's current environment.
      * 
-     * @param value
+     * @param isGuiAvailable
      *            should be <code>true</code> to signify that a GUI is
      *            available, <code>false</code> otherwise.
      * @throws SecurityException
@@ -267,7 +267,7 @@
      * Used to indicate whether of not it's in an application construction
      * environment.
      * 
-     * @param value
+     * @param isDesignTime
      *            true to indicate that it's in application construction
      *            environment.
      * @throws SecurityException

Modified: harmony/enhanced/classlib/branches/java6/modules/imageio/src/main/java/org/apache/harmony/x/imageio/plugins/jpeg/JPEGImageReader.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/imageio/src/main/java/org/apache/harmony/x/imageio/plugins/jpeg/JPEGImageReader.java?rev=617085&r1=617084&r2=617085&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/imageio/src/main/java/org/apache/harmony/x/imageio/plugins/jpeg/JPEGImageReader.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/imageio/src/main/java/org/apache/harmony/x/imageio/plugins/jpeg/JPEGImageReader.java Thu Jan 31 02:04:05 2008
@@ -14,114 +14,129 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-/**
- * @author Rustem V. Rafikov
- * @version $Revision: 1.4 $
- */
 package org.apache.harmony.x.imageio.plugins.jpeg;
 
+import java.awt.Image;
+import java.awt.image.BufferedImage;
+import java.awt.image.ColorModel;
+import java.awt.image.ImageObserver;
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.Iterator;
 
-import javax.imageio.ImageReader;
 import javax.imageio.ImageReadParam;
+import javax.imageio.ImageReader;
 import javax.imageio.ImageTypeSpecifier;
-import javax.imageio.plugins.jpeg.JPEGImageReadParam;
-import javax.imageio.stream.ImageInputStream;
 import javax.imageio.metadata.IIOMetadata;
+import javax.imageio.plugins.jpeg.JPEGImageReadParam;
 import javax.imageio.spi.ImageReaderSpi;
+import javax.imageio.stream.ImageInputStream;
 
 import org.apache.harmony.awt.gl.image.DecodingImageSource;
 import org.apache.harmony.awt.gl.image.OffscreenImage;
-import org.apache.harmony.luni.util.NotImplementedException;
-
-import java.io.IOException;
-import java.util.Iterator;
-import java.awt.image.BufferedImage;
+import org.apache.harmony.x.imageio.internal.nls.Messages;
 
 /**
  * This implementation uses org.apache.harmony.awt.gl.image.JpegDecoder to read
- * an image. The only implemented method is read(..);
- *
- * TODO: Implements generic decoder to be used by javad2 and imageio
- *
+ * an image. 
+ * 
+ * TODO: Implement generic decoder to be used by javad2 and imageio
+ * 
  * @see org.apache.harmony.awt.gl.image.JpegDecoder
  * @see org.apache.harmony.x.imageio.plugins.jpeg.IISDecodingImageSource
  */
 public class JPEGImageReader extends ImageReader {
 
-    ImageInputStream iis;
+    private ImageInputStream iis;
+    private OffscreenImage   image;
 
-    public JPEGImageReader(ImageReaderSpi imageReaderSpi) {
+    public JPEGImageReader(final ImageReaderSpi imageReaderSpi) {
         super(imageReaderSpi);
     }
 
     @Override
-    public int getHeight(int i) throws IOException, NotImplementedException {
-        // TODO: implement
-        throw new NotImplementedException();
+    public int getHeight(final int i) throws IOException {
+        return getImage(i).getHeight(new ImageObserver() {
+            public boolean imageUpdate(final Image img, final int infoflags,
+                            final int x, final int y, final int width,
+                            final int height) {
+                return (infoflags & HEIGHT) == 0;
+            }
+        });
     }
 
     @Override
-    public int getWidth(int i) throws IOException, NotImplementedException {
-        // TODO: implement
-        throw new NotImplementedException();
+    public int getWidth(final int i) throws IOException {
+        return getImage(i).getWidth(new ImageObserver() {
+            public boolean imageUpdate(final Image img, final int infoflags,
+                            final int x, final int y, final int width,
+                            final int height) {
+                return (infoflags & WIDTH) == 0;
+            }
+        });
     }
 
     @Override
-    public int getNumImages(boolean b) throws IOException, NotImplementedException {
-        // TODO: implement
-        throw new NotImplementedException();
+    public int getNumImages(final boolean b) throws IOException {
+        return 1;
     }
 
     @Override
-    public Iterator<ImageTypeSpecifier> getImageTypes(int i) throws IOException, NotImplementedException {
-        // TODO: implement
-        throw new NotImplementedException();
+    public Iterator<ImageTypeSpecifier> getImageTypes(final int i)
+                    throws IOException {
+        final ColorModel model = getImage(i).getColorModel();
+        final ImageTypeSpecifier[] spec = { new ImageTypeSpecifier(model,
+                        model.createCompatibleSampleModel(1, 1)) };
+        return Arrays.asList(spec).iterator();
     }
 
     @Override
-    public IIOMetadata getStreamMetadata() throws IOException, NotImplementedException {
-        // TODO: implement
-        throw new NotImplementedException();
+    public IIOMetadata getStreamMetadata() throws IOException {
+        return null;
     }
 
     @Override
-    public IIOMetadata getImageMetadata(int i) throws IOException, NotImplementedException {
-        // TODO: implement
-        throw new NotImplementedException();
-    }
-
-    @Override
-    public BufferedImage read(int i, ImageReadParam imageReadParam) throws IOException {
-        if (iis == null) {
-            throw new IllegalArgumentException("input stream == null");
-        }
-
-        DecodingImageSource source = new IISDecodingImageSource(iis);
-        OffscreenImage image = new OffscreenImage(source);
-        source.addConsumer(image);
-        source.load();
-        // The interrupted flag should be cleared because ImageDecoder interrupts
-        // current thread while decoding. The same technique is used in
-        // ImageLoader#run(). Another solution can be to create
-        // a separate decoding thread. However, decoder keeps its own pool
-        // of threads so creating a new thread will be just a waste of resources.
-        Thread.interrupted();
-        return image.getBufferedImage();
+    public IIOMetadata getImageMetadata(final int i) throws IOException {
+        return null;
     }
 
     @Override
-    public BufferedImage read(int i) throws IOException {
-        return read(i, null);
+    public BufferedImage read(final int i, final ImageReadParam imageReadParam)
+                    throws IOException {
+        return getImage(i).getBufferedImage();
     }
 
     @Override
-    public void setInput(Object input, boolean seekForwardOnly, boolean ignoreMetadata) {
+    public void setInput(final Object input, final boolean seekForwardOnly,
+                    final boolean ignoreMetadata) {
         super.setInput(input, seekForwardOnly, ignoreMetadata);
         iis = (ImageInputStream) input;
+        image = null;
     }
 
     @Override
     public ImageReadParam getDefaultReadParam() {
         return new JPEGImageReadParam();
+    }
+
+    private OffscreenImage getImage(final int index) throws IOException {
+        if (index >= getNumImages(false)) {
+            throw new IndexOutOfBoundsException("index >= getNumImages()"); //$NON-NLS-1$
+        }
+
+        if (image == null) {
+            if (iis == null) {
+                throw new IllegalArgumentException(Messages.getString(
+                    "imageio.2", //$NON-NLS-1$
+                    "input")); //$NON-NLS-1$
+            }
+
+            final DecodingImageSource source = new IISDecodingImageSource(iis);
+            image = new OffscreenImage(source);
+            source.addConsumer(image);
+            source.load();
+        }
+
+        return image;
     }
 }

Modified: harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/ldap/parser/FilterParser.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/ldap/parser/FilterParser.java?rev=617085&r1=617084&r2=617085&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/ldap/parser/FilterParser.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/ldap/parser/FilterParser.java Thu Jan 31 02:04:05 2008
@@ -35,7 +35,7 @@
  * instance of org.apache.harmony.jndi.provider.ldap.filter.Filter according
  * RFC2254. And It also support parse variables of the form {i}.
  * 
- * @see org.apache.harmony.jndi.provider.ldap.filter.Filter
+ * @see org.apache.harmony.jndi.provider.ldap.Filter
  * @see javax.naming.directory.DirContext#search(javax.naming.Name, String,
  *      Object[], javax.naming.directory.SearchControls)
  */

Modified: harmony/enhanced/classlib/branches/java6/modules/luni/make/exclude.common
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/luni/make/exclude.common?rev=617085&r1=617084&r2=617085&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni/make/exclude.common (original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni/make/exclude.common Thu Jan 31 02:04:05 2008
@@ -1,7 +1,4 @@
 org/apache/harmony/luni/tests/java/net/URLClassLoaderTest.java
 org/apache/harmony/luni/tests/java/net/ExcludedProxyTest.java
-org/apache/harmony/luni/tests/java/util/CurrencyTest.java
 org/apache/harmony/luni/tests/java/util/FormatterTest.java
-org/apache/harmony/luni/tests/java/util/GregorianCalendarTest.java
-org/apache/harmony/luni/tests/java/util/LocaleTest.java
 org/apache/harmony/luni/tests/java/util/ScannerTest.java

Modified: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/io/CharArrayWriter.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/io/CharArrayWriter.java?rev=617085&r1=617084&r2=617085&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/io/CharArrayWriter.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/io/CharArrayWriter.java Thu Jan 31 02:04:05 2008
@@ -238,10 +238,10 @@
      * CharArrayWriter.append(<code>c</code>) works the same way as
      * CharArrayWriter.write(<code>c</code>).
      * 
-     * @override Writer.append
      * @param c
      *            The character appended to the CharArrayWriter.
      * @return The CharArrayWriter.
+     * @see Writer#append(char)
      */
     @Override
     public CharArrayWriter append(char c) {
@@ -256,10 +256,10 @@
      * <code>csq</code> is null, then then "null" will be substituted for
      * <code>csq</code>.
      * 
-     * @override Writer.append
      * @param csq
      *            The CharSequence appended to the CharArrayWriter.
      * @return The CharArrayWriter
+     * @see Writer#append(CharSequence)
      */
     @Override
     public CharArrayWriter append(CharSequence csq) {
@@ -280,7 +280,6 @@
      * If <code>csq</code> is null, then "null" will be substituted for
      * <code>csq</code>.
      * 
-     * @override Writer.append
      * @param csq
      *            The CharSequence appended to the CharArrayWriter.
      * @param start
@@ -293,6 +292,7 @@
      * @throws IndexOutOfBoundsException
      *             If start is less than end, end is greater than the length of
      *             the CharSequence, or start or end is negative.
+     * @see Writer#append(CharSequence, int, int)
      */
     @Override
     public CharArrayWriter append(CharSequence csq, int start, int end) {

Modified: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/io/DataInputStream.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/io/DataInputStream.java?rev=617085&r1=617084&r2=617085&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/io/DataInputStream.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/io/DataInputStream.java Thu Jan 31 02:04:05 2008
@@ -214,7 +214,7 @@
      *            the byte array into which the data is read
      * @param offset
      *            the offset the operation start at
-     * @param count
+     * @param length
      *            the maximum number of bytes to read
      * 
      * @throws IOException

Modified: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/io/PrintStream.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/io/PrintStream.java?rev=617085&r1=617084&r2=617085&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/io/PrintStream.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/io/PrintStream.java Thu Jan 31 02:04:05 2008
@@ -184,7 +184,7 @@
      * All writes to the target can now take place through this PrintStream. Its
      * encoding character set is the default charset in the VM.
      * 
-     * @param file
+     * @param fileName
      *            the file to provide convenience methods on.
      * @throws FileNotFoundException
      *             if the file does not exist or cannot be opened to write. Or
@@ -203,7 +203,7 @@
      * All writes to the target can now take place through this PrintStream. Its
      * encoding character set name is <code>csn</code>.
      * 
-     * @param file
+     * @param fileName
      *            the file to provide convenience methods on.
      * @param csn
      *            the character set name

Modified: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/io/PrintWriter.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/io/PrintWriter.java?rev=617085&r1=617084&r2=617085&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/io/PrintWriter.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/io/PrintWriter.java Thu Jan 31 02:04:05 2008
@@ -352,7 +352,7 @@
      *            The arguments list. If there are more arguments than those
      *            specified by the format string, then the additional arguments
      *            are ignored.
-     * @return
+     * @return the PrintWriter.
      * @throws IllegalFormatException
      *             If the format string is illegal or incompatible with the
      *             arguments or the arguments are less than those required by
@@ -692,10 +692,10 @@
      * PrintWriter.append(<code>c</code>) works the same way as
      * PrintWriter.write(<code>c</code>).
      * 
-     * @override Writer.append
      * @param c
      *            The character appended to the PrintWriter.
      * @return The PrintWriter.
+     * @see Writer#append(char)
      */
     @Override
     public PrintWriter append(char c) {
@@ -709,10 +709,10 @@
      * PrintWriter.write(<code>csq</code>.toString()). If <code>csq</code>
      * is null, then "null" will be substituted for <code>csq</code>
      * 
-     * @override Writer.append
      * @param csq
      *            The CharSequence appended to the PrintWriter.
      * @return The PrintWriter
+     * @see Writer#append(CharSequence)
      */
     @Override
     public PrintWriter append(CharSequence csq) {
@@ -733,7 +733,6 @@
      * <code>csq</code> is null, then "null" will be substituted for
      * <code>csq</code>.
      * 
-     * @override Writer.append
      * @param csq
      *            The CharSequence appended to the PrintWriter.
      * @param start
@@ -746,6 +745,7 @@
      * @throws IndexOutOfBoundsException
      *             If start is less than end, end is greater than the length of
      *             the CharSequence, or start or end is negative.
+     * @see Writer#append(CharSequence, int, int)
      */
     @Override
     public PrintWriter append(CharSequence csq, int start, int end) {

Modified: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/io/PushbackInputStream.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/io/PushbackInputStream.java?rev=617085&r1=617084&r2=617085&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/io/PushbackInputStream.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/io/PushbackInputStream.java Thu Jan 31 02:04:05 2008
@@ -315,7 +315,7 @@
      * @param readlimit
      *            the maximum number of bytes that are able to be read before
      *            the mark becomes invalid
-     * @override the method mark in FilterInputStream
+     * @see FilterInputStream#mark(int)
      */
     @Override
     public void mark(int readlimit) {
@@ -326,9 +326,9 @@
      * Reset current position to the mark made previously int the stream, but
      * the reset method will throw IOException and do nothing else if called.
      * 
-     * @override the method reset in FilterInputStream
      * @throws IOException
      *             If the method is called
+     * @see FilterInputStream#reset()
      */
     @Override
     public void reset() throws IOException {

Modified: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/lang/AbstractMethodError.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/lang/AbstractMethodError.java?rev=617085&r1=617084&r2=617085&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/lang/AbstractMethodError.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/lang/AbstractMethodError.java Thu Jan 31 02:04:05 2008
@@ -17,12 +17,11 @@
 
 package java.lang;
 
-
 /**
- * This error is thrown when the VM notices that a an attempt is being made to
+ * This error is thrown when the VM notices that an attempt is being made to
  * invoke an abstract method.
- * <p>
- * Note that this can only occur when inconsistant class files are being loaded,
+ * </p>
+ * Note that this can only occur when inconsistent class files are being loaded,
  * since invoking an abstract method is a compile time error.
  */
 public class AbstractMethodError extends IncompatibleClassChangeError {
@@ -30,20 +29,20 @@
     private static final long serialVersionUID = -1654391082989018462L;
 
     /**
-	 * Constructs a new instance of this class with its walkback filled in.
-	 */
-	public AbstractMethodError() {
-		super();
-	}
+     * Constructs a new instance of this class with its walkback filled in.
+     */
+    public AbstractMethodError() {
+        super();
+    }
 
-	/**
-	 * Constructs a new instance of this class with its walkback and message
-	 * filled in.
-	 * 
-	 * @param detailMessage
-	 *            String The detail message for the exception.
-	 */
-	public AbstractMethodError(String detailMessage) {
-		super(detailMessage);
-	}
+    /**
+     * Constructs a new instance of this class with its walkback and message
+     * filled in.
+     * 
+     * @param detailMessage
+     *            String The detail message for the exception.
+     */
+    public AbstractMethodError(String detailMessage) {
+        super(detailMessage);
+    }
 }

Modified: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/lang/AbstractStringBuilder.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/lang/AbstractStringBuilder.java?rev=617085&r1=617084&r2=617085&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/lang/AbstractStringBuilder.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/lang/AbstractStringBuilder.java Thu Jan 31 02:04:05 2008
@@ -23,11 +23,9 @@
 import org.apache.harmony.luni.util.Msg;
 
 /**
- * <p>
  * A modifiable {@link CharSequence sequence of characters} for use in creating
  * and modifying Strings. This class is intended as a base class for
  * {@link java.lang.StringBuffer} and {@link java.lang.StringBuilder}.
- * </p>
  * 
  * @see java.lang.StringBuffer
  * @see java.lang.StringBuilder
@@ -200,12 +198,10 @@
     }
 
     /**
-     * <p>
      * Retrieves the character at the <code>index</code>.
-     * </p>
      * 
-     * @param The
-     *            index of character in this object to retrieve.
+     * @param index
+     *            The index of character in this object to retrieve.
      * @return The char value.
      * @throws IndexOutOfBoundsException
      *             if <code>index</code> is negative or greater than or equal
@@ -268,7 +264,6 @@
     }
 
     /**
-     * <p>
      * Ensures that this object has a minimum capacity available before
      * requiring the internal buffer to be enlarged. The general policy of this
      * method is that if the <code>minimumCapacity</code> is larger than the
@@ -276,9 +271,8 @@
      * largest value of either the <code>minimumCapacity</code> or the current
      * capacity multiplied by two plus two. Although this is the general policy,
      * there is no guarantee that the capacity will change.
-     * </p>
      * 
-     * @param minimumCapacity
+     * @param min
      *            The new minimum capacity to set.
      */
     public void ensureCapacity(int min) {
@@ -288,10 +282,8 @@
     }
 
     /**
-     * <p>
      * Copies the requested sequence of characters to be copied to the
      * <code>char[]</code> passed.
-     * </p>
      * 
      * @param start
      *            The inclusive start index of the characters to copy from this
@@ -386,9 +378,7 @@
     }
 
     /**
-     * <p>
      * The current length of this object.
-     * </p>
      * 
      * @return the number of characters in this StringBuffer
      */
@@ -483,9 +473,7 @@
     }
 
     /**
-     * <p>
      * Sets the character at the <code>index</code> in this object.
-     * </p>
      * 
      * @param index
      *            the zero-based index of the character to replace.
@@ -507,11 +495,9 @@
     }
 
     /**
-     * <p>
      * Sets the current length to a new value. If the new length is larger than
      * the current length, then the new characters at the end of this object
      * will contain the <code>char</code> value of <code>\u0000</code>.
-     * </p>
      * 
      * @param length
      *            the new length of this StringBuffer
@@ -543,10 +529,8 @@
     }
 
     /**
-     * <p>
      * Returns the String value of the subsequence of this object from the
      * <code>start</code> index to the current end.
-     * </p>
      * 
      * @param start
      *            The inclusive start index to begin the subsequence.
@@ -568,10 +552,8 @@
     }
 
     /**
-     * <p>
      * Returns the String value of the subsequence of this object from the
      * <code>start</code> index to the <code>start</code> index.
-     * </p>
      * 
      * @param start
      *            The inclusive start index to begin the subsequence.
@@ -595,9 +577,7 @@
     }
 
     /**
-     * <p>
      * Returns the current String representation of this object.
-     * </p>
      * 
      * @return a String containing the characters in this StringBuilder.
      */
@@ -615,10 +595,8 @@
     }
 
     /**
-     * <p>
      * Returns a <code>CharSequence</code> of the subsequence of this object
      * from the <code>start</code> index to the <code>start</code> index.
-     * </p>
      * 
      * @param start
      *            The inclusive start index to begin the subsequence.
@@ -640,7 +618,6 @@
      * character. The search for the character starts at the beginning and moves
      * towards the end.
      * 
-     * 
      * @param string
      *            the string to find
      * @return the index in this StringBuffer of the specified character, -1 if
@@ -782,10 +759,8 @@
     }
 
     /**
-     * <p>
      * Trims off any extra capacity beyond the current length. Note, this method
      * is NOT guaranteed to change the capacity of this object.
-     * </p>
      * 
      * @since 1.5
      */
@@ -799,9 +774,7 @@
     }
 
     /**
-     * <p>
      * Retrieves the Unicode code point value at the <code>index</code>.
-     * </p>
      * 
      * @param index
      *            The index to the <code>char</code> code unit within this
@@ -822,10 +795,8 @@
     }
 
     /**
-     * <p>
      * Retrieves the Unicode code point value that precedes the
      * <code>index</code>.
-     * </p>
      * 
      * @param index
      *            The index to the <code>char</code> code unit within this
@@ -846,10 +817,8 @@
     }
 
     /**
-     * <p>
      * Calculates the number of Unicode code points between
      * <code>beginIndex</code> and <code>endIndex</code>.
-     * </p>
      * 
      * @param beginIndex
      *            The inclusive beginning index of the subsequence.
@@ -871,10 +840,8 @@
     }
 
     /**
-     * <p>
      * Returns the index within this object that is offset from
      * <code>index</code> by <code>codePointOffset</code> code points.
-     * </p>
      * 
      * @param index
      *            The index within this object to calculate the offset from.



Mime
View raw message