harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r986497 [1/4] - in /harmony/enhanced/java/branches/mrh: ./ classlib/ classlib/depends/build/platform/ classlib/depends/manifests/xalan-j_2.7.0/ classlib/depends/manifests/xerces_2.10.0/ classlib/make/ classlib/modules/archive/src/main/nativ...
Date Tue, 17 Aug 2010 21:36:14 GMT
Author: hindessm
Date: Tue Aug 17 21:36:10 2010
New Revision: 986497

URL: http://svn.apache.org/viewvc?rev=986497&view=rev
Log:
Merge changes from trunk@986356.  Merging commits in bulk since this is
a "temporary" branch.

Added:
    harmony/enhanced/java/branches/mrh/classlib/modules/imageio/src/main/java/org/apache/harmony/x/imageio/plugins/png/PNGMetadataFormat.java
      - copied unchanged from r986356, harmony/enhanced/java/trunk/classlib/modules/imageio/src/main/java/org/apache/harmony/x/imageio/plugins/png/PNGMetadataFormat.java
    harmony/enhanced/java/branches/mrh/classlib/modules/imageio/src/main/java/org/apache/harmony/x/imageio/plugins/png/PNGSpiConsts.java
      - copied unchanged from r986356, harmony/enhanced/java/trunk/classlib/modules/imageio/src/main/java/org/apache/harmony/x/imageio/plugins/png/PNGSpiConsts.java
    harmony/enhanced/java/branches/mrh/classlib/modules/imageio/src/test/java/META-INF/
      - copied from r986356, harmony/enhanced/java/trunk/classlib/modules/imageio/src/test/java/META-INF/
    harmony/enhanced/java/branches/mrh/classlib/modules/imageio/src/test/java/META-INF/services/
      - copied from r986356, harmony/enhanced/java/trunk/classlib/modules/imageio/src/test/java/META-INF/services/
    harmony/enhanced/java/branches/mrh/classlib/modules/imageio/src/test/java/META-INF/services/javax.imageio.spi.CorrectProviderConfiguration
      - copied unchanged from r986356, harmony/enhanced/java/trunk/classlib/modules/imageio/src/test/java/META-INF/services/javax.imageio.spi.CorrectProviderConfiguration
    harmony/enhanced/java/branches/mrh/classlib/modules/imageio/src/test/java/META-INF/services/javax.imageio.spi.IncorrectProviderConfiguration
      - copied unchanged from r986356, harmony/enhanced/java/trunk/classlib/modules/imageio/src/test/java/META-INF/services/javax.imageio.spi.IncorrectProviderConfiguration
    harmony/enhanced/java/branches/mrh/classlib/modules/imageio/src/test/java/javax/imageio/plugins/
      - copied from r986356, harmony/enhanced/java/trunk/classlib/modules/imageio/src/test/java/javax/imageio/plugins/
    harmony/enhanced/java/branches/mrh/classlib/modules/imageio/src/test/java/javax/imageio/plugins/jpeg/
      - copied from r986356, harmony/enhanced/java/trunk/classlib/modules/imageio/src/test/java/javax/imageio/plugins/jpeg/
    harmony/enhanced/java/branches/mrh/classlib/modules/imageio/src/test/java/javax/imageio/plugins/jpeg/JPEGQTableTest.java
      - copied unchanged from r986356, harmony/enhanced/java/trunk/classlib/modules/imageio/src/test/java/javax/imageio/plugins/jpeg/JPEGQTableTest.java
    harmony/enhanced/java/branches/mrh/classlib/modules/imageio/src/test/java/javax/imageio/spi/CorrectProviderConfiguration.java
      - copied unchanged from r986356, harmony/enhanced/java/trunk/classlib/modules/imageio/src/test/java/javax/imageio/spi/CorrectProviderConfiguration.java
    harmony/enhanced/java/branches/mrh/classlib/modules/imageio/src/test/java/javax/imageio/spi/IncorrectProviderConfiguration.java
      - copied unchanged from r986356, harmony/enhanced/java/trunk/classlib/modules/imageio/src/test/java/javax/imageio/spi/IncorrectProviderConfiguration.java
    harmony/enhanced/java/branches/mrh/classlib/modules/lang-management/src/main/java/org/apache/harmony/lang/management/internal/
      - copied from r986356, harmony/enhanced/java/trunk/classlib/modules/lang-management/src/main/java/org/apache/harmony/lang/management/internal/
    harmony/enhanced/java/branches/mrh/classlib/modules/lang-management/src/main/java/org/apache/harmony/lang/management/internal/nls/
      - copied from r986356, harmony/enhanced/java/trunk/classlib/modules/lang-management/src/main/java/org/apache/harmony/lang/management/internal/nls/
    harmony/enhanced/java/branches/mrh/classlib/modules/lang-management/src/main/java/org/apache/harmony/lang/management/internal/nls/Messages.java
      - copied unchanged from r986356, harmony/enhanced/java/trunk/classlib/modules/lang-management/src/main/java/org/apache/harmony/lang/management/internal/nls/Messages.java
    harmony/enhanced/java/branches/mrh/classlib/modules/lang-management/src/main/java/org/apache/harmony/lang/management/internal/nls/messages.properties
      - copied unchanged from r986356, harmony/enhanced/java/trunk/classlib/modules/lang-management/src/main/java/org/apache/harmony/lang/management/internal/nls/messages.properties
    harmony/enhanced/java/branches/mrh/classlib/modules/print/src/main/java/common/org/apache/harmony/print/
      - copied from r986356, harmony/enhanced/java/trunk/classlib/modules/print/src/main/java/common/org/apache/harmony/print/
    harmony/enhanced/java/branches/mrh/classlib/modules/print/src/main/java/common/org/apache/harmony/print/internal/
      - copied from r986356, harmony/enhanced/java/trunk/classlib/modules/print/src/main/java/common/org/apache/harmony/print/internal/
    harmony/enhanced/java/branches/mrh/classlib/modules/print/src/main/java/common/org/apache/harmony/print/internal/nls/
      - copied from r986356, harmony/enhanced/java/trunk/classlib/modules/print/src/main/java/common/org/apache/harmony/print/internal/nls/
    harmony/enhanced/java/branches/mrh/classlib/modules/print/src/main/java/common/org/apache/harmony/print/internal/nls/Messages.java
      - copied unchanged from r986356, harmony/enhanced/java/trunk/classlib/modules/print/src/main/java/common/org/apache/harmony/print/internal/nls/Messages.java
    harmony/enhanced/java/branches/mrh/classlib/modules/print/src/main/java/common/org/apache/harmony/print/internal/nls/messages.properties
      - copied unchanged from r986356, harmony/enhanced/java/trunk/classlib/modules/print/src/main/java/common/org/apache/harmony/print/internal/nls/messages.properties
    harmony/enhanced/java/branches/mrh/classlib/modules/xml/
      - copied from r986356, harmony/enhanced/java/trunk/classlib/modules/xml/
    harmony/enhanced/java/branches/mrh/classlib/modules/xml/build.xml
      - copied, changed from r986356, harmony/enhanced/java/trunk/classlib/modules/xml/build.xml
    harmony/enhanced/java/branches/mrh/classlib/modules/xml/depends/
      - copied from r986356, harmony/enhanced/java/trunk/classlib/modules/xml/depends/
    harmony/enhanced/java/branches/mrh/classlib/modules/xml/depends/manifests/
      - copied from r986356, harmony/enhanced/java/trunk/classlib/modules/xml/depends/manifests/
    harmony/enhanced/java/branches/mrh/classlib/modules/xml/depends/manifests/xalan-j_2.7.0/
      - copied from r986356, harmony/enhanced/java/trunk/classlib/modules/xml/depends/manifests/xalan-j_2.7.0/
    harmony/enhanced/java/branches/mrh/classlib/modules/xml/depends/manifests/xalan-j_2.7.0/META-INF/
      - copied from r986356, harmony/enhanced/java/trunk/classlib/modules/xml/depends/manifests/xalan-j_2.7.0/META-INF/
    harmony/enhanced/java/branches/mrh/classlib/modules/xml/depends/manifests/xalan-j_2.7.0/META-INF/MANIFEST.MF
      - copied unchanged from r986356, harmony/enhanced/java/trunk/classlib/modules/xml/depends/manifests/xalan-j_2.7.0/META-INF/MANIFEST.MF
    harmony/enhanced/java/branches/mrh/classlib/modules/xml/depends/manifests/xerces_2.10.0/
      - copied from r986356, harmony/enhanced/java/trunk/classlib/modules/xml/depends/manifests/xerces_2.10.0/
    harmony/enhanced/java/branches/mrh/classlib/modules/xml/depends/manifests/xerces_2.10.0/META-INF/
      - copied from r986356, harmony/enhanced/java/trunk/classlib/modules/xml/depends/manifests/xerces_2.10.0/META-INF/
    harmony/enhanced/java/branches/mrh/classlib/modules/xml/depends/manifests/xerces_2.10.0/META-INF/MANIFEST.MF
      - copied unchanged from r986356, harmony/enhanced/java/trunk/classlib/modules/xml/depends/manifests/xerces_2.10.0/META-INF/MANIFEST.MF
    harmony/enhanced/java/branches/mrh/classlib/modules/xml/make/
      - copied from r986356, harmony/enhanced/java/trunk/classlib/modules/xml/make/
    harmony/enhanced/java/branches/mrh/classlib/modules/xml/make/depends.properties
      - copied unchanged from r986356, harmony/enhanced/java/trunk/classlib/modules/xml/make/depends.properties
    harmony/enhanced/java/branches/mrh/classlib/support/src/test/java/tests/resources/hyts_compDiction.bin
      - copied unchanged from r986356, harmony/enhanced/java/trunk/classlib/support/src/test/java/tests/resources/hyts_compDiction.bin
    harmony/enhanced/java/branches/mrh/classlib/support/src/test/java/tests/resources/hyts_compressD.bin
      - copied unchanged from r986356, harmony/enhanced/java/trunk/classlib/support/src/test/java/tests/resources/hyts_compressD.bin
    harmony/enhanced/java/branches/mrh/classlib/support/src/test/java/tests/resources/hyts_constru(O).bin
      - copied unchanged from r986356, harmony/enhanced/java/trunk/classlib/support/src/test/java/tests/resources/hyts_constru(O).bin
    harmony/enhanced/java/branches/mrh/classlib/support/src/test/java/tests/resources/hyts_constru(OD).bin
      - copied unchanged from r986356, harmony/enhanced/java/trunk/classlib/support/src/test/java/tests/resources/hyts_constru(OD).bin
    harmony/enhanced/java/branches/mrh/classlib/support/src/test/java/tests/resources/hyts_constru(ODI).bin
      - copied unchanged from r986356, harmony/enhanced/java/trunk/classlib/support/src/test/java/tests/resources/hyts_constru(ODI).bin
    harmony/enhanced/java/branches/mrh/jdktools/modules/jdktools/src/test/resources/
      - copied from r986356, harmony/enhanced/java/trunk/jdktools/modules/jdktools/src/test/resources/
    harmony/enhanced/java/branches/mrh/jdktools/modules/jdktools/src/test/resources/Dependency.jar
      - copied unchanged from r986356, harmony/enhanced/java/trunk/jdktools/modules/jdktools/src/test/resources/Dependency.jar
    harmony/enhanced/java/branches/mrh/jdktools/modules/jdktools/src/test/resources/Sample.java
      - copied unchanged from r986356, harmony/enhanced/java/trunk/jdktools/modules/jdktools/src/test/resources/Sample.java
    harmony/enhanced/java/branches/mrh/jdktools/modules/jdktools/src/test/resources/Simple.java
      - copied unchanged from r986356, harmony/enhanced/java/trunk/jdktools/modules/jdktools/src/test/resources/Simple.java
Removed:
    harmony/enhanced/java/branches/mrh/classlib/depends/manifests/xalan-j_2.7.0/
    harmony/enhanced/java/branches/mrh/classlib/depends/manifests/xerces_2.10.0/
    harmony/enhanced/java/branches/mrh/classlib/support/src/test/java/tests/resources/hyts_compDiction.txt
    harmony/enhanced/java/branches/mrh/classlib/support/src/test/java/tests/resources/hyts_compressD.txt
    harmony/enhanced/java/branches/mrh/classlib/support/src/test/java/tests/resources/hyts_constru(O).txt
    harmony/enhanced/java/branches/mrh/classlib/support/src/test/java/tests/resources/hyts_constru(OD).txt
    harmony/enhanced/java/branches/mrh/classlib/support/src/test/java/tests/resources/hyts_constru(ODI).txt
Modified:
    harmony/enhanced/java/branches/mrh/   (props changed)
    harmony/enhanced/java/branches/mrh/build.xml
    harmony/enhanced/java/branches/mrh/classlib/   (props changed)
    harmony/enhanced/java/branches/mrh/classlib/build.xml
    harmony/enhanced/java/branches/mrh/classlib/depends/build/platform/zos.s390.mk
    harmony/enhanced/java/branches/mrh/classlib/depends/build/platform/zos.s390x.mk
    harmony/enhanced/java/branches/mrh/classlib/make/depends.xml
    harmony/enhanced/java/branches/mrh/classlib/modules/archive/src/main/native/archive/unix/makefile
    harmony/enhanced/java/branches/mrh/classlib/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/jar/AttributesTest.java
    harmony/enhanced/java/branches/mrh/classlib/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/jar/JarExceptionTest.java
    harmony/enhanced/java/branches/mrh/classlib/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/jar/JarFileTest.java
    harmony/enhanced/java/branches/mrh/classlib/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/jar/JarOutputStreamTest.java
    harmony/enhanced/java/branches/mrh/classlib/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/jar/ManifestTest.java
    harmony/enhanced/java/branches/mrh/classlib/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/CheckedInputStreamTest.java
    harmony/enhanced/java/branches/mrh/classlib/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/DeflaterTest.java
    harmony/enhanced/java/branches/mrh/classlib/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/GZIPInputStreamTest.java
    harmony/enhanced/java/branches/mrh/classlib/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/InflaterInputStreamTest.java
    harmony/enhanced/java/branches/mrh/classlib/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/InflaterTest.java
    harmony/enhanced/java/branches/mrh/classlib/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/ZipFileTest.java
    harmony/enhanced/java/branches/mrh/classlib/modules/auth/src/main/java/common/org/apache/harmony/auth/internal/nls/messages.properties
    harmony/enhanced/java/branches/mrh/classlib/modules/auth/src/main/java/common/org/apache/harmony/auth/module/KeyStoreLoginModule.java
    harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/java/common/java/awt/Color.java
    harmony/enhanced/java/branches/mrh/classlib/modules/imageio/build.xml
    harmony/enhanced/java/branches/mrh/classlib/modules/imageio/src/main/java/javax/imageio/ImageIO.java
    harmony/enhanced/java/branches/mrh/classlib/modules/imageio/src/main/java/javax/imageio/plugins/jpeg/JPEGQTable.java
    harmony/enhanced/java/branches/mrh/classlib/modules/imageio/src/main/java/javax/imageio/spi/IIORegistry.java
    harmony/enhanced/java/branches/mrh/classlib/modules/imageio/src/main/java/javax/imageio/spi/ServiceRegistry.java
    harmony/enhanced/java/branches/mrh/classlib/modules/imageio/src/main/java/javax/imageio/stream/ImageInputStreamImpl.java
    harmony/enhanced/java/branches/mrh/classlib/modules/imageio/src/main/java/javax/imageio/stream/ImageOutputStreamImpl.java
    harmony/enhanced/java/branches/mrh/classlib/modules/imageio/src/main/java/org/apache/harmony/x/imageio/internal/nls/messages.properties
    harmony/enhanced/java/branches/mrh/classlib/modules/imageio/src/main/java/org/apache/harmony/x/imageio/plugins/jpeg/JPEGImageWriter.java
    harmony/enhanced/java/branches/mrh/classlib/modules/imageio/src/test/java/javax/imageio/spi/ServiceRegistryTest.java
    harmony/enhanced/java/branches/mrh/classlib/modules/imageio/src/test/java/javax/imageio/stream/ImageOutputStreamImplTest.java
    harmony/enhanced/java/branches/mrh/classlib/modules/lang-management/src/main/java/java/lang/management/ManagementFactory.java
    harmony/enhanced/java/branches/mrh/classlib/modules/lang-management/src/main/java/java/lang/management/MemoryNotificationInfo.java
    harmony/enhanced/java/branches/mrh/classlib/modules/lang-management/src/main/java/java/lang/management/ThreadInfo.java
    harmony/enhanced/java/branches/mrh/classlib/modules/lang-management/src/main/java/org/apache/harmony/lang/management/CompilationMXBeanImpl.java
    harmony/enhanced/java/branches/mrh/classlib/modules/lang-management/src/main/java/org/apache/harmony/lang/management/DynamicMXBeanImpl.java
    harmony/enhanced/java/branches/mrh/classlib/modules/lang-management/src/main/java/org/apache/harmony/lang/management/LoggingMXBeanImpl.java
    harmony/enhanced/java/branches/mrh/classlib/modules/lang-management/src/main/java/org/apache/harmony/lang/management/ManagementUtils.java
    harmony/enhanced/java/branches/mrh/classlib/modules/lang-management/src/main/java/org/apache/harmony/lang/management/MemoryPoolMXBeanImpl.java
    harmony/enhanced/java/branches/mrh/classlib/modules/lang-management/src/main/java/org/apache/harmony/lang/management/OpenTypeMappingIHandler.java
    harmony/enhanced/java/branches/mrh/classlib/modules/lang-management/src/main/java/org/apache/harmony/lang/management/RuntimeMXBeanImpl.java
    harmony/enhanced/java/branches/mrh/classlib/modules/lang-management/src/main/java/org/apache/harmony/lang/management/ThreadMXBeanImpl.java
    harmony/enhanced/java/branches/mrh/classlib/modules/luni/src/main/java/java/io/ObjectInputStream.java
    harmony/enhanced/java/branches/mrh/classlib/modules/luni/src/main/java/java/io/OutputStreamWriter.java
    harmony/enhanced/java/branches/mrh/classlib/modules/luni/src/main/java/java/io/PipedOutputStream.java
    harmony/enhanced/java/branches/mrh/classlib/modules/luni/src/main/java/java/util/ArrayList.java
    harmony/enhanced/java/branches/mrh/classlib/modules/luni/src/main/java/java/util/PriorityQueue.java
    harmony/enhanced/java/branches/mrh/classlib/modules/luni/src/main/native/luni/shared/luniglob.c
    harmony/enhanced/java/branches/mrh/classlib/modules/luni/src/main/native/luni/unix/OSNetworkSystemLinux.c
    harmony/enhanced/java/branches/mrh/classlib/modules/luni/src/main/native/luni/windows/OSNetworkSystemWin32.c
    harmony/enhanced/java/branches/mrh/classlib/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/BufferedWriterTest.java
    harmony/enhanced/java/branches/mrh/classlib/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/ObjectInputStreamTest.java
    harmony/enhanced/java/branches/mrh/classlib/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/PipedOutputStreamTest.java
    harmony/enhanced/java/branches/mrh/classlib/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/PriorityQueueTest.java
    harmony/enhanced/java/branches/mrh/classlib/modules/nio/src/main/java/common/org/apache/harmony/nio/AddressUtil.java
    harmony/enhanced/java/branches/mrh/classlib/modules/nio/src/main/java/common/org/apache/harmony/nio/internal/DatagramChannelImpl.java
    harmony/enhanced/java/branches/mrh/classlib/modules/nio/src/main/java/common/org/apache/harmony/nio/internal/FileChannelImpl.java
    harmony/enhanced/java/branches/mrh/classlib/modules/nio/src/main/java/common/org/apache/harmony/nio/internal/PipeImpl.java
    harmony/enhanced/java/branches/mrh/classlib/modules/nio/src/main/java/common/org/apache/harmony/nio/internal/SocketChannelImpl.java
    harmony/enhanced/java/branches/mrh/classlib/modules/nio/src/test/java/common/org/apache/harmony/nio/tests/java/nio/channels/DatagramChannelTest.java
    harmony/enhanced/java/branches/mrh/classlib/modules/nio/src/test/java/common/org/apache/harmony/nio/tests/java/nio/channels/PipeTest.java
    harmony/enhanced/java/branches/mrh/classlib/modules/nio/src/test/java/common/org/apache/harmony/nio/tests/java/nio/channels/ServerSocketChannelTest.java
    harmony/enhanced/java/branches/mrh/classlib/modules/nio/src/test/java/common/org/apache/harmony/nio/tests/java/nio/channels/SocketChannelTest.java
    harmony/enhanced/java/branches/mrh/classlib/modules/nio_char/src/main/java/java/nio/charset/CharsetEncoder.java
    harmony/enhanced/java/branches/mrh/classlib/modules/nio_char/src/test/java/org/apache/harmony/nio_char/tests/java/nio/charset/ASCIICharsetEncoderTest.java
    harmony/enhanced/java/branches/mrh/classlib/modules/nio_char/src/test/java/tests/api/java/nio/charset/CharsetEncoderTest.java
    harmony/enhanced/java/branches/mrh/classlib/modules/portlib/src/main/native/a2e/unix/atoe.c
    harmony/enhanced/java/branches/mrh/classlib/modules/portlib/src/main/native/include/shared/hycomp.h
    harmony/enhanced/java/branches/mrh/classlib/modules/portlib/src/main/native/include/unix/hysock.h
    harmony/enhanced/java/branches/mrh/classlib/modules/portlib/src/main/native/thread/shared/hythread.c
    harmony/enhanced/java/branches/mrh/classlib/modules/print/META-INF/MANIFEST.MF
    harmony/enhanced/java/branches/mrh/classlib/modules/print/src/main/java/common/javax/print/ServiceUI.java
    harmony/enhanced/java/branches/mrh/classlib/modules/print/src/main/java/common/javax/print/SimpleDoc.java
    harmony/enhanced/java/branches/mrh/classlib/modules/print/src/main/java/common/javax/print/attribute/AttributeSetUtilities.java
    harmony/enhanced/java/branches/mrh/classlib/modules/print/src/main/java/common/javax/print/attribute/HashAttributeSet.java
    harmony/enhanced/java/branches/mrh/classlib/modules/print/src/main/java/common/javax/print/attribute/IntegerSyntax.java
    harmony/enhanced/java/branches/mrh/classlib/modules/print/src/main/java/common/javax/print/attribute/ResolutionSyntax.java
    harmony/enhanced/java/branches/mrh/classlib/modules/print/src/main/java/common/javax/print/attribute/SetOfIntegerSyntax.java
    harmony/enhanced/java/branches/mrh/classlib/modules/print/src/main/java/common/javax/print/attribute/Size2DSyntax.java
    harmony/enhanced/java/branches/mrh/classlib/modules/print/src/main/java/common/javax/print/attribute/standard/CopiesSupported.java
    harmony/enhanced/java/branches/mrh/classlib/modules/print/src/main/java/common/javax/print/attribute/standard/JobImpressionsSupported.java
    harmony/enhanced/java/branches/mrh/classlib/modules/print/src/main/java/common/javax/print/attribute/standard/JobKOctetsSupported.java
    harmony/enhanced/java/branches/mrh/classlib/modules/print/src/main/java/common/javax/print/attribute/standard/JobMediaSheetsSupported.java
    harmony/enhanced/java/branches/mrh/classlib/modules/print/src/main/java/common/javax/print/attribute/standard/JobStateReasons.java
    harmony/enhanced/java/branches/mrh/classlib/modules/print/src/main/java/common/javax/print/attribute/standard/MediaPrintableArea.java
    harmony/enhanced/java/branches/mrh/classlib/modules/print/src/main/java/common/javax/print/attribute/standard/MediaSize.java
    harmony/enhanced/java/branches/mrh/classlib/modules/print/src/main/java/common/javax/print/attribute/standard/NumberUpSupported.java
    harmony/enhanced/java/branches/mrh/classlib/modules/print/src/main/java/common/javax/print/attribute/standard/PageRanges.java
    harmony/enhanced/java/branches/mrh/classlib/modules/print/src/main/java/common/javax/print/attribute/standard/PrinterStateReasons.java
    harmony/enhanced/java/branches/mrh/classlib/modules/regex/src/main/java/java/util/regex/Matcher.java
    harmony/enhanced/java/branches/mrh/classlib/modules/regex/src/test/java/org/apache/harmony/tests/java/util/regex/MatcherTest.java
    harmony/enhanced/java/branches/mrh/classlib/modules/swing/META-INF/MANIFEST.MF
    harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/html/FormViewTest.java
    harmony/enhanced/java/branches/mrh/common_resources/   (props changed)
    harmony/enhanced/java/branches/mrh/common_resources/make/properties.xml
    harmony/enhanced/java/branches/mrh/drlvm/   (props changed)
    harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmcore/shared/x86/lil/m2n.cpp
    harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmcore/shared/x86/thread/thread_helpers.cpp
    harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmcore/shared/x86/util/jit_lock_rt_support.cpp
    harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmcore/shared/x86/util/jit_runtime_support.cpp
    harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/vmcore/unix/kernel_classes/Runtime.cpp
    harmony/enhanced/java/branches/mrh/drlvm/vm/vmcore/include/compile.h
    harmony/enhanced/java/branches/mrh/jdktools/modules/jdktools/build.xml
    harmony/enhanced/java/branches/mrh/jdktools/modules/jdktools/src/main/java/org/apache/harmony/tools/jar/Main.java
    harmony/enhanced/java/branches/mrh/jdktools/modules/jdktools/src/main/java/org/apache/harmony/tools/javac/Main.java
    harmony/enhanced/java/branches/mrh/jdktools/modules/jdktools/src/main/java/org/apache/harmony/tools/jdb/Main.java
    harmony/enhanced/java/branches/mrh/jdktools/modules/jdktools/src/test/java/org/apache/harmony/tests/tools/javac/MainTest.java
    harmony/enhanced/java/branches/mrh/jdktools/modules/samsa/build.xml
    harmony/enhanced/java/branches/mrh/jdktools/modules/samsa/src/main/native/samsa/samsa.c
    harmony/enhanced/java/branches/mrh/jdktools/modules/samsa/src/main/native/samsa/unix/makefile

Propchange: harmony/enhanced/java/branches/mrh/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug 17 21:36:10 2010
@@ -1,2 +1,2 @@
 /harmony/enhanced/java/branches/mrh:935751
-/harmony/enhanced/java/trunk:935751-964765,964786
+/harmony/enhanced/java/trunk:935751-986356

Modified: harmony/enhanced/java/branches/mrh/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/build.xml?rev=986497&r1=986496&r2=986497&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/build.xml Tue Aug 17 21:36:10 2010
@@ -29,6 +29,8 @@
     <!-- debug or release version -->
     <property name="hy.cfg" value="release" />
 
+    <property name="hy.select" value="false" />
+
     <property name="hy.hdk" location="${hy.target}/hdk" />
     <property name="hy.component" location="federated" />
     <property name="hy.module" location="toplevel" />
@@ -125,21 +127,33 @@ Usage:
                  bundle-src-zip" />
 
     <target name="rat" depends="setup,copy-src">
+        <property name="rat.version" value="0.7" />
         <fail
              message="Set rat.home property to directory containing rat build">
             <condition><not><available file="${rat.home}" /></not></condition>
         </fail>
         <typedef resource="org/apache/rat/anttasks/antlib.xml"
                  uri="antlib:org.apache.rat.anttasks">
-            <classpath path="${rat.home}/apache-rat-tasks/target/apache-rat-tasks-0.7-SNAPSHOT.jar" />
-            <classpath path="${rat.home}/apache-rat-core/target/apache-rat-core-0.7-SNAPSHOT.jar" />
-            <classpath path="${rat.home}/apache-rat/target/apache-rat-0.7-SNAPSHOT.jar" />
+            <!-- these work if rat.home is a built source checkout -->
+            <classpath path="${rat.home}/apache-rat-tasks/target/apache-rat-tasks-${rat.version}.jar" />
+            <classpath path="${rat.home}/apache-rat-core/target/apache-rat-core-${rat.version}.jar" />
+            <classpath path="${rat.home}/apache-rat/target/apache-rat-${rat.version}.jar" />
+
+            <!-- these work if rat.home is a binary build -->
+            <classpath path="${rat.home}/apache-rat-tasks-${rat.version}.jar" />
+            <classpath path="${rat.home}/apache-rat-core-${rat.version}.jar" />
+            <classpath path="${rat.home}/apache-rat-${rat.version}.jar" />
         </typedef>
         <delete file="${hy.target}/rat.report.txt" />
         <rat:report xmlns:rat="antlib:org.apache.rat.anttasks"
                     reportFile="${hy.target}/rat.report.txt" >
             <fileset dir="${hy.target}/src" excludesfile="rat.excludes" />
         </rat:report>
+        <property name="rat.location"
+                  location="${hy.target}/rat.report.txt" />
+        <echo>Rat report generated at
+  ${rat.location}
+        </echo>
     </target>
 
     <!-- ============================================================== -->
@@ -448,6 +462,7 @@ Usage:
 
     <propertyset id="required.props">
         <propertyref name="hy.cfg" />
+        <propertyref name="hy.select" />
         <propertyref name="hy.hdk" />
         <propertyref name="hy.local.zlib" />
         <propertyref name="use.libstdc++5" />

Propchange: harmony/enhanced/java/branches/mrh/classlib/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug 17 21:36:10 2010
@@ -1,4 +1,4 @@
 /harmony/enhanced/classlib/trunk:926318-926838
 /harmony/enhanced/java/branches/mrh/classlib:935751
-/harmony/enhanced/java/trunk/classlib:935751-964765,964786
+/harmony/enhanced/java/trunk/classlib:935751-986356
 /harmony/enhanced/trunk/classlib:476395-926317

Modified: harmony/enhanced/java/branches/mrh/classlib/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/build.xml?rev=986497&r1=986496&r2=986497&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/build.xml Tue Aug 17 21:36:10 2010
@@ -224,8 +224,6 @@ module:
         <copy todir="${hy.jdk}/jre/lib/boot">
             <fileset dir="${depends.jars}">
                 <patternset includes="icu4j_4.2.1/*.jar" />
-                <patternset includes="xalan-j_2.7.0/xalan.jar" />
-                <patternset includes="xerces_2.10.0/*.jar" />
             </fileset>
             <fileset dir="${depends.manifests}"/>
         </copy>

Modified: harmony/enhanced/java/branches/mrh/classlib/depends/build/platform/zos.s390.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/depends/build/platform/zos.s390.mk?rev=986497&r1=986496&r2=986497&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/depends/build/platform/zos.s390.mk (original)
+++ harmony/enhanced/java/branches/mrh/classlib/depends/build/platform/zos.s390.mk Tue Aug 17 21:36:10 2010
@@ -19,7 +19,7 @@ AS = cc
 # Use cxx/c++ for c++ compiles on z/OS
 CXX = cxx
 
-DEFINES += -DZOS -DZOS_S390 -DHYS390 -DHY_ATOE -DIPv6_FUNCTION_SUPPORT
+DEFINES += -DZOS -DZOS_S390 -DHYS390 -DHY_ATOE -D_OPEN_SYS_IF_EXT=1 -DIPv6_FUNCTION_SUPPORT
 PLATFORM = -Wc,xplink,convlit\(ISO8859-1\),FLOAT\(IEEE,FOLD,AFP\) -Wa,goff \
            -Wc,NOANSIALIAS -Wc,DLL,EXPORTALL
 
@@ -49,9 +49,5 @@ WARNFLAGS =
 # z/OS has different debug flags
 HYDEBUGCFLAGS = -g -O0
 
-# On z/OS set DLLPATH to LIBPATH so we link against .x export files in
-# $(HY_HDK)/lib instead of directly against the .so libraries.
-DLLPATH=$(LIBPATH)
-
 # AR doesn't support the 'o' option on z/OS so mtime will be updated
 AREXTRACT= x

Modified: harmony/enhanced/java/branches/mrh/classlib/depends/build/platform/zos.s390x.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/depends/build/platform/zos.s390x.mk?rev=986497&r1=986496&r2=986497&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/depends/build/platform/zos.s390x.mk (original)
+++ harmony/enhanced/java/branches/mrh/classlib/depends/build/platform/zos.s390x.mk Tue Aug 17 21:36:10 2010
@@ -19,7 +19,7 @@ AS = cc
 # Use cxx/c++ for c++ compiles on z/OS
 CXX = cxx
 
-DEFINES += -DZOS -DZOS_S390X -DHYS390X -DHY_ATOE -DIPv6_FUNCTION_SUPPORT
+DEFINES += -DZOS -DZOS_S390X -DHYS390X -DHY_ATOE -D_OPEN_SYS_IF_EXT=1 -DIPv6_FUNCTION_SUPPORT
 PLATFORM = -Wc,lp64,xplink,convlit\(ISO8859-1\),FLOAT\(IEEE,FOLD,AFP\) \
            -Wa,goff -Wc,NOANSIALIAS -Wc,DLL,EXPORTALL
 
@@ -49,9 +49,5 @@ WARNFLAGS =
 # z/OS has different debug flags
 HYDEBUGCFLAGS = -g -O0
 
-# On z/OS set DLLPATH to LIBPATH so we link against .x export files in
-# $(HY_HDK)/lib instead of directly against the .so libraries.
-DLLPATH=$(LIBPATH)
-
 # AR doesn't support the 'o' option on z/OS so mtime will be updated
 AREXTRACT= x

Modified: harmony/enhanced/java/branches/mrh/classlib/make/depends.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/make/depends.xml?rev=986497&r1=986496&r2=986497&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/make/depends.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/make/depends.xml Tue Aug 17 21:36:10 2010
@@ -32,8 +32,6 @@
             depends="-check,-check-win,-extract" />
 
     <target name="-check">
-        <check-one-file src="${xalan.url}" dest="${xalan.orig.jar}" />
-        <check-one-file src="${xerces.url}" dest="${xerces.zip}" />
         <check-one-file src="${junit.url}" dest="${junit.jar}" />
         <check-one-file src="${hamcrest-library.url}" dest="${hamcrest-library.jar}" />
         <check-one-file src="${findbugs.url}" dest="${findbugs.zip}" />
@@ -52,45 +50,14 @@
         <check-one-file src="${msvcp.url}" dest="${msvcp.dll}" />
     </target>
 
-    <target name="-extract"
-         depends="-extract-props,-extract-xerces,-fix-xalan-manifest,-extract-findbugs" />
+    <target name="-extract" depends="-extract-props,-extract-findbugs" />
 
     <target name="-extract-props">
-        <uptodate property="xerces.uptodate"
-                  srcfile="${xerces.zip}"
-                  targetfile="${xerces.dir}/xercesImpl.jar" />
-        <uptodate property="xalan.uptodate"
-                  srcfile="${xalan.orig.jar}"
-                  targetfile="${xalan.jar}" />
         <uptodate property="findbugs.uptodate"
                   srcfile="${findbugs.zip}"
                   targetfile="${findbugs.dir}/uptodate" />
     </target>
 
-    <target name="-extract-xerces" unless="xerces.uptodate">
-        <unzip src="${xerces.zip}" dest="${xerces.dir}.tmp" />
-        <copy todir="${xerces.dir}" flatten="yes">
-            <fileset dir="${xerces.dir}.tmp/xerces-2_10_0">
-                <include name="resolver.jar" />
-		<include name="xercesImpl.jar" />
-		<include name="xml-apis.jar" />
-            </fileset>
-        </copy>
-        <delete dir="${xerces.dir}.tmp" />
-	<touch file="${xerces.dir}/xercesImpl.jar" />
-    </target>
-
-    <target name="-fix-xalan-manifest" unless="xalan.uptodate">
-        <unjar src="${xalan.orig.jar}" dest="${xalan.dir}.tmp" />
-        <delete file="${xalan.jar}" />
-        <replace file="${xalan.dir}.tmp/META-INF/MANIFEST.MF"
-                 token="Class-Path: xercesImpl.jar xml-apis.jar serializer.jar"
-                 value="" />
-        <jar destfile="${xalan.jar}" basedir="${xalan.dir}.tmp"
-             manifest="${xalan.dir}.tmp/META-INF/MANIFEST.MF" />
-        <delete dir="${xalan.dir}.tmp" />
-    </target>
-
     <target name="-extract-findbugs" unless="findbugs.uptodate">
         <!-- Note that FindBugs contains a top level dir name -->
         <unzip src="${findbugs.zip}" dest="${findbugs.dir}/.." />
@@ -102,14 +69,6 @@
 
     <target name="-download">
 
-        <mkdir dir="${xalan.dir}" />
-        <download-one-file src="${xalan.url}" dest="${xalan.orig.jar}"
-                           md5="${xalan.md5}" />
-
-        <mkdir dir="${xerces.dir}" />
-        <download-one-file src="${xerces.url}" dest="${xerces.zip}"
-                           md5="${xerces.md5}" />
-
         <mkdir dir="${junit.dir}" />
         <download-one-file src="${junit.url}" dest="${junit.jar}"
                            md5="${junit.md5}" />

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/archive/src/main/native/archive/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/archive/src/main/native/archive/unix/makefile?rev=986497&r1=986496&r2=986497&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/archive/src/main/native/archive/unix/makefile (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/archive/src/main/native/archive/unix/makefile Tue Aug 17 21:36:10 2010
@@ -33,9 +33,15 @@ ifeq ($(HY_LOCAL_ZLIB),true)
 DEFINES += -DHY_LOCAL_ZLIB
 OSLIBS += -lz
 else
+
+ifeq ($(HY_OS),zos)
+MDLLIBZLIB += $(LIBPATH)libhyzlib$(HY_LINKLIB_SUFFIX)
+else
 MDLLIBZLIB += $(DLLPATH)libhyzlib$(HY_LINKLIB_SUFFIX)
 endif
 
+endif
+
 MDLLIBFILES += \
 	$(MDLLIBZLIB) $(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX)
 

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/jar/AttributesTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/jar/AttributesTest.java?rev=986497&r1=986496&r2=986497&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/jar/AttributesTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/jar/AttributesTest.java Tue Aug 17 21:36:10 2010
@@ -239,6 +239,9 @@ public class AttributesTest extends Test
         a2.putValue("One", "1");
         a2.putValue("TWO", "2");
         assertEquals(a1, a2);
+        assertEquals(a1, a1);
+        a2=null;
+        assertFalse(a1.equals(a2));
     }
 
     /**

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/jar/JarExceptionTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/jar/JarExceptionTest.java?rev=986497&r1=986496&r2=986497&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/jar/JarExceptionTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/jar/JarExceptionTest.java Tue Aug 17 21:36:10 2010
@@ -19,6 +19,7 @@ package org.apache.harmony.archive.tests
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
+import java.util.jar.JarException;
 import java.util.jar.Manifest;
 import junit.framework.TestCase;
 
@@ -35,4 +36,18 @@ public class JarExceptionTest extends Te
             // correct
         }
     }
+    
+    /**
+     * @tests java.util.jar.JarException#JarException(java.lang.String)
+     */
+    public void test_ConstructorLjava_lang_String1() throws Exception {
+         assertEquals("Jar Exception", new JarException("Jar Exception").getMessage());
+    }
+
+    /**
+     * @tests java.util.jar.JarException#JarException()
+     */
+    public void test_Constructor_void() throws Exception {
+        new JarException();
+    }
 }

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/jar/JarFileTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/jar/JarFileTest.java?rev=986497&r1=986496&r2=986497&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/jar/JarFileTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/jar/JarFileTest.java Tue Aug 17 21:36:10 2010
@@ -287,6 +287,8 @@ public class JarFileTest extends TestCas
         // java.util.jar.JarFile.getManifest()
         Support_Resources.copyFile(resources, null, JAR1);
         JarFile jarFile = new JarFile(new File(resources, JAR1));
+        InputStream is = jarFile.getInputStream(jarFile.getEntry(JAR1_ENTRY1));
+        assertTrue(is.available() > 0);
         assertNotNull("Error--Manifest not returned", jarFile.getManifest());
         jarFile.close();
 

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/jar/JarOutputStreamTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/jar/JarOutputStreamTest.java?rev=986497&r1=986496&r2=986497&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/jar/JarOutputStreamTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/jar/JarOutputStreamTest.java Tue Aug 17 21:36:10 2010
@@ -120,6 +120,13 @@ public class JarOutputStreamTest extends
         } catch (IOException ee) {
             // expected
         }
+        
+        try {
+            new JarOutputStream(fos, null);
+            fail("NullPointerException expected");
+        } catch (NullPointerException ee) {
+            // expected
+        }
     }
 
     public void test_JarOutputStreamLjava_io_OutputStream() throws IOException {

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/jar/ManifestTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/jar/ManifestTest.java?rev=986497&r1=986496&r2=986497&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/jar/ManifestTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/jar/ManifestTest.java Tue Aug 17 21:36:10 2010
@@ -44,6 +44,8 @@ public class ManifestTest extends TestCa
     private final String MANIFEST_NAME = "manifest/hyts_MANIFEST.MF";
 
     private static final String MANIFEST_CONTENTS = "Manifest-Version: 1.0\nBundle-Name: ClientSupport\nBundle-Description: Provides SessionService, AuthenticationService. Extends RegistryService.\nBundle-Activator: com.ibm.ive.eccomm.client.support.ClientSupportActivator\nImport-Package: com.ibm.ive.eccomm.client.services.log,\n com.ibm.ive.eccomm.client.services.registry,\n com.ibm.ive.eccomm.service.registry; specification-version=1.0.0,\n com.ibm.ive.eccomm.service.session; specification-version=1.0.0,\n com.ibm.ive.eccomm.service.framework; specification-version=1.2.0,\n org.osgi.framework; specification-version=1.0.0,\n org.osgi.service.log; specification-version=1.0.0,\n com.ibm.ive.eccomm.flash; specification-version=1.2.0,\n com.ibm.ive.eccomm.client.xml,\n com.ibm.ive.eccomm.client.http.common,\n com.ibm.ive.eccomm.client.http.client\nImport-Service: org.osgi.service.log.LogReaderService\n org.osgi.service.log.LogService,\n com.ibm.ive.eccomm.service.registry.Regis
 tryService\nExport-Package: com.ibm.ive.eccomm.client.services.authentication; specification-version=1.0.0,\n com.ibm.ive.eccomm.service.authentication; specification-version=1.0.0,\n com.ibm.ive.eccomm.common; specification-version=1.0.0,\n com.ibm.ive.eccomm.client.services.registry.store; specification-version=1.0.0\nExport-Service: com.ibm.ive.eccomm.service.authentication.AuthenticationService,\n com.ibm.ive.eccomm.service.session.SessionService\nBundle-Vendor: IBM\nBundle-Version: 1.2.0\n";
+    
+    private static final String MANIFEST_CONTENTS_1 = "Manifest-Version: 2.0\nBundle-Name: ClientSupport\nBundle-Description: Provides SessionService, AuthenticationService. Extends RegistryService.\nBundle-Activator: com.ibm.ive.eccomm.client.support.ClientSupportActivator\nImport-Package: com.ibm.ive.eccomm.client.services.log,\n com.ibm.ive.eccomm.client.services.registry,\n com.ibm.ive.eccomm.service.registry; specification-version=2.0.0,\n com.ibm.ive.eccomm.service.session; specification-version=2.0.0,\n com.ibm.ive.eccomm.service.framework; specification-version=2.1.0,\n org.osgi.framework; specification-version=2.0.0,\n org.osgi.service.log; specification-version=2.0.0,\n com.ibm.ive.eccomm.flash; specification-version=2.2.0,\n com.ibm.ive.eccomm.client.xml,\n com.ibm.ive.eccomm.client.http.common,\n com.ibm.ive.eccomm.client.http.client\nImport-Service: org.osgi.service.log.LogReaderService\n org.osgi.service.log.LogService,\n com.ibm.ive.eccomm.service.registry.Reg
 istryService\nExport-Package: com.ibm.ive.eccomm.client.services.authentication; specification-version=1.0.0,\n com.ibm.ive.eccomm.service.authentication; specification-version=1.0.0,\n com.ibm.ive.eccomm.common; specification-version=1.0.0,\n com.ibm.ive.eccomm.client.services.registry.store; specification-version=1.0.0\nExport-Service: com.ibm.ive.eccomm.service.authentication.AuthenticationService,\n com.ibm.ive.eccomm.service.session.SessionService\nBundle-Vendor: IBM\nBundle-Version: 1.2.0\n";
 
     private File resources;
 
@@ -182,6 +184,14 @@ public class ManifestTest extends TestCa
                 MANIFEST_CONTENTS.getBytes("ISO-8859-1")));
 
         assertEquals(firstManifest, secondManifest);
+
+        Manifest thirdManifest = new Manifest(new ByteArrayInputStream(
+                MANIFEST_CONTENTS_1.getBytes("ISO-8859-1")));
+        assertNotSame(firstManifest, thirdManifest);
+        
+        firstManifest=null;
+        assertFalse(secondManifest.equals(firstManifest));
+        assertFalse(secondManifest.equals(new String("abc"))); //non Manifest Object
     }
 
     /**

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/CheckedInputStreamTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/CheckedInputStreamTest.java?rev=986497&r1=986496&r2=986497&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/CheckedInputStreamTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/CheckedInputStreamTest.java Tue Aug 17 21:36:10 2010
@@ -104,6 +104,7 @@ public class CheckedInputStreamTest exte
         // System.out.print(checkIn.getChecksum().getValue());
         assertEquals("checkSum value is not correct", 2235765342L, checkIn.getChecksum()
                 .getValue());
+        assertEquals(0, checkIn.skip(0));
         checkInput.close();
     }
 

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/DeflaterTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/DeflaterTest.java?rev=986497&r1=986496&r2=986497&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/DeflaterTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/DeflaterTest.java Tue Aug 17 21:36:10 2010
@@ -886,6 +886,18 @@ public class DeflaterTest extends TestCa
 			fail("IllegalArgumentException not thrown when setting level to a number > 9.");
 		} catch (IllegalArgumentException e) {
 		}
+		
+        try {
+            Deflater boundDefl = new Deflater(-2, true);
+            fail("IllegalArgumentException not thrown when passing level to a number < 0.");
+        } catch (IllegalArgumentException e) {
+        }
+
+        try {
+            Deflater boundDefl = new Deflater(10, true);
+            fail("IllegalArgumentException not thrown when passing level to a number > 9.");
+        } catch (IllegalArgumentException e) {
+        }
 	}
 
 	/**
@@ -1007,6 +1019,22 @@ public class DeflaterTest extends TestCa
 		} catch (NullPointerException e) {
 		}
 
+        // Methods where we expect NullPointerException to be thrown
+        try {
+            defl.getBytesRead();
+            fail("defl.reset() can still be used after " + desc
+                    + " is called in test_" + desc);
+        } catch (NullPointerException e) {
+        }
+        
+        // Methods where we expect NullPointerException to be thrown
+        try {
+            defl.getBytesWritten();
+            fail("defl.getBytesWritten() can still be used after " + desc
+                    + " is called in test_" + desc);
+        } catch (NullPointerException e) {
+        }        
+        
 		// Methods that should be allowed to be called after end() is called
 		defl.needsInput();
 		defl.setStrategy(1);

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/GZIPInputStreamTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/GZIPInputStreamTest.java?rev=986497&r1=986496&r2=986497&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/GZIPInputStreamTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/GZIPInputStreamTest.java Tue Aug 17 21:36:10 2010
@@ -92,6 +92,25 @@ public class GZIPInputStreamTest extends
 			assertEquals("the CRC value of the inputStream is not zero", 0, inGZIP
 					.getChecksum().getValue());
 			inGZIP.close();
+
+            try{
+                TestGZIPInputStream inGZIP1 = new TestGZIPInputStream(gInput
+                        .openConnection().getInputStream(), 0);   
+                fail("IllegalArgumentException expected");
+            }catch(IllegalArgumentException ioe){
+                //expected
+            }
+            
+            Support_Resources.copyFile(resources, null, "hyts_checkInput.txt");
+            final URL jarInput = new File(resources.toString()+ "/hyts_checkInput.txt").toURL();
+            try{
+                TestGZIPInputStream inGZIP1 = new TestGZIPInputStream(jarInput
+                        .openConnection().getInputStream(), 200);
+                fail("IOException expected");
+            }catch(IOException ex){
+                //expected
+            }
+            
 		} catch (IOException e) {
 			fail(
 					"an IO error occured while trying to open the input file");

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/InflaterInputStreamTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/InflaterInputStreamTest.java?rev=986497&r1=986496&r2=986497&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/InflaterInputStreamTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/InflaterInputStreamTest.java Tue Aug 17 21:36:10 2010
@@ -63,7 +63,7 @@ public class InflaterInputStreamTest ext
 		int result = 0;
 		int buffer[] = new int[500];
 		InputStream infile = Support_Resources
-				.getStream("hyts_constru(O).txt");
+				.getStream("hyts_constru(O).bin");
 
 		InflaterInputStream inflatIP = new InflaterInputStream(infile);
 
@@ -82,7 +82,7 @@ public class InflaterInputStreamTest ext
 	 */
 	public void test_ConstructorLjava_io_InputStreamLjava_util_zip_Inflater() throws IOException {
 		byte byteArray[] = new byte[100];
-		InputStream infile = Support_Resources.getStream("hyts_constru(OD).txt");
+		InputStream infile = Support_Resources.getStream("hyts_constru(OD).bin");
 		Inflater inflate = new Inflater();
 		InflaterInputStream inflatIP = new InflaterInputStream(infile,
 				inflate);
@@ -98,7 +98,7 @@ public class InflaterInputStreamTest ext
 	public void test_ConstructorLjava_io_InputStreamLjava_util_zip_InflaterI() throws IOException {
 		int result = 0;
 		int buffer[] = new int[500];
-		InputStream infile = Support_Resources.getStream("hyts_constru(ODI).txt");
+		InputStream infile = Support_Resources.getStream("hyts_constru(ODI).bin");
 		Inflater inflate = new Inflater();
 		InflaterInputStream inflatIP = new InflaterInputStream(infile,
 				inflate, 1);
@@ -112,6 +112,36 @@ public class InflaterInputStreamTest ext
 	}
 
     /**
+     * @tests java.util.zip.InflaterInputStream#InflaterInputStream(java.io.InputStream,
+     *        java.util.zip.Inflater, int)
+     */
+    public void test_ConstructorLjava_io_InputStreamLjava_util_zip_InflaterI_1() throws IOException {
+        InputStream infile = Support_Resources.getStream("hyts_constru(ODI).bin");
+        Inflater inflate = new Inflater();
+        InflaterInputStream inflatIP = null;
+        try{
+            inflatIP = new InflaterInputStream(infile, null, 1);
+            fail("NullPointerException expected");
+        }catch(NullPointerException NPE){
+            //expected
+        }  
+
+        try{
+            inflatIP = new InflaterInputStream(null, inflate, 1);
+            fail("NullPointerException expected");
+        }catch(NullPointerException NPE){
+            //expected
+        }  
+        
+        try{
+            inflatIP = new InflaterInputStream(infile, inflate, -1);
+            fail("IllegalArgumentException expected");
+        }catch(IllegalArgumentException iae){
+            //expected
+        }        
+    }
+
+    /**
      * @tests java.util.zip.InflaterInputStream#mark(int)
      */
     public void test_markI() {
@@ -141,7 +171,7 @@ public class InflaterInputStreamTest ext
 		int buffer[] = new int[500];
 		byte orgBuffer[] = { 1, 3, 4, 7, 8 };
 		InputStream infile = Support_Resources
-				.getStream("hyts_constru(OD).txt");
+				.getStream("hyts_constru(OD).bin");
 		Inflater inflate = new Inflater();
 		InflaterInputStream inflatIP = new InflaterInputStream(infile,
 				inflate);
@@ -160,6 +190,41 @@ public class InflaterInputStreamTest ext
 		}
 	}
 
+    /**
+     * @tests java.util.zip.InflaterInputStream#read(byte [], int, int)
+     */
+    public void test_read_LBII() throws IOException {
+        int result = 0;
+        InputStream infile = Support_Resources.getStream("hyts_constru(OD).bin");
+        Inflater inflate = new Inflater();
+        InflaterInputStream inflatIP = new InflaterInputStream(infile, inflate);
+        
+        byte[] b = new byte[3];
+        try{
+            result = inflatIP.read(null, 0, 1);
+            fail("NullPointerException expected");
+        }catch(NullPointerException npe){
+            //expected
+        }
+        
+        assertEquals(0, inflatIP.read(b, 0, 0));
+        
+        try{
+            result = inflatIP.read(b, 5, 2); //offset higher
+            fail("IndexOutOfBoundsException expected");
+        }catch(IndexOutOfBoundsException iobe){
+            //expected
+        }
+        
+            inflatIP.close();
+        try {
+            inflatIP.read(b, 0, 1); //read after close
+            fail("IOException expected");
+        }catch(IOException ioe){
+            //expected
+        }
+    }
+
     public void testAvailableNonEmptySource() throws Exception {
         // this byte[] is a deflation of these bytes: { 1, 3, 4, 6 }
         byte[] deflated = { 72, -119, 99, 100, 102, 97, 3, 0, 0, 31, 0, 15, 0 };
@@ -326,7 +391,7 @@ public class InflaterInputStreamTest ext
 
         // testing for negative input to skip
 		InputStream infile = Support_Resources
-				.getStream("hyts_constru(OD).txt");
+				.getStream("hyts_constru(OD).bin");
 		Inflater inflate = new Inflater();
 		InflaterInputStream inflatIP = new InflaterInputStream(infile,
 				inflate, 10);
@@ -341,7 +406,7 @@ public class InflaterInputStreamTest ext
 
 		// testing for number of bytes greater than input.
 		InputStream infile2 = Support_Resources
-				.getStream("hyts_constru(OD).txt");
+				.getStream("hyts_constru(OD).bin");
 		InflaterInputStream inflatIP2 = new InflaterInputStream(infile2);
 
 		// looked at how many bytes the skip skipped. It is
@@ -354,7 +419,7 @@ public class InflaterInputStreamTest ext
 
 		// test for skipping of 2 bytes
 		InputStream infile3 = Support_Resources
-				.getStream("hyts_constru(OD).txt");
+				.getStream("hyts_constru(OD).bin");
 		InflaterInputStream inflatIP3 = new InflaterInputStream(infile3);
 		skip = inflatIP3.skip(2);
 		assertEquals("the number of bytes returned by skip did not correspond with its input parameters",

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/InflaterTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/InflaterTest.java?rev=986497&r1=986496&r2=986497&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/InflaterTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/InflaterTest.java Tue Aug 17 21:36:10 2010
@@ -363,6 +363,7 @@ public class InflaterTest extends junit.
 		try {
 			while (!(inflate.finished())) {
 				if (inflate.needsInput()) {
+				    assertEquals(0, inflate.inflate(outPutInf, 0, 1));
 					inflate.setInput(outPutBuff1);
 				}
 				y += inflate.inflate(outPutInf, y, outPutInf.length - y);
@@ -395,6 +396,21 @@ public class InflaterTest extends junit.
 			r = 1;
 		}
 		assertEquals("out of bounds error did not get caught", 1, r);
+
+        try {
+            assertEquals(0, inflate.inflate(outPutInf, offSet, 0));
+        } catch (DataFormatException e) {
+            fail("Invalid input to be decompressed");
+        }
+        inflate.end();
+        try {
+            inflate.inflate(outPutInf, offSet, 1);
+            fail("IllegalStateException expected");
+        } catch (DataFormatException e) {
+            fail("Invalid input to be decompressed");
+        } catch (IllegalStateException e) {
+            //expected
+        }
 	}
 
     public void test_inflate$BII1() {
@@ -517,6 +533,7 @@ public class InflaterTest extends junit.
         assertEquals(0,inf.getTotalOut());
         assertEquals(0,inf.getBytesRead());
         assertEquals(0,inf.getBytesWritten());
+        assertEquals(1, inf.getAdler());
 	}
 
 	/**
@@ -689,13 +706,13 @@ public class InflaterTest extends junit.
     protected void setUp() {
 		try {
 			java.io.InputStream infile = Support_Resources
-					.getStream("hyts_compressD.txt");
+					.getStream("hyts_compressD.bin");
 			BufferedInputStream inflatIP = new BufferedInputStream(infile);
 			inflatIP.read(outPutBuff1, 0, outPutBuff1.length);
 			inflatIP.close();
 
 			java.io.InputStream infile2 = Support_Resources
-					.getStream("hyts_compDiction.txt");
+					.getStream("hyts_compDiction.bin");
 			BufferedInputStream inflatIP2 = new BufferedInputStream(infile2);
 			inflatIP2.read(outPutDiction, 0, outPutDiction.length);
 			inflatIP2.close();
@@ -924,6 +941,12 @@ public class InflaterTest extends junit.
             // expected.
         }
         infl1.end();
+        try{
+            infl1.setDictionary(dictionary2.getBytes());
+            fail("IllegalStateException expected");
+        }catch(IllegalStateException ise){
+            //expected
+        }
     }
 
     public void testSetDictionary$BII() throws Exception {
@@ -992,6 +1015,7 @@ public class InflaterTest extends junit.
         Inflater infl1 = new Inflater();
         Inflater infl2 = new Inflater();
         Inflater infl3 = new Inflater();
+        Inflater infl4 = new Inflater();
 
         byte[] result = new byte[100];
         int decLen;
@@ -1026,6 +1050,62 @@ public class InflaterTest extends junit.
         infl3.end();
         assertEquals(inputString, new String(result, 0, decLen));
 
+        //exception test
+        infl4.setInput(output3, 0, dataLen3);
+        decLen = infl4.inflate(result);
+        assertTrue(infl4.needsDictionary());
+
+        try{
+            infl4.setDictionary(dictionary1.getBytes(), 4, 4);
+            fail("ArrayIndexOutOfBoundsException expected");
+        }catch(ArrayIndexOutOfBoundsException aiob){
+            //expected
+        }
     }
 
+    public void testExceptions() throws Exception {
+        byte byteArray[] = { 5, 2, 3, 7, 8 };
+
+        int r = 0;
+        Inflater inflate = new Inflater();
+        inflate.setInput(byteArray);
+        inflate.end();
+        
+        try{
+            inflate.getAdler();
+            fail("IllegalStateException expected");
+        }catch(IllegalStateException ise){
+            //expected
+        }
+
+        try{
+            inflate.getBytesRead();
+            fail("NullPointerException expected");
+        }catch(NullPointerException ise){
+            //expected
+        }
+        
+        try{
+            inflate.getBytesWritten();
+            fail("NullPointerException expected");
+        }catch(NullPointerException ise){
+            //expected
+        }
+         
+        
+        try{
+            inflate.getTotalIn();
+            fail("IllegalStateException expected");
+        }catch(IllegalStateException ise){
+            //expected
+        }
+        
+        try{
+            inflate.getTotalOut();
+            fail("IllegalStateException expected");
+        }catch(IllegalStateException ise){
+            //expected
+        }
+         
+    }
 }

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/ZipFileTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/ZipFileTest.java?rev=986497&r1=986496&r2=986497&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/ZipFileTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/ZipFileTest.java Tue Aug 17 21:36:10 2010
@@ -49,11 +49,16 @@ public class ZipFileTest extends junit.f
 	private ZipFile zfile;
 
 	/**
+     * @throws IOException 
 	 * @tests java.util.zip.ZipFile#ZipFile(java.io.File)
 	 */
-	public void test_ConstructorLjava_io_File() {
+	public void test_ConstructorLjava_io_File() throws IOException {
 		// Test for method java.util.zip.ZipFile(java.io.File)
-		assertTrue("Used to test", true);
+        zfile.close(); // about to reopen the same temp file
+        File file = new File(tempFileName);
+        ZipFile zip = new ZipFile(file);
+        assertTrue("Zip should exist", file.exists());
+        zip.close();        
 	}
 
 	/**
@@ -66,6 +71,14 @@ public class ZipFileTest extends junit.f
                                           | ZipFile.OPEN_READ);
                 zip.close();
                 assertTrue("Zip should not exist", !file.exists());
+
+                file = new File(tempFileName);
+                try{
+                    zip = new ZipFile(file, 3);  //passing unkown argument
+                    fail("Should throw IllegalArgumentException");
+                }catch(IllegalArgumentException iae ){
+                    //expected
+                }
 	}
 
 	/**

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/auth/src/main/java/common/org/apache/harmony/auth/internal/nls/messages.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/auth/src/main/java/common/org/apache/harmony/auth/internal/nls/messages.properties?rev=986497&r1=986496&r2=986497&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/auth/src/main/java/common/org/apache/harmony/auth/internal/nls/messages.properties (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/auth/src/main/java/common/org/apache/harmony/auth/internal/nls/messages.properties Tue Aug 17 21:36:10 2010
@@ -117,3 +117,5 @@ auth.62=Protected authentication path mu
 auth.63=Failure to get KeyStore or KeyStore Password
 auth.64=KerberosErrorMessage encoder is not implemented
 auth.65=Not implemented
+auth.66=Cannot find certificate path for {0}
+auth.67=Cannot find private key for {0}

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/auth/src/main/java/common/org/apache/harmony/auth/module/KeyStoreLoginModule.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/auth/src/main/java/common/org/apache/harmony/auth/module/KeyStoreLoginModule.java?rev=986497&r1=986496&r2=986497&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/auth/src/main/java/common/org/apache/harmony/auth/module/KeyStoreLoginModule.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/auth/src/main/java/common/org/apache/harmony/auth/module/KeyStoreLoginModule.java Tue Aug 17 21:36:10 2010
@@ -294,9 +294,9 @@ public class KeyStoreLoginModule impleme
             Certificate[] certificates = keyStore
                     .getCertificateChain(keyStoreAlias);
             if (null == certificates || certificates.length == 0) {
-                throw new FailedLoginException(
-                        "Cannot find certificate path for " + keyStoreAlias);
-            }
+                //auth.66=Cannot find certificate path for {0}
+                throw new FailedLoginException(Messages.getString("auth.66", keyStoreAlias)); //$NON-NLS-1$
+                }
             List<Certificate> list = new ArrayList<Certificate>(
                     certificates.length);
             for (int i = 0; i < certificates.length; i++) {
@@ -312,9 +312,9 @@ public class KeyStoreLoginModule impleme
 
             Key privateKey = keyStore.getKey(keyStoreAlias, privateKeyPassword);
             if (null == privateKey || !(privateKey instanceof PrivateKey)) {
-                throw new FailedLoginException("Cannot find private key for "
-                        + keyStoreAlias);
-            }
+                //auth.67=Cannot find private key for {0}
+                throw new FailedLoginException(Messages.getString("auth.67", keyStoreAlias)); //$NON-NLS-1$
+               }
             privateCredential = new X500PrivateCredential(firstCertificate,
                     (PrivateKey) privateKey, keyStoreAlias);
 

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/java/common/java/awt/Color.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/java/common/java/awt/Color.java?rev=986497&r1=986496&r2=986497&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/java/common/java/awt/Color.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/java/common/java/awt/Color.java Tue Aug 17 21:36:10 2010
@@ -163,10 +163,10 @@ public class Color implements Paint, Ser
 
         frgbvalue = cs.toRGB(fvalue);
 
-        value =  ((int)(frgbvalue[2]*255 + 0.5))    |
-                (((int)(frgbvalue[1]*255 + 0.5)) << 8 )  |
-                (((int)(frgbvalue[0]*255 + 0.5)) << 16 ) |
-                (((int)(falpha*255 + 0.5)) << 24 );
+        value =  ((int)(frgbvalue[2]*255))    |
+                (((int)(frgbvalue[1]*255)) << 8 )  |
+                (((int)(frgbvalue[0]*255)) << 16 ) |
+                (((int)(falpha*255)) << 24 );
     }
 
     public Color(int rgba, boolean hasAlpha) {

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/imageio/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/imageio/build.xml?rev=986497&r1=986496&r2=986497&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/imageio/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/imageio/build.xml Tue Aug 17 21:36:10 2010
@@ -178,6 +178,7 @@ ${line.separator}For Fedora try: yum ins
         <copy file="make/run-test.xml" tofile="${tests.hdk.dir}/build.xml" />
         
         <hy.jar.bin destfile="${tests.hdk.dir}/${hy.module}_tests.jar">
+            <metainf dir="src/test/java/META-INF" />
             <fileset dir="${hy.build.mod}/test/api" />
         </hy.jar.bin>
 

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/imageio/src/main/java/javax/imageio/ImageIO.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/imageio/src/main/java/javax/imageio/ImageIO.java?rev=986497&r1=986496&r2=986497&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/imageio/src/main/java/javax/imageio/ImageIO.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/imageio/src/main/java/javax/imageio/ImageIO.java Tue Aug 17 21:36:10 2010
@@ -44,9 +44,8 @@ public final class ImageIO {
     private ImageIO() {}
     
 
-    public static void scanForPlugins() throws NotImplementedException {
-        // TODO: implement
-        throw new NotImplementedException();
+    public static void scanForPlugins() {
+        registry.registerApplicationClasspathSpis();
     }
 
     public static void setUseCache(boolean useCache) {
@@ -77,7 +76,9 @@ public final class ImageIO {
         while (it.hasNext()) {
             ImageInputStreamSpi spi = it.next();
             if (spi.getInputClass().isInstance(input)) {
-                return spi.createInputStreamInstance(input);
+                return getUseCache() ?
+                		spi.createInputStreamInstance(input, true, getCacheDirectory()) :
+                		spi.createInputStreamInstance(input);
             }
         }
         return null;
@@ -94,8 +95,9 @@ public final class ImageIO {
         while (it.hasNext()) {
             ImageOutputStreamSpi spi = it.next();
             if (spi.getOutputClass().isInstance(output)) {
-                // todo - use getUseCache and getCacheDir here
-                return spi.createOutputStreamInstance(output);
+            	return getUseCache() ?
+            			spi.createOutputStreamInstance(output, true, getCacheDirectory()) :
+            		    spi.createOutputStreamInstance(output);
             }
         }
         return null;

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/imageio/src/main/java/javax/imageio/plugins/jpeg/JPEGQTable.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/imageio/src/main/java/javax/imageio/plugins/jpeg/JPEGQTable.java?rev=986497&r1=986496&r2=986497&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/imageio/src/main/java/javax/imageio/plugins/jpeg/JPEGQTable.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/imageio/src/main/java/javax/imageio/plugins/jpeg/JPEGQTable.java Tue Aug 17 21:36:10 2010
@@ -97,7 +97,18 @@ public class JPEGQTable {
 
     @Override
     public String toString() {
-        //-- TODO more informative info
-        return "JPEGQTable";
+    	StringBuilder sb = new StringBuilder();
+    	
+    	sb.append("JPEGQTable:\n");
+    	for (int i = 0; i < 8; i++) {
+    		sb.append('\t');
+    		for (int j = 0; j < 8; j++) {
+    			sb.append(theTable[i*8+j]);
+    			sb.append(' ');
+    		}
+    		sb.append('\n');
+    	}
+    	
+        return sb.toString();
     }
 }

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/imageio/src/main/java/javax/imageio/spi/IIORegistry.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/imageio/src/main/java/javax/imageio/spi/IIORegistry.java?rev=986497&r1=986496&r2=986497&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/imageio/src/main/java/javax/imageio/spi/IIORegistry.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/imageio/src/main/java/javax/imageio/spi/IIORegistry.java Tue Aug 17 21:36:10 2010
@@ -19,7 +19,13 @@
  */
 package javax.imageio.spi;
 
+import java.security.AccessController;
+import java.security.PrivilegedAction;
 import java.util.Arrays;
+import java.util.Collections;
+import java.util.IdentityHashMap;
+import java.util.Iterator;
+import java.util.Map;
 
 import org.apache.harmony.x.imageio.plugins.gif.GIFImageReaderSpi;
 import org.apache.harmony.x.imageio.plugins.jpeg.JPEGImageReaderSpi;
@@ -35,7 +41,8 @@ import org.apache.harmony.x.imageio.spi.
 
 public final class IIORegistry extends ServiceRegistry {
 
-    private static IIORegistry   instance;
+    private static Map<ThreadGroup, IIORegistry> instances = 
+    	Collections.synchronizedMap(new IdentityHashMap<ThreadGroup, IIORegistry>());
 
     private static final Class[] CATEGORIES = new Class[] {
                     javax.imageio.spi.ImageWriterSpi.class,
@@ -65,17 +72,30 @@ public final class IIORegistry extends S
     }
 
     public static IIORegistry getDefaultInstance() {
-        // TODO implement own instance for each ThreadGroup (see also
-        // ThreadLocal)
-        synchronized (IIORegistry.class) {
-            if (instance == null) {
-                instance = new IIORegistry();
-            }
-            return instance;
-        }
+        ThreadGroup tg = Thread.currentThread().getThreadGroup();
+        synchronized (instances) {
+        	IIORegistry instance = instances.get(tg);
+        	if (instance == null) {
+        		synchronized(IIORegistry.class) {
+        			instance = new IIORegistry();
+        		}
+            	instances.put(tg, instance);
+        	}
+        	return instance;
+        }    
     }
 
-    public void registerApplicationClasspathSpis() {
-        // -- TODO implement for non-builtin plugins
+    @SuppressWarnings("unchecked")
+	public void registerApplicationClasspathSpis() {
+        AccessController.doPrivileged(new PrivilegedAction() {
+			public Object run() {
+				Iterator<Class<?>> categories = getCategories();
+				while (categories.hasNext()) {
+					Iterator providers = lookupProviders(categories.next());
+					registerServiceProviders(providers);
+				}
+				return this;
+			}
+        });
     }
 }

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/imageio/src/main/java/javax/imageio/spi/ServiceRegistry.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/imageio/src/main/java/javax/imageio/spi/ServiceRegistry.java?rev=986497&r1=986496&r2=986497&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/imageio/src/main/java/javax/imageio/spi/ServiceRegistry.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/imageio/src/main/java/javax/imageio/spi/ServiceRegistry.java Tue Aug 17 21:36:10 2010
@@ -19,15 +19,17 @@
  */
 package javax.imageio.spi;
 
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.net.URL;
 import java.util.*;
 import java.util.Map.Entry;
 
 import org.apache.harmony.luni.util.NotImplementedException;
 import org.apache.harmony.x.imageio.internal.nls.Messages;
 
-/**
- * TODO: add all the methods from the spec
- */
 public class ServiceRegistry {
 
     CategoriesMap categories = new CategoriesMap(this);
@@ -42,9 +44,8 @@ public class ServiceRegistry {
         }
     }
 
-    public static <T> Iterator<T> lookupProviders(Class<T> providerClass, ClassLoader loader) throws NotImplementedException {
-        // TODO: implement
-        throw new NotImplementedException();
+    public static <T> Iterator<T> lookupProviders(Class<T> providerClass, ClassLoader loader) {
+        return new LookupProvidersIterator(providerClass, loader);
     }
 
     public static <T> Iterator<T> lookupProviders(Class<T> providerClass) {
@@ -83,9 +84,8 @@ public class ServiceRegistry {
         return (Iterator<T>) categories.getProviders(category, useOrdering);
     }
 
-    public <T> T getServiceProviderByClass(Class<T> providerClass) throws NotImplementedException {
-        // TODO: implement
-        throw new NotImplementedException();
+    public <T> T getServiceProviderByClass(Class<T> providerClass) {
+        return categories.getServiceProviderByClass(providerClass);
     }
 
     public <T> boolean setOrdering(Class<T> category, T firstProvider, T secondProvider) {
@@ -165,7 +165,6 @@ public class ServiceRegistry {
             return providers.unsetOrdering(firstProvider, secondProvider);
         }
         
-        //-- TODO: useOrdering
         Iterator<?> getProviders(Class<?> category, boolean useOrdering) {
             ProvidersMap providers = categories.get(category);
             if (null == providers) {
@@ -173,6 +172,18 @@ public class ServiceRegistry {
             }
             return providers.getProviders(useOrdering);
         }
+        
+        <T> T getServiceProviderByClass(Class<T> providerClass) {
+        	for (Map.Entry<Class<?>, ProvidersMap> e : categories.entrySet()) {
+        		if (e.getKey().isAssignableFrom(providerClass)) {
+        			T provider = e.getValue().getServiceProviderByClass(providerClass);
+        			if (provider != null) {
+        				return provider;
+        			}
+        		}
+        	}
+        	return null;
+        }
 
         Iterator<Class<?>> list() {
             return categories.keySet().iterator();
@@ -343,6 +354,11 @@ public class ServiceRegistry {
             return providers.values().iterator();
         }
         
+        @SuppressWarnings("unchecked")
+		<T> T getServiceProviderByClass(Class<T> providerClass) {
+        	return (T)providers.get(providerClass);
+        }
+        
         public <T> boolean setOrdering(T firstProvider, T secondProvider) {
             if (firstProvider == secondProvider) {
                 throw new IllegalArgumentException(Messages.getString("imageio.98"));
@@ -549,4 +565,133 @@ public class ServiceRegistry {
             throw new UnsupportedOperationException();
         }
     }
+    
+    static class LookupProvidersIterator<T> implements Iterator {
+
+        private Set<String> providerNames = new HashSet<String>();
+        private Iterator<String> it = null;
+        private ClassLoader loader = null;
+        
+        public LookupProvidersIterator(Class<T> providerClass, ClassLoader loader) {
+            this.loader = loader;
+            
+            Enumeration<URL> e = null;
+            try {
+                e = loader.getResources("META-INF/services/"+providerClass.getName()); //$NON-NLS-1$
+                while (e.hasMoreElements()) {
+                    Set<String> names = parse((URL)e.nextElement());
+                    providerNames.addAll(names);
+                }
+            } catch (IOException e1) {
+                // Ignored
+            }
+
+            it = providerNames.iterator();
+        }
+        
+        /*
+         * Parse the provider-configuration file as specified 
+         * @see <a href="http://java.sun.com/j2se/1.5.0/docs/guide/jar/jar.html#Provider Configuration File">JAR File Specification</a>
+         */
+        private Set<String> parse(URL u) {
+            InputStream input = null;
+            BufferedReader reader = null;
+            Set<String> names = new HashSet<String>();
+            try {
+                input = u.openStream();
+                reader = new BufferedReader(new InputStreamReader(input, "utf-8")); //$NON-NLS-1$
+                
+                String line;
+                while ((line = reader.readLine()) != null) {
+                    // The comment character is '#' (0x23)
+                    // on each line all characters following the first comment character are ignored
+                    int sharpIndex = line.indexOf('#');
+                    if (sharpIndex>=0) {
+                        line = line.substring(0, sharpIndex);
+                    }
+                    
+                    // Whitespaces are ignored
+                    line = line.trim();
+                    
+                    if (line.length()>0) {
+                        // a java class name, check if identifier correct
+                        char[] namechars = line.toCharArray();
+                        for (int i = 0; i < namechars.length; i++) {
+                            if (!(Character.isJavaIdentifierPart(namechars[i]) || namechars[i] == '.')) {
+                                throw new ServiceConfigurationError(Messages.getString("imageio.99", line));
+                            }
+                        }
+                        names.add(line);
+                    }
+                }
+            } catch (IOException e) {
+                throw new ServiceConfigurationError(e.toString());
+            } finally {
+                try {
+                    if (reader != null) {
+                        reader.close();
+                    }
+                    if (input != null) {
+                        input.close();
+                    }
+                } catch (IOException e) {
+                    throw new ServiceConfigurationError(e.toString());
+                }
+            }
+            
+            return names;
+        }
+        
+        public boolean hasNext() {
+            return it.hasNext();
+        }
+
+        public Object next() {
+            if (!hasNext()) {
+                throw new NoSuchElementException();
+            }
+            
+            String name = (String)it.next();
+            try {
+                return Class.forName(name, true, loader).newInstance();
+            } catch (Exception e) {
+                throw new ServiceConfigurationError(e.toString());
+            }
+        }
+
+        public void remove() {
+            throw new UnsupportedOperationException();   
+        }
+    }
+    
+    /**
+     * An Error that can be thrown when something wrong occurs in loading a service
+     * provider.
+     */
+    static class ServiceConfigurationError extends Error {
+        
+        private static final long serialVersionUID = 74132770414881L;
+
+        /**
+         * The constructor
+         * 
+         * @param msg
+         *            the message of this error
+         */
+        public ServiceConfigurationError(String msg) {
+            super(msg);
+        }
+
+        /**
+         * The constructor
+         * 
+         * @param msg
+         *            the message of this error
+         * @param cause 
+         *            the cause of this error
+         */
+        public ServiceConfigurationError(String msg, Throwable cause) {
+            super(msg, cause);
+        }
+    }
 }

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/imageio/src/main/java/javax/imageio/stream/ImageInputStreamImpl.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/imageio/src/main/java/javax/imageio/stream/ImageInputStreamImpl.java?rev=986497&r1=986496&r2=986497&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/imageio/src/main/java/javax/imageio/stream/ImageInputStreamImpl.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/imageio/src/main/java/javax/imageio/stream/ImageInputStreamImpl.java Tue Aug 17 21:36:10 2010
@@ -35,6 +35,7 @@ public abstract class ImageInputStreamIm
 	private boolean closed = false;
 
 	private final PositionStack posStack = new PositionStack();
+	private final PositionStack offsetStack = new PositionStack();
 	private final byte[] buff = new byte[8];
 
 	public ImageInputStreamImpl() {
@@ -186,11 +187,14 @@ public abstract class ImageInputStreamIm
 	}
 
 	public String readUTF() throws IOException {
+		ByteOrder byteOrder = getByteOrder();
+		setByteOrder(ByteOrder.BIG_ENDIAN);
 		final int size = readUnsignedShort();
 		final byte[] buf = new byte[size];
 		final char[] out = new char[size];
 
 		readFully(buf, 0, size);
+		setByteOrder(byteOrder);
 		//return new DataInputStream(new ByteArrayInputStream(buff)).readUTF();
 		return Util.convertUTF8WithBuf(buf, out, 0, size);
 	}
@@ -360,6 +364,7 @@ public abstract class ImageInputStreamIm
 	public void mark() {
 		try {
 			posStack.push(getStreamPosition());
+			offsetStack.push(getBitOffset());
 		} catch (IOException e) {
 			e.printStackTrace();
 			throw new RuntimeException(Messages.getString("imageio.11"));
@@ -367,14 +372,14 @@ public abstract class ImageInputStreamIm
 	}
 
 	public void reset() throws IOException {
-		// -- TODO bit pos
-		if (!posStack.isEmpty()) {
+		if (!posStack.isEmpty() && !offsetStack.isEmpty()) {
 			long p = posStack.pop();
 			if (p < flushedPos) {
 				throw new IOException(
 						Messages.getString("imageio.12"));
 			}
 			seek(p);
+			setBitOffset((int)offsetStack.pop());
 		}
 	}
 

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/imageio/src/main/java/javax/imageio/stream/ImageOutputStreamImpl.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/imageio/src/main/java/javax/imageio/stream/ImageOutputStreamImpl.java?rev=986497&r1=986496&r2=986497&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/imageio/src/main/java/javax/imageio/stream/ImageOutputStreamImpl.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/imageio/src/main/java/javax/imageio/stream/ImageOutputStreamImpl.java Tue Aug 17 21:36:10 2010
@@ -124,10 +124,13 @@ public abstract class ImageOutputStreamI
 	}
 
 	public void writeUTF(String s) throws IOException {
+		ByteOrder byteOrder = getByteOrder();
+		setByteOrder(ByteOrder.BIG_ENDIAN);
 		ByteArrayOutputStream baos = new ByteArrayOutputStream();
 
 		new DataOutputStream(baos).writeUTF(s);
 		write(baos.toByteArray(), 0, baos.size());
+		setByteOrder(byteOrder);
 	}
 
 	public void writeShorts(short[] s, int off, int len) throws IOException {

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/imageio/src/main/java/org/apache/harmony/x/imageio/internal/nls/messages.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/imageio/src/main/java/org/apache/harmony/x/imageio/internal/nls/messages.properties?rev=986497&r1=986496&r2=986497&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/imageio/src/main/java/org/apache/harmony/x/imageio/internal/nls/messages.properties (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/imageio/src/main/java/org/apache/harmony/x/imageio/internal/nls/messages.properties Tue Aug 17 21:36:10 2010
@@ -167,4 +167,5 @@ imageio.95=Input is not an instance of j
 imageio.96=Writer cannot be null
 imageio.97=Reader cannot be null
 imageio.98=Ordered providers cannot be equal
+imageio.99=Illegal provider-class name: {0}
 



Mime
View raw message