harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From qi...@apache.org
Subject svn commit: r721077 [1/12] - in /harmony/enhanced/classlib/branches/java6: ./ depends/files/ depends/jars/ depends/manifests/asm-3.1/ depends/manifests/asm-3.1/META-INF/ depends/manifests/bcel-5.2/ make/ modules/accessibility/ modules/accessibility/src...
Date Thu, 27 Nov 2008 05:10:42 GMT
Author: qiuxx
Date: Wed Nov 26 21:10:32 2008
New Revision: 721077

URL: http://svn.apache.org/viewvc?rev=721077&view=rev
Log:
Merge updates from classlib trunk@713673 since r693025

Added:
    harmony/enhanced/classlib/branches/java6/depends/manifests/asm-3.1/
      - copied from r713673, harmony/enhanced/classlib/trunk/depends/manifests/asm-3.1/
    harmony/enhanced/classlib/branches/java6/depends/manifests/asm-3.1/META-INF/
      - copied from r713673, harmony/enhanced/classlib/trunk/depends/manifests/asm-3.1/META-INF/
    harmony/enhanced/classlib/branches/java6/depends/manifests/asm-3.1/META-INF/MANIFEST.MF
      - copied unchanged from r713673, harmony/enhanced/classlib/trunk/depends/manifests/asm-3.1/META-INF/MANIFEST.MF
    harmony/enhanced/classlib/branches/java6/modules/archive/src/test/java-internal/
      - copied from r713673, harmony/enhanced/classlib/trunk/modules/archive/src/test/java-internal/
    harmony/enhanced/classlib/branches/java6/modules/archive/src/test/java-internal/org/
      - copied from r713673, harmony/enhanced/classlib/trunk/modules/archive/src/test/java-internal/org/
    harmony/enhanced/classlib/branches/java6/modules/archive/src/test/java-internal/org/apache/
      - copied from r713673, harmony/enhanced/classlib/trunk/modules/archive/src/test/java-internal/org/apache/
    harmony/enhanced/classlib/branches/java6/modules/archive/src/test/java-internal/org/apache/harmony/
      - copied from r713673, harmony/enhanced/classlib/trunk/modules/archive/src/test/java-internal/org/apache/harmony/
    harmony/enhanced/classlib/branches/java6/modules/archive/src/test/java-internal/org/apache/harmony/archive/
      - copied from r713673, harmony/enhanced/classlib/trunk/modules/archive/src/test/java-internal/org/apache/harmony/archive/
    harmony/enhanced/classlib/branches/java6/modules/archive/src/test/java-internal/org/apache/harmony/archive/util/
      - copied from r713673, harmony/enhanced/classlib/trunk/modules/archive/src/test/java-internal/org/apache/harmony/archive/util/
    harmony/enhanced/classlib/branches/java6/modules/archive/src/test/java-internal/org/apache/harmony/archive/util/UtilTest.java
      - copied unchanged from r713673, harmony/enhanced/classlib/trunk/modules/archive/src/test/java-internal/org/apache/harmony/archive/util/UtilTest.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/make/exclude.common
      - copied unchanged from r713673, harmony/enhanced/classlib/trunk/modules/concurrent/make/exclude.common
    harmony/enhanced/classlib/branches/java6/modules/concurrent/make/exclude.linux.x86.drl
      - copied unchanged from r713673, harmony/enhanced/classlib/trunk/modules/concurrent/make/exclude.linux.x86.drl
    harmony/enhanced/classlib/branches/java6/modules/concurrent/make/exclude.linux.x86.drl.interm
      - copied unchanged from r713673, harmony/enhanced/classlib/trunk/modules/concurrent/make/exclude.linux.x86.drl.interm
    harmony/enhanced/classlib/branches/java6/modules/concurrent/make/exclude.linux.x86.ibm
      - copied unchanged from r713673, harmony/enhanced/classlib/trunk/modules/concurrent/make/exclude.linux.x86.ibm
    harmony/enhanced/classlib/branches/java6/modules/concurrent/make/exclude.linux.x86_64.drl
      - copied unchanged from r713673, harmony/enhanced/classlib/trunk/modules/concurrent/make/exclude.linux.x86_64.drl
    harmony/enhanced/classlib/branches/java6/modules/concurrent/make/exclude.linux.x86_64.ibm
      - copied unchanged from r713673, harmony/enhanced/classlib/trunk/modules/concurrent/make/exclude.linux.x86_64.ibm
    harmony/enhanced/classlib/branches/java6/modules/concurrent/make/exclude.windows.x86.drl
      - copied unchanged from r713673, harmony/enhanced/classlib/trunk/modules/concurrent/make/exclude.windows.x86.drl
    harmony/enhanced/classlib/branches/java6/modules/concurrent/make/exclude.windows.x86.drl.interm
      - copied unchanged from r713673, harmony/enhanced/classlib/trunk/modules/concurrent/make/exclude.windows.x86.drl.interm
    harmony/enhanced/classlib/branches/java6/modules/concurrent/make/exclude.windows.x86.ibm
      - copied unchanged from r713673, harmony/enhanced/classlib/trunk/modules/concurrent/make/exclude.windows.x86.ibm
    harmony/enhanced/classlib/branches/java6/modules/concurrent/make/exclude.windows.x86_64.drl
      - copied unchanged from r713673, harmony/enhanced/classlib/trunk/modules/concurrent/make/exclude.windows.x86_64.drl
    harmony/enhanced/classlib/branches/java6/modules/jndi/src/test/java/org/apache/harmony/jndi/internal/
      - copied from r713673, harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/org/apache/harmony/jndi/internal/
    harmony/enhanced/classlib/branches/java6/modules/jndi/src/test/java/org/apache/harmony/jndi/internal/parser/
      - copied from r713673, harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/org/apache/harmony/jndi/internal/parser/
    harmony/enhanced/classlib/branches/java6/modules/jndi/src/test/java/org/apache/harmony/jndi/internal/parser/LdapRdnParserTest.java
      - copied unchanged from r713673, harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/org/apache/harmony/jndi/internal/parser/LdapRdnParserTest.java
    harmony/enhanced/classlib/branches/java6/modules/jndi/src/test/java/org/apache/harmony/jndi/tests/javax/naming/RefAddrTest.java
      - copied unchanged from r713673, harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/org/apache/harmony/jndi/tests/javax/naming/RefAddrTest.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/Proxy2Test.java
      - copied unchanged from r713673, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/Proxy2Test.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/internal/process/
      - copied from r713673, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/internal/process/
    harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/internal/process/SystemProcessTest.java
      - copied unchanged from r713673, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/internal/process/SystemProcessTest.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/test/resources/org/apache/harmony/luni/tests/ObjectStreamClassTest.jar
      - copied unchanged from r713673, harmony/enhanced/classlib/trunk/modules/luni/src/test/resources/org/apache/harmony/luni/tests/ObjectStreamClassTest.jar
    harmony/enhanced/classlib/branches/java6/modules/nio_char/make/excludesfile
      - copied unchanged from r713673, harmony/enhanced/classlib/trunk/modules/nio_char/make/excludesfile
    harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/native/niochar/windows/hyniochar.def
      - copied unchanged from r713673, harmony/enhanced/classlib/trunk/modules/nio_char/src/main/native/niochar/windows/hyniochar.def
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/Pack200ClassReader.java
      - copied unchanged from r713673, harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/Pack200ClassReader.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/test/java/org/apache/harmony/pack200/tests/ArchiveTest.java
      - copied unchanged from r713673, harmony/enhanced/classlib/trunk/modules/pack200/src/test/java/org/apache/harmony/pack200/tests/ArchiveTest.java
Removed:
    harmony/enhanced/classlib/branches/java6/depends/manifests/bcel-5.2/
    harmony/enhanced/classlib/branches/java6/modules/archive/src/test/java/org/apache/harmony/archive/util/
    harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/native/niochar/windows/hycharset.def
Modified:
    harmony/enhanced/classlib/branches/java6/THIRD_PARTY_NOTICES.txt
    harmony/enhanced/classlib/branches/java6/depends/files/bootclasspath.properties
    harmony/enhanced/classlib/branches/java6/depends/jars/   (props changed)
    harmony/enhanced/classlib/branches/java6/make/build-java.xml
    harmony/enhanced/classlib/branches/java6/make/depends.properties
    harmony/enhanced/classlib/branches/java6/make/depends.xml
    harmony/enhanced/classlib/branches/java6/modules/accessibility/.classpath
    harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleBundle.java
    harmony/enhanced/classlib/branches/java6/modules/accessibility/src/test/api/java/common/javax/accessibility/AccessibleStateSetTest.java
    harmony/enhanced/classlib/branches/java6/modules/annotation/.classpath
    harmony/enhanced/classlib/branches/java6/modules/applet/.classpath
    harmony/enhanced/classlib/branches/java6/modules/archive/.classpath
    harmony/enhanced/classlib/branches/java6/modules/archive/build.xml
    harmony/enhanced/classlib/branches/java6/modules/archive/make/hyproperties.xml
    harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/java/util/jar/JarEntry.java
    harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/org/apache/harmony/archive/util/Util.java
    harmony/enhanced/classlib/branches/java6/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/GZIPInputStreamTest.java
    harmony/enhanced/classlib/branches/java6/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/GZIPOutputStreamTest.java
    harmony/enhanced/classlib/branches/java6/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/ZipOutputStreamTest.java
    harmony/enhanced/classlib/branches/java6/modules/auth/.classpath
    harmony/enhanced/classlib/branches/java6/modules/awt/.classpath
    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/java/awt/MenuComponent.java
    harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/font/FontManager.java
    harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/fontlib/shared/Environment.cpp
    harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/fontlib/shared/ParsingTables.cpp
    harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/fontlib/shared/T1Font.cpp
    harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/fontlib/shared/TTFont.cpp
    harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/gl/windows/GDIBlitter.cpp
    harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/gl/windows/WinGraphicsEnvironment.cpp
    harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/win32wrapper/windows/WinDataTransfer.cpp
    harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/winfont/windows/winFont.cpp
    harmony/enhanced/classlib/branches/java6/modules/awt/src/test/impl/boot/java/awt/ComponentSerialize.java
    harmony/enhanced/classlib/branches/java6/modules/awt/src/test/impl/boot/java/awt/Tools.java
    harmony/enhanced/classlib/branches/java6/modules/awt/src/test/impl/boot/java/awt/datatransfer/DataFlavorRTest.java
    harmony/enhanced/classlib/branches/java6/modules/beans/.classpath
    harmony/enhanced/classlib/branches/java6/modules/beans/src/main/java/java/beans/BeanDescriptor.java
    harmony/enhanced/classlib/branches/java6/modules/beans/src/main/java/java/beans/EventSetDescriptor.java
    harmony/enhanced/classlib/branches/java6/modules/beans/src/main/java/java/beans/IntrospectionException.java
    harmony/enhanced/classlib/branches/java6/modules/beans/src/main/java/java/beans/StandardBeanInfo.java
    harmony/enhanced/classlib/branches/java6/modules/beans/src/main/java/java/beans/XMLEncoder.java
    harmony/enhanced/classlib/branches/java6/modules/beans/src/main/java/java/beans/beancontext/BeanContextEvent.java
    harmony/enhanced/classlib/branches/java6/modules/beans/src/main/java/java/beans/beancontext/BeanContextServiceAvailableEvent.java
    harmony/enhanced/classlib/branches/java6/modules/beans/src/main/java/java/beans/beancontext/BeanContextServiceRevokedEvent.java
    harmony/enhanced/classlib/branches/java6/modules/beans/src/main/java/java/beans/beancontext/BeanContextServicesSupport.java
    harmony/enhanced/classlib/branches/java6/modules/beans/src/main/java/java/beans/beancontext/BeanContextSupport.java
    harmony/enhanced/classlib/branches/java6/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/BeansTest.java
    harmony/enhanced/classlib/branches/java6/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/IntrospectorTest.java
    harmony/enhanced/classlib/branches/java6/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/XMLEncoderTest.java
    harmony/enhanced/classlib/branches/java6/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/beancontext/BeanContextChildSupportTest.java
    harmony/enhanced/classlib/branches/java6/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/beancontext/BeanContextEventTest.java
    harmony/enhanced/classlib/branches/java6/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/beancontext/BeanContextMembershipEventTest.java
    harmony/enhanced/classlib/branches/java6/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/beancontext/BeanContextServiceAvailableEventTest.java
    harmony/enhanced/classlib/branches/java6/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/beancontext/BeanContextServiceRevokedEventTest.java
    harmony/enhanced/classlib/branches/java6/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/beancontext/BeanContextServicesSupportTest.java
    harmony/enhanced/classlib/branches/java6/modules/beans/src/test/resources/xml/MockBean4Codec_BornFriendChange.xml
    harmony/enhanced/classlib/branches/java6/modules/beans/src/test/resources/xml/MockBean4Codec_ManyChanges.xml
    harmony/enhanced/classlib/branches/java6/modules/beans/src/test/resources/xml/MockBean4Codec_ManyChanges_2.xml
    harmony/enhanced/classlib/branches/java6/modules/beans/src/test/resources/xml/MockBean4Codec_NoChange.xml
    harmony/enhanced/classlib/branches/java6/modules/beans/src/test/resources/xml/MockBean4Owner_SetOwner.xml
    harmony/enhanced/classlib/branches/java6/modules/beans/src/test/resources/xml/MockBean4Owner_SetOwnerWithWriteStatement.xml
    harmony/enhanced/classlib/branches/java6/modules/beans/src/test/resources/xml/MockBean4StaticField.xml
    harmony/enhanced/classlib/branches/java6/modules/beans/src/test/resources/xml/MockBean4StaticField_Original.xml
    harmony/enhanced/classlib/branches/java6/modules/beans/src/test/resources/xml/Test6.xml
    harmony/enhanced/classlib/branches/java6/modules/beans/src/test/resources/xml/Test7.xml
    harmony/enhanced/classlib/branches/java6/modules/beans/src/test/resources/xml/bad_int.xml
    harmony/enhanced/classlib/branches/java6/modules/beans/src/test/resources/xml/int.xml
    harmony/enhanced/classlib/branches/java6/modules/beans/src/test/resources/xml/null.xml
    harmony/enhanced/classlib/branches/java6/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/mock/MockAppletBean2.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/.classpath
    harmony/enhanced/classlib/branches/java6/modules/crypto/.classpath
    harmony/enhanced/classlib/branches/java6/modules/imageio/.classpath
    harmony/enhanced/classlib/branches/java6/modules/instrument/.classpath
    harmony/enhanced/classlib/branches/java6/modules/jndi/.classpath
    harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/AuthenticationException.java
    harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/AuthenticationNotSupportedException.java
    harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/CommunicationException.java
    harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/ConfigurationException.java
    harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/ContextNotEmptyException.java
    harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/InsufficientResourcesException.java
    harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/InterruptedNamingException.java
    harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/InvalidNameException.java
    harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/LimitExceededException.java
    harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/LinkLoopException.java
    harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/LinkRef.java
    harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/MalformedLinkException.java
    harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/NameAlreadyBoundException.java
    harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/NameNotFoundException.java
    harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/NoInitialContextException.java
    harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/NoPermissionException.java
    harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/NotContextException.java
    harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/OperationNotSupportedException.java
    harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/PartialResultException.java
    harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/RefAddr.java
    harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/Reference.java
    harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/ServiceUnavailableException.java
    harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/SizeLimitExceededException.java
    harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/StringRefAddr.java
    harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/TimeLimitExceededException.java
    harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/directory/Attribute.java
    harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/directory/BasicAttribute.java
    harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/directory/BasicAttributes.java
    harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/ldap/LdapReferralException.java
    harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/ldap/UnsolicitedNotificationEvent.java
    harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/spi/ResolveResult.java
    harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/org/apache/harmony/jndi/internal/parser/LdapRdnParser.java
    harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/dns/DNSName.java
    harmony/enhanced/classlib/branches/java6/modules/jndi/src/test/java/org/apache/harmony/jndi/tests/javax/naming/ReferenceTest.java
    harmony/enhanced/classlib/branches/java6/modules/lang-management/.classpath
    harmony/enhanced/classlib/branches/java6/modules/logging/.classpath
    harmony/enhanced/classlib/branches/java6/modules/luni/.classpath
    harmony/enhanced/classlib/branches/java6/modules/luni/META-INF/MANIFEST.MF
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/io/File.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/io/ObjectInputStream.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/io/ObjectOutputStream.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/reflect/Proxy.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/ArrayList.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/InputMismatchException.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/PriorityQueue.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/Timer.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/Vector.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/internal/process/SystemProcess.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/util/DeleteOnExit.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/launcher/shared/main.c
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/shared/file.c
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/windows/OSNetworkSystemWin32.c
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/vmls/shared/vmls.c
    harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/BufferedReaderTest.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/FileTest.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/ObjectStreamClassTest.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/RandomAccessFileTest.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/lang/StringBuilderTest.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/lang/reflect/ConstructorTest.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/lang/reflect/MethodTest.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/MulticastSocketTest.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/NetworkInterfaceTest.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/ArrayListTest.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/BitSetTest.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/CollectionsTest.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/HashMapTest.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/HashSetTest.java
    harmony/enhanced/classlib/branches/java6/modules/math/.classpath
    harmony/enhanced/classlib/branches/java6/modules/misc/.classpath
    harmony/enhanced/classlib/branches/java6/modules/nio/.classpath
    harmony/enhanced/classlib/branches/java6/modules/nio/src/main/java/common/java/nio/channels/spi/AbstractSelectableChannel.java
    harmony/enhanced/classlib/branches/java6/modules/nio/src/test/java/common/org/apache/harmony/nio/tests/java/nio/MappedByteBufferTest.java
    harmony/enhanced/classlib/branches/java6/modules/nio/src/test/java/common/org/apache/harmony/nio/tests/java/nio/channels/FileChannelLockingTest.java
    harmony/enhanced/classlib/branches/java6/modules/nio/src/test/java/common/org/apache/harmony/nio/tests/java/nio/channels/FileLockTest.java
    harmony/enhanced/classlib/branches/java6/modules/nio/src/test/java/common/org/apache/harmony/nio/tests/java/nio/channels/spi/AbstractSelectableChannelTest.java
    harmony/enhanced/classlib/branches/java6/modules/nio_char/.classpath
    harmony/enhanced/classlib/branches/java6/modules/nio_char/build.xml
    harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/java/java/nio/charset/CharacterCodingException.java
    harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/java/java/nio/charset/Charset.java
    harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/java/java/nio/charset/CharsetDecoder.java
    harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/java/java/nio/charset/CharsetEncoder.java
    harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/java/java/nio/charset/CoderMalfunctionError.java
    harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/java/java/nio/charset/CoderResult.java
    harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/java/java/nio/charset/CodingErrorAction.java
    harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/java/java/nio/charset/IllegalCharsetNameException.java
    harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/java/java/nio/charset/MalformedInputException.java
    harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/java/java/nio/charset/UnmappableCharacterException.java
    harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/java/java/nio/charset/UnsupportedCharsetException.java
    harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/java/org/apache/harmony/niochar/CharsetProviderImpl.java
    harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/java/org/apache/harmony/niochar/charset/CP_1250.java
    harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/java/org/apache/harmony/niochar/charset/CP_1251.java
    harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/java/org/apache/harmony/niochar/charset/CP_1252.java
    harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/java/org/apache/harmony/niochar/charset/CP_1253.java
    harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/java/org/apache/harmony/niochar/charset/CP_1254.java
    harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/java/org/apache/harmony/niochar/charset/CP_1257.java
    harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/java/org/apache/harmony/niochar/charset/IBM866.java
    harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/java/org/apache/harmony/niochar/charset/ISO_8859_1.java
    harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/java/org/apache/harmony/niochar/charset/ISO_8859_13.java
    harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/java/org/apache/harmony/niochar/charset/ISO_8859_15.java
    harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/java/org/apache/harmony/niochar/charset/ISO_8859_2.java
    harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/java/org/apache/harmony/niochar/charset/ISO_8859_4.java
    harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/java/org/apache/harmony/niochar/charset/ISO_8859_5.java
    harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/java/org/apache/harmony/niochar/charset/ISO_8859_7.java
    harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/java/org/apache/harmony/niochar/charset/ISO_8859_9.java
    harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/java/org/apache/harmony/niochar/charset/KOI8_R.java
    harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/java/org/apache/harmony/niochar/charset/US_ASCII.java
    harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/java/org/apache/harmony/niochar/charset/additional/Big5.java
    harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/java/org/apache/harmony/niochar/charset/additional/Big5_HKSCS.java
    harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/java/org/apache/harmony/niochar/charset/additional/EUC_KR.java
    harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/java/org/apache/harmony/niochar/charset/additional/GB18030.java
    harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/java/org/apache/harmony/niochar/charset/additional/GB2312.java
    harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/java/org/apache/harmony/niochar/charset/additional/GBK.java
    harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/java/org/apache/harmony/niochar/charset/additional/IBM00858.java
    harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/java/org/apache/harmony/niochar/charset/additional/IBM01140.java
    harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/java/org/apache/harmony/niochar/charset/additional/IBM01141.java
    harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/java/org/apache/harmony/niochar/charset/additional/IBM01142.java
    harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/java/org/apache/harmony/niochar/charset/additional/IBM01143.java
    harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/java/org/apache/harmony/niochar/charset/additional/IBM01144.java
    harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/java/org/apache/harmony/niochar/charset/additional/IBM01145.java
    harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/java/org/apache/harmony/niochar/charset/additional/IBM01146.java
    harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/java/org/apache/harmony/niochar/charset/additional/IBM01147.java
    harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/java/org/apache/harmony/niochar/charset/additional/IBM01148.java
    harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/java/org/apache/harmony/niochar/charset/additional/IBM01149.java
    harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/java/org/apache/harmony/niochar/charset/additional/IBM037.java
    harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/java/org/apache/harmony/niochar/charset/additional/IBM1026.java
    harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/java/org/apache/harmony/niochar/charset/additional/IBM1047.java
    harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/java/org/apache/harmony/niochar/charset/additional/IBM273.java
    harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/java/org/apache/harmony/niochar/charset/additional/IBM277.java
    harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/java/org/apache/harmony/niochar/charset/additional/IBM278.java
    harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/java/org/apache/harmony/niochar/charset/additional/IBM280.java
    harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/java/org/apache/harmony/niochar/charset/additional/IBM284.java
    harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/java/org/apache/harmony/niochar/charset/additional/IBM285.java
    harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/java/org/apache/harmony/niochar/charset/additional/IBM297.java
    harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/java/org/apache/harmony/niochar/charset/additional/IBM420.java
    harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/java/org/apache/harmony/niochar/charset/additional/IBM424.java
    harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/java/org/apache/harmony/niochar/charset/additional/IBM437.java
    harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/java/org/apache/harmony/niochar/charset/additional/IBM500.java
    harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/java/org/apache/harmony/niochar/charset/additional/IBM775.java
    harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/java/org/apache/harmony/niochar/charset/additional/IBM850.java
    harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/java/org/apache/harmony/niochar/charset/additional/IBM852.java
    harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/java/org/apache/harmony/niochar/charset/additional/IBM855.java
    harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/java/org/apache/harmony/niochar/charset/additional/IBM857.java
    harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/java/org/apache/harmony/niochar/charset/additional/IBM860.java
    harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/java/org/apache/harmony/niochar/charset/additional/IBM861.java
    harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/java/org/apache/harmony/niochar/charset/additional/IBM862.java
    harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/java/org/apache/harmony/niochar/charset/additional/IBM863.java
    harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/java/org/apache/harmony/niochar/charset/additional/IBM864.java
    harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/java/org/apache/harmony/niochar/charset/additional/IBM865.java
    harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/java/org/apache/harmony/niochar/charset/additional/IBM868.java
    harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/java/org/apache/harmony/niochar/charset/additional/IBM869.java
    harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/java/org/apache/harmony/niochar/charset/additional/IBM870.java
    harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/java/org/apache/harmony/niochar/charset/additional/IBM871.java
    harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/java/org/apache/harmony/niochar/charset/additional/IBM918.java
    harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/java/org/apache/harmony/niochar/charset/additional/IBM_Thai.java
    harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/java/org/apache/harmony/niochar/charset/additional/ISO_8859_3.java
    harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/java/org/apache/harmony/niochar/charset/additional/ISO_8859_6.java
    harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/java/org/apache/harmony/niochar/charset/additional/ISO_8859_8.java
    harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/java/org/apache/harmony/niochar/charset/additional/JIS_X0201.java
    harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/java/org/apache/harmony/niochar/charset/additional/TIS_620.java
    harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/java/org/apache/harmony/niochar/charset/additional/windows_1255.java
    harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/java/org/apache/harmony/niochar/charset/additional/windows_1256.java
    harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/java/org/apache/harmony/niochar/charset/additional/windows_31j.java
    harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/java/org/apache/harmony/niochar/charset/additional/x_IBM1006.java
    harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/java/org/apache/harmony/niochar/charset/additional/x_IBM1025.java
    harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/java/org/apache/harmony/niochar/charset/additional/x_IBM1097.java
    harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/java/org/apache/harmony/niochar/charset/additional/x_IBM1098.java
    harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/java/org/apache/harmony/niochar/charset/additional/x_IBM1112.java
    harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/java/org/apache/harmony/niochar/charset/additional/x_IBM1122.java
    harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/java/org/apache/harmony/niochar/charset/additional/x_IBM1123.java
    harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/java/org/apache/harmony/niochar/charset/additional/x_IBM1124.java
    harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/java/org/apache/harmony/niochar/charset/additional/x_IBM737.java
    harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/java/org/apache/harmony/niochar/charset/additional/x_IBM856.java
    harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/java/org/apache/harmony/niochar/charset/additional/x_IBM874.java
    harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/java/org/apache/harmony/niochar/charset/additional/x_IBM875.java
    harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/java/org/apache/harmony/niochar/charset/additional/x_IBM922.java
    harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/java/org/apache/harmony/niochar/charset/additional/x_MS950_HKSCS.java
    harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/java/org/apache/harmony/niochar/charset/additional/x_MacCyrillic.java
    harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/java/org/apache/harmony/niochar/charset/additional/x_MacGreek.java
    harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/java/org/apache/harmony/niochar/charset/additional/x_MacTurkish.java
    harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/java/org/apache/harmony/niochar/charset/additional/x_windows_949.java
    harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/java/org/apache/harmony/niochar/java.nio.charset.spi.CharsetProvider   (contents, props changed)
    harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/native/niochar/   (props changed)
    harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/native/niochar/shared/additional/GB18030.c
    harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/native/niochar/unix/   (props changed)
    harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/native/niochar/unix/makefile
    harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/native/niochar/windows/hynio_char.rc
    harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/native/niochar/windows/makefile
    harmony/enhanced/classlib/branches/java6/modules/pack200/.classpath
    harmony/enhanced/classlib/branches/java6/modules/pack200/META-INF/MANIFEST.MF
    harmony/enhanced/classlib/branches/java6/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/AttributeDefinitionBands.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/CPInt.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/CPLong.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/CPMethodOrField.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/CPNameAndType.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/CPSignature.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/ClassBands.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/CodecEncoding.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/CpBands.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/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/Segment.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/unpack200/AttrDefinitionBands.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/AttributeLayout.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/BandSet.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/ClassBands.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/IcBands.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/IcTuple.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/MetadataBandGroup.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/NewAttributeBands.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/Segment.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/SegmentUtils.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/AnnotationDefaultAttribute.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/CodeAttribute.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/ConstantValueAttribute.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/DeprecatedAttribute.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/EnclosingMethodAttribute.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/ExceptionsAttribute.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/InnerClassesAttribute.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/LineNumberTableAttribute.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/LocalVariableTableAttribute.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/LocalVariableTypeTableAttribute.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/SignatureAttribute.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/SourceFileAttribute.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java5/org/apache/harmony/unpack200/Pack200PackerAdapter.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/test/java/org/apache/harmony/unpack200/tests/ClassBandsTest.java
    harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/port/windows/hysock.c
    harmony/enhanced/classlib/branches/java6/modules/prefs/.classpath
    harmony/enhanced/classlib/branches/java6/modules/print/.classpath
    harmony/enhanced/classlib/branches/java6/modules/print/src/main/java/common/javax/print/attribute/AttributeSetUtilities.java
    harmony/enhanced/classlib/branches/java6/modules/print/src/main/java/common/org/apache/harmony/x/print/MimeType.java
    harmony/enhanced/classlib/branches/java6/modules/print/src/main/java/common/org/apache/harmony/x/print/ServiceUIDialog.java
    harmony/enhanced/classlib/branches/java6/modules/print/src/main/java/common/org/apache/harmony/x/print/attributes/MediaMargins.java
    harmony/enhanced/classlib/branches/java6/modules/print/src/main/java/common/org/apache/harmony/x/print/attributes/PPDMediaSizeName.java
    harmony/enhanced/classlib/branches/java6/modules/print/src/main/java/common/org/apache/harmony/x/print/ipp/IppAttributeGroup.java
    harmony/enhanced/classlib/branches/java6/modules/print/src/main/java/common/org/apache/harmony/x/print/ipp/IppAttributeGroupSet.java
    harmony/enhanced/classlib/branches/java6/modules/print/src/main/java/common/org/apache/harmony/x/print/ipp/IppException.java
    harmony/enhanced/classlib/branches/java6/modules/print/src/main/java/common/org/apache/harmony/x/print/ipp/util/IppMimeType.java
    harmony/enhanced/classlib/branches/java6/modules/print/src/main/java/windows/org/apache/harmony/x/print/GDIClient.java
    harmony/enhanced/classlib/branches/java6/modules/print/src/main/native/print/windows/print.cpp
    harmony/enhanced/classlib/branches/java6/modules/print/src/main/native/print/windows/win_printer_factory.c
    harmony/enhanced/classlib/branches/java6/modules/regex/.classpath
    harmony/enhanced/classlib/branches/java6/modules/rmi/.classpath
    harmony/enhanced/classlib/branches/java6/modules/rmi/src/test/api/java/org/apache/harmony/rmi/server/ServerCloneExceptionTest.java
    harmony/enhanced/classlib/branches/java6/modules/security/.classpath
    harmony/enhanced/classlib/branches/java6/modules/security/src/main/java/common/java/security/Provider.java
    harmony/enhanced/classlib/branches/java6/modules/security/src/main/java/common/java/security/Security.java
    harmony/enhanced/classlib/branches/java6/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/CodeSource2Test.java
    harmony/enhanced/classlib/branches/java6/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/Security2Test.java
    harmony/enhanced/classlib/branches/java6/modules/sound/.classpath
    harmony/enhanced/classlib/branches/java6/modules/sql/.classpath
    harmony/enhanced/classlib/branches/java6/modules/sql/META-INF/MANIFEST.MF
    harmony/enhanced/classlib/branches/java6/modules/suncompat/.classpath
    harmony/enhanced/classlib/branches/java6/modules/swing/.classpath
    harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/text/html/parser/ContentModel.java
    harmony/enhanced/classlib/branches/java6/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicTextUITest.java
    harmony/enhanced/classlib/branches/java6/modules/text/.classpath
    harmony/enhanced/classlib/branches/java6/modules/x-net/.classpath
    harmony/enhanced/classlib/branches/java6/support/src/test/java/org/apache/harmony/testframework/serialization/SerializationTest.java
    harmony/enhanced/classlib/branches/java6/support/src/test/java/tests/support/Support_Exec.java

Modified: harmony/enhanced/classlib/branches/java6/THIRD_PARTY_NOTICES.txt
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/THIRD_PARTY_NOTICES.txt?rev=721077&r1=721076&r2=721077&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/THIRD_PARTY_NOTICES.txt (original)
+++ harmony/enhanced/classlib/branches/java6/THIRD_PARTY_NOTICES.txt Wed Nov 26 21:10:32 2008
@@ -660,3 +660,38 @@
 dealings in this Font Software without prior written authorization
 from Tavmjong Bah. For further information, contact: tavmjong @ free
 . fr.
+
+
+===============================================================================
+===============================================================================
+
+License notice for ASM
+=======================
+
+ ASM: a very small and fast Java bytecode manipulation framework
+ Copyright (c) 2000-2005 INRIA, France Telecom
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the distribution.
+ 3. Neither the name of the copyright holders nor the names of its
+    contributors may be used to endorse or promote products derived from
+    this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ THE POSSIBILITY OF SUCH DAMAGE.

Modified: harmony/enhanced/classlib/branches/java6/depends/files/bootclasspath.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/depends/files/bootclasspath.properties?rev=721077&r1=721076&r2=721077&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/depends/files/bootclasspath.properties (original)
+++ harmony/enhanced/classlib/branches/java6/depends/files/bootclasspath.properties Wed Nov 26 21:10:32 2008
@@ -207,3 +207,5 @@
 #bootclasspath.49=suncompat.jar
 #bootclasspath.source.49=suncompat-src.jar
 #bootclasspath.source.packageroot.49=/
+
+bootclasspath.50=asm-3.1/asm-3.1.jar 

Propchange: harmony/enhanced/classlib/branches/java6/depends/jars/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Nov 26 21:10:32 2008
@@ -23,6 +23,8 @@
 bcprov-jdk15-139
 derby-10.3.1.4
 xerces_2.9.1
-xmlsec_1.4.0
 bcprov-jdk15-138
 yoko-1.0
+bcprov-jdk15-141
+asm-3.1
+xmlsec_1.4.0

Modified: harmony/enhanced/classlib/branches/java6/make/build-java.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/make/build-java.xml?rev=721077&r1=721076&r2=721077&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/make/build-java.xml (original)
+++ harmony/enhanced/classlib/branches/java6/make/build-java.xml Wed Nov 26 21:10:32 2008
@@ -203,6 +203,7 @@
         <copy todir="${hy.jdk}/jre/lib/boot">
             <fileset dir="${depends.jars}">
                 <patternset includes="bcel-5.2/*.jar" />
+                <patternset includes="asm-3.1/*.jar" />
                 <patternset includes="icu4j_3.8/*.jar" />
                 <patternset includes="mx4j_3.0.2/*.jar" />
                 <patternset includes="xalan-j_2.7.0/*.jar" />

Modified: harmony/enhanced/classlib/branches/java6/make/depends.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/make/depends.properties?rev=721077&r1=721076&r2=721077&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/make/depends.properties (original)
+++ harmony/enhanced/classlib/branches/java6/make/depends.properties Wed Nov 26 21:10:32 2008
@@ -141,8 +141,14 @@
 
 depends.url=http://svn.apache.org/repos/asf/harmony/standard/depends
 
-bcprov.ver=bcprov-jdk15-139
+bcprov.ver=bcprov-jdk15-141
 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=30018c46e5c83397ec0b47c6e9c45406
+bcprov.jar=${bcprov.dir}/bcprov.jar
+bcprov.url=${depends.url}/jars/bcprov/${bcprov.ver}/bcprov.jar
+bcprov.md5=f7cd7e1dcfe4b84d820b3a0937dc13f4
+
+asm.ver=asm-3.1
+asm.dir=${depends.jars}/${asm.ver}
+asm.jar=${asm.dir}/asm-3.1.jar
+asm.url=http://download.forge.objectweb.org/asm/asm-3.1.jar
+asm.md5=4fbe0fd975ecc71480846ce272b483b0

Modified: harmony/enhanced/classlib/branches/java6/make/depends.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/make/depends.xml?rev=721077&r1=721076&r2=721077&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/make/depends.xml (original)
+++ harmony/enhanced/classlib/branches/java6/make/depends.xml Wed Nov 26 21:10:32 2008
@@ -48,6 +48,7 @@
         <check-one-file src="${servlet-api.url}" dest="${servlet-api.jar}" />
         <check-one-file src="${dejavu-fonts.url}" dest="${dejavu-fonts.zip}" />
         <check-one-file src="${derby.url}" dest="${derby.jar}" />
+        <check-one-file src="${asm.url}" dest="${asm.jar}" />
     </target>
 
     <target name="-check-win" if="is.windows" depends="-really-check-win" />
@@ -258,6 +259,10 @@
     <download-one-file src="${derby.url}"
                        dest="${derby.jar}"
                        md5="${derby.md5}" />
+
+    <mkdir dir="${asm.dir}" />
+    <download-one-file src="${asm.url}" dest="${asm.jar}"
+                           md5="${asm.md5}" />
     </target>
 
     <target name="-download-win" if="is.windows" depends="-select-win-deps-x86_64,-select-win-deps-x86">

Modified: harmony/enhanced/classlib/branches/java6/modules/accessibility/.classpath
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/accessibility/.classpath?rev=721077&r1=721076&r2=721077&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/accessibility/.classpath (original)
+++ harmony/enhanced/classlib/branches/java6/modules/accessibility/.classpath Wed Nov 26 21:10:32 2008
@@ -3,6 +3,6 @@
 	<classpathentry kind="src" output="bin/main" path="src/main/java"/>
 	<classpathentry kind="src" output="bin/test" path="src/test/api/java/common"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="var" path="JUNIT_HOME/junit.jar" sourcepath="JUNIT_SRC_HOME/junitsrc.zip"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

Modified: harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleBundle.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleBundle.java?rev=721077&r1=721076&r2=721077&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleBundle.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleBundle.java Wed Nov 26 21:10:32 2008
@@ -27,8 +27,9 @@
 import java.util.ResourceBundle;
 
 public abstract class AccessibleBundle {
+    private static final String ACCESSIBLE_RESOURSE_BUNDLE = "javax.accessibility.AccessibleResourceBundle"; //$NON-NLS-1$
+    
     protected String key;
-    private final String ACCESSIBLE_RESOURSE_BUNDLE = "javax.accessibility.AccessibleResourceBundle"; //$NON-NLS-1$
 
     public String toDisplayString() {
         return displayString(ACCESSIBLE_RESOURSE_BUNDLE, null);

Modified: harmony/enhanced/classlib/branches/java6/modules/accessibility/src/test/api/java/common/javax/accessibility/AccessibleStateSetTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/accessibility/src/test/api/java/common/javax/accessibility/AccessibleStateSetTest.java?rev=721077&r1=721076&r2=721077&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/accessibility/src/test/api/java/common/javax/accessibility/AccessibleStateSetTest.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/accessibility/src/test/api/java/common/javax/accessibility/AccessibleStateSetTest.java Wed Nov 26 21:10:32 2008
@@ -125,6 +125,8 @@
         } catch (NullPointerException e) {
             // expected
         }
+        
+        assertNull(new AccessibleStateSet(new AccessibleState[0]).toString());
     }
 
     public void testToArray() throws Exception {

Modified: harmony/enhanced/classlib/branches/java6/modules/annotation/.classpath
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/annotation/.classpath?rev=721077&r1=721076&r2=721077&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/annotation/.classpath (original)
+++ harmony/enhanced/classlib/branches/java6/modules/annotation/.classpath Wed Nov 26 21:10:32 2008
@@ -3,6 +3,6 @@
 	<classpathentry output="bin/main" kind="src" path="src/main/java"/>
 	<classpathentry output="bin/test" kind="src" path="src/test/java"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry sourcepath="JUNIT_SRC_HOME/junitsrc.zip" kind="var" path="JUNIT_HOME/junit.jar"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

Modified: harmony/enhanced/classlib/branches/java6/modules/applet/.classpath
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/applet/.classpath?rev=721077&r1=721076&r2=721077&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/applet/.classpath (original)
+++ harmony/enhanced/classlib/branches/java6/modules/applet/.classpath Wed Nov 26 21:10:32 2008
@@ -3,6 +3,6 @@
 	<classpathentry output="bin/main" kind="src" path="src/main/java"/>
 	<classpathentry output="bin/test" kind="src" path="src/test/java"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry sourcepath="JUNIT_SRC_HOME/junitsrc.zip" kind="var" path="JUNIT_HOME/junit.jar"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

Modified: harmony/enhanced/classlib/branches/java6/modules/archive/.classpath
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/archive/.classpath?rev=721077&r1=721076&r2=721077&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/archive/.classpath (original)
+++ harmony/enhanced/classlib/branches/java6/modules/archive/.classpath Wed Nov 26 21:10:32 2008
@@ -3,8 +3,9 @@
 	<classpathentry output="bin/main" kind="src" path="src/main/java"/>
 	<classpathentry output="bin/main" kind="src" path="src/main/resources"/>
 	<classpathentry output="bin/test" kind="src" path="src/test/java"/>
+	<classpathentry output="bin/test-internal" kind="src" path="src/test/java-internal"/>
 	<classpathentry output="bin/test" kind="src" path="src/test/resources"/>	
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry sourcepath="JUNIT_SRC_HOME/junitsrc.zip" kind="var" path="JUNIT_HOME/junit.jar"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
 	<classpathentry kind="output" path="bin/main"/>
 </classpath>

Modified: harmony/enhanced/classlib/branches/java6/modules/archive/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/archive/build.xml?rev=721077&r1=721076&r2=721077&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/archive/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/archive/build.xml Wed Nov 26 21:10:32 2008
@@ -37,6 +37,8 @@
         </or>
     </fileset>
 
+    <property file="../../make/depends.properties" />
+
     <property name="zlib.zip" location="${depends.oss}/zlib_1.2.3.zip" />
 
     <property name="archive.exclude.file" location="${hy.hdk}/build/archive.exclude" />
@@ -241,10 +243,30 @@
     </target>
 
     <target name="compile-tests" depends="copy-test-resources">
-        <echo message="Compiling ARCHIVE tests" />
-
+        <mkdir dir="${hy.archive.bin.internal}" />
         <mkdir dir="${hy.archive.bin.test}" />
 
+        <echo message="Compiling internal ARCHIVE tests" />
+        <javac srcdir="${hy.archive.src.test.internal}"
+               destdir="${hy.archive.bin.internal}"
+               sourcepath=""
+               compiler="${hy.javac.compiler}"
+               memoryMaximumSize="${hy.javac.maxmem}"
+               source="${hy.javac.source}" 
+               target="${hy.javac.target}"
+               debug="${hy.javac.debug}">
+
+            <compilerarg line="${build.compilerarg}" />
+
+            <bootclasspath>
+                <fileset dir="${hy.jdk}/jre/lib/boot">
+                    <include name="**/*.jar" />
+                </fileset>
+            </bootclasspath>
+            <classpath location="${hy.hdk}/build/test/support.jar" />
+        </javac>
+
+        <echo message="Compiling ARCHIVE tests" />
         <javac srcdir="${hy.archive.src.test.java}"
                destdir="${hy.archive.bin.test}"
                sourcepath=""
@@ -276,6 +298,48 @@
 
         <property name="test.jre.home" value="${hy.jdk}/jre" />
 
+        <!-- internal tests that need to run on the bootclasspath -->
+        <echo message="Running internal ARCHIVE tests" />
+        <junit fork="yes"
+               forkmode="${hy.test.forkmode}"
+               timeout="${hy.test.timeout}"
+               printsummary="withOutAndErr"
+               errorproperty="test.errors"
+               failureproperty="test.failures"
+               showoutput="on"
+               dir="${basedir}"
+               jvm="${test.jre.home}/bin/java">
+
+            <assertions enableSystemAssertions="true">
+                <enable />
+            </assertions>
+
+            <jvmarg line="${hy.test.vmargs}" />
+
+            <jvmarg value="-Xbootclasspath/a:${hy.archive.bin.internal}${path.separator}../../${junit.jar}"/>         
+            
+            <classpath>
+                <pathelement path="${hy.archive.bin.test}"/>
+            </classpath>
+            <classpath location="../../build/tests" />
+			<classpath location="${hy.hdk}/build/test/support.jar" />
+
+            <formatter type="xml" />
+
+            <batchtest todir="${hy.tests.reports}" haltonfailure="no" >
+
+                <fileset dir="${hy.archive.src.test.internal}">
+                    <!-- if ${test.case}     -->
+                    <include name="${converted.tc}" if="test.case" />
+                    <!-- unless ${test.case} -->
+                    <include name="**/*Test.java" unless="test.case" />
+                    <excludesfile name="${archive.exclude.file}" unless="test.case" />
+                </fileset>
+            </batchtest>
+        </junit>
+        
+        <!-- API tests -->
+        <echo message="Running ARCHIVE tests" />
         <junit fork="yes"
                forkmode="${hy.test.forkmode}"
                timeout="${hy.test.timeout}"

Modified: harmony/enhanced/classlib/branches/java6/modules/archive/make/hyproperties.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/archive/make/hyproperties.xml?rev=721077&r1=721076&r2=721077&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/archive/make/hyproperties.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/archive/make/hyproperties.xml Wed Nov 26 21:10:32 2008
@@ -27,12 +27,14 @@
          <test>
             <java location="src/test/java" />
             <resources location="src/test/resources" />
+            <internal location="src/test/java-internal" />
          </test>
          <natives location="src/natives" />
       </src>
       <bin>
         <main location="bin/main" />
         <test location="bin/test" />
+        <internal location="bin/test-internal" />
       </bin>
       <packaging>
       </packaging>

Modified: harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/java/util/jar/JarEntry.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/java/util/jar/JarEntry.java?rev=721077&r1=721076&r2=721077&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/java/util/jar/JarEntry.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/java/util/jar/JarEntry.java Wed Nov 26 21:10:32 2008
@@ -30,6 +30,12 @@
 
 import javax.security.auth.x500.X500Principal;
 
+/**
+ * JarEntry represents an entry in a JAR file.
+ * 
+ * @see JarFile
+ * @see JarInputStream
+ */
 public class JarEntry extends ZipEntry {
     private Attributes attributes;
 

Modified: harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/org/apache/harmony/archive/util/Util.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/org/apache/harmony/archive/util/Util.java?rev=721077&r1=721076&r2=721077&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/org/apache/harmony/archive/util/Util.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/org/apache/harmony/archive/util/Util.java Wed Nov 26 21:10:32 2008
@@ -42,40 +42,6 @@
         throw new NullPointerException();
     }
 
-    public static byte[] toASCIILowerCase(byte[] buf) {
-        int len = buf.length;
-        byte[] buffer = new byte[len];
-        for (int i = 0; i < len; i++) {
-            byte b = buf[i];
-            if ('A' <= b && b <= 'Z') {
-                buffer[i] = (byte) (b + ('a' - 'A'));
-            } else {
-                buffer[i] = b;
-            }
-        }
-        return buffer;
-    }
-
-    public static final boolean equalsIgnoreCase(String s1, String s2) {
-        if (s1 == s2) {
-            return true;
-        }
-
-        if (s1 == null || s2 == null || s1.length() != s2.length()) {
-            return false;
-        }
-
-        char c1, c2;
-
-        for (int i = 0; i < s1.length(); i++) {
-            if ((c1 = s1.charAt(i)) != (c2 = s2.charAt(i))
-                    && toASCIIUpperCase(c1) != toASCIIUpperCase(c2)) {
-                return false;
-            }
-        }
-        return true;
-    }
-
     public static final boolean equalsIgnoreCase(byte[] buf1, byte[] buf2) {
         if (buf1 == buf2) {
             return true;
@@ -96,21 +62,14 @@
         return true;
     }
 
-    public static final char toASCIILowerCase(char c) {
-        if ('A' <= c && c <= 'Z') {
-            return (char) (c + ('a' - 'A'));
-        }
-        return c;
-    }
-
-    public static final char toASCIIUpperCase(char c) {
+    static final char toASCIIUpperCase(char c) {
         if ('a' <= c && c <= 'z') {
             return (char) (c - ('a' - 'A'));
         }
         return c;
     }
 
-    public static final byte toASCIIUpperCase(byte b) {
+    static final byte toASCIIUpperCase(byte b) {
         if ('a' <= b && b <= 'z') {
             return (byte) (b - ('a' - 'A'));
         }

Modified: harmony/enhanced/classlib/branches/java6/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/GZIPInputStreamTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/GZIPInputStreamTest.java?rev=721077&r1=721076&r2=721077&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/GZIPInputStreamTest.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/GZIPInputStreamTest.java Wed Nov 26 21:10:32 2008
@@ -280,6 +280,7 @@
         gis.read(buffer);
         result = gis.read();
         gis.close();
+        f.delete();
 
         assertEquals("Incorrect value returned at the end of the file", -1, result);
     }

Modified: harmony/enhanced/classlib/branches/java6/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/GZIPOutputStreamTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/GZIPOutputStreamTest.java?rev=721077&r1=721076&r2=721077&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/GZIPOutputStreamTest.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/GZIPOutputStreamTest.java Wed Nov 26 21:10:32 2008
@@ -147,7 +147,7 @@
 			int r = 0;
 			try {
 				outGZIP.write(byteArray, 0, 11);
-			} catch (ArrayIndexOutOfBoundsException e) {
+			} catch (IndexOutOfBoundsException e) {
 				r = 1;
 			}
 			assertEquals("out of bounds exception is not present", 1, r);

Modified: harmony/enhanced/classlib/branches/java6/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/ZipOutputStreamTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/ZipOutputStreamTest.java?rev=721077&r1=721076&r2=721077&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/ZipOutputStreamTest.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/ZipOutputStreamTest.java Wed Nov 26 21:10:32 2008
@@ -232,6 +232,9 @@
         } catch (IndexOutOfBoundsException e) {
             // expected
         }
+
+        // Close stream because ZIP is invalid
+        stream.close();
     }
 
     /**
@@ -262,6 +265,8 @@
         } catch (IOException e2) {
             // expected
         }
+        
+        zip1.close();
     }
 
     @Override

Modified: harmony/enhanced/classlib/branches/java6/modules/auth/.classpath
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/auth/.classpath?rev=721077&r1=721076&r2=721077&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/auth/.classpath (original)
+++ harmony/enhanced/classlib/branches/java6/modules/auth/.classpath Wed Nov 26 21:10:32 2008
@@ -8,6 +8,6 @@
 	<classpathentry kind="src" output="bin/test" path="src/test/java/unix"/>
 	<classpathentry kind="src" output="bin/test" path="src/test/resources"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="var" path="JUNIT_HOME/junit.jar" sourcepath="JUNIT_SRC_HOME/junitsrc.zip"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
 	<classpathentry kind="output" path="bin/main"/>
 </classpath>

Modified: harmony/enhanced/classlib/branches/java6/modules/awt/.classpath
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/.classpath?rev=721077&r1=721076&r2=721077&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/.classpath (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/.classpath Wed Nov 26 21:10:32 2008
@@ -9,6 +9,6 @@
 	<classpathentry kind="src" output="bin/main/linux" path="src/main/java/unix"/>
 	<classpathentry exported="true" kind="lib" path="src/test/api/resources"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="var" path="JUNIT_HOME/junit.jar" sourcepath="JUNIT_SRC_HOME/junitsrc.zip"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
 	<classpathentry kind="output" path="bin/main/common"/>
 </classpath>

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=721077&r1=721076&r2=721077&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 Wed Nov 26 21:10:32 2008
@@ -1047,11 +1047,11 @@
 
     String autoName() {
         String name = getClass().getName();
-        if (name.indexOf("$") != -1) { //$NON-NLS-1$
+        if (name.indexOf('$') != -1) {
             return null;
         }
         int number = toolkit.autoNumber.nextComponent++;
-        name = name.substring(name.lastIndexOf(".") + 1) + Integer.toString(number); //$NON-NLS-1$
+        name = name.substring(name.lastIndexOf('.') + 1) + Integer.toString(number);
         return name;
     }
 

Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/MenuComponent.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/MenuComponent.java?rev=721077&r1=721076&r2=721077&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/MenuComponent.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/MenuComponent.java Wed Nov 26 21:10:32 2008
@@ -806,11 +806,11 @@
 
     String autoName() {
         String name = getClass().getName();
-        if (name.indexOf("$") != -1) { //$NON-NLS-1$
+        if (name.indexOf('$') != -1) {
             return null;
         }
         int number = toolkit.autoNumber.nextMenuComponent++;
-        name = name.substring(name.lastIndexOf(".") + 1) + Integer.toString(number); //$NON-NLS-1$
+        name = name.substring(name.lastIndexOf('.') + 1) + Integer.toString(number);
         return name;
     }
 

Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/font/FontManager.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/font/FontManager.java?rev=721077&r1=721076&r2=721077&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/font/FontManager.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/font/FontManager.java Wed Nov 26 21:10:32 2008
@@ -341,7 +341,7 @@
      * @param faceName logical font face name
      */
     public String getFamilyFromLogicalFace(String faceName){
-        int pos = faceName.indexOf("."); //$NON-NLS-1$
+        int pos = faceName.indexOf('.');
         if (pos == -1){
             return faceName;
         }
@@ -462,7 +462,7 @@
     public String getLogicalFaceFromFont(int fontStyle, int logicalIndex){
         int style = 0;
         String name = LOGICAL_FONT_FACES[logicalIndex];
-        int pos = name.indexOf("."); //$NON-NLS-1$
+        int pos = name.indexOf('.');
         
         if (pos == -1){
             return createLogicalFace(name, fontStyle);
@@ -485,7 +485,7 @@
      */
     public int getStyleFromLogicalFace(String name){
         int style;
-        int pos = name.indexOf("."); //$NON-NLS-1$
+        int pos = name.indexOf('.');
         
         if (pos == -1){
             return Font.PLAIN;

Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/fontlib/shared/Environment.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/fontlib/shared/Environment.cpp?rev=721077&r1=721076&r2=721077&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/fontlib/shared/Environment.cpp (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/fontlib/shared/Environment.cpp Wed Nov 26 21:10:32 2008
@@ -18,6 +18,7 @@
  * @author Dmitriy S. Matveev, Viskov Nikolay 
  * @version $Revision$
  */
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
@@ -202,9 +203,9 @@
 				return 0;
 			}
 		}
-	} 
 
-	fclose(font);
+        fclose(font);
+	} 
 
     return -1;
 }
@@ -232,7 +233,7 @@
 
 		if (fStyle == NULL || result == -1)
 		{
-			delete[] fStyle;
+			delete fStyle;
 			delete fh;
 			return NULL;
 		}else {

Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/fontlib/shared/ParsingTables.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/fontlib/shared/ParsingTables.cpp?rev=721077&r1=721076&r2=721077&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/fontlib/shared/ParsingTables.cpp (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/fontlib/shared/ParsingTables.cpp Wed Nov 26 21:10:32 2008
@@ -658,11 +658,11 @@
             return -1;
         }
 		/* read 'hmtx' table */
-		*hm = new HMetrics[numOfHMetrics];
+        *hm = new HMetrics[numOfHMetrics];
 
         size = (fint)fread(*hm, sizeof(HMetrics), numOfHMetrics, tt_file);
         if (size != numOfHMetrics){
-			delete[] hm;
+			delete[] *hm;
 //            printf("Error reading Table 'hmtx' from file.");
             return -1;
         }
@@ -690,12 +690,12 @@
 	ufshort *gShortOffsets = NULL;
     fint size, i;
 
-	gLongOffsets = new uflong[numGlyphs+1];
-	if (!(*gOffsets).format)
-		gShortOffsets = new ufshort[numGlyphs+1];
-
     if (searchTable(hTable, &offset, tt_file) && searchTable(gTable,&localGlyfOffset,tt_file))
 	{
+        gLongOffsets = new uflong[numGlyphs+1];
+        if (!gOffsets->format)
+            gShortOffsets = new ufshort[numGlyphs+1];
+
         /* move position to the 'loca' table */
         size = fseek(tt_file, offset, SEEK_SET);
         if (size != 0)
@@ -705,7 +705,7 @@
 			delete[] gLongOffsets;
 			gLongOffsets = NULL;
 
-			if (gOffsets->format)
+			if (!gOffsets->format)
 			{
 				delete[] gShortOffsets;
 			}
@@ -740,7 +740,7 @@
 			for (i=0;i<=numGlyphs;i++)
 				gLongOffsets[i] = wReverse(gShortOffsets[i])*2+localGlyfOffset;
 		}
-		(*gOffsets).offsets = gLongOffsets;
+		gOffsets->offsets = gLongOffsets;
 		delete[] gShortOffsets;
 	}
 
@@ -918,7 +918,7 @@
 		if (size != numOfContours)
 		{
 //			printf("Error reading endPtsOfContours for someone glyph.");
-			delete endPtsOfContours;
+			delete[] endPtsOfContours;
 			return -1;
 		}
 
@@ -1019,6 +1019,8 @@
 			delete[] flags;
 			delete[] instructions;
 			delete[] endPtsOfContours;
+            delete[] xCoord;
+            delete[] yCoord;
 			return -1;
 		}
 
@@ -1029,6 +1031,8 @@
 			delete[] flags;
 			delete[] instructions;
 			delete[] endPtsOfContours;
+            delete[] xCoord;
+            delete[] yCoord;
 			return -1;
 		}
 		
@@ -1036,7 +1040,7 @@
 		rep=0;
 		fint x=0, y=0;
 		ffloat xFirstInContour,yFirstInContour;
-		bool contBegin; //íà÷àëî êîíòóðà
+		bool contBegin;
 
 		for (j=0; j<numOfContours;j++)
 		{

Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/fontlib/shared/T1Font.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/fontlib/shared/T1Font.cpp?rev=721077&r1=721076&r2=721077&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/fontlib/shared/T1Font.cpp (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/fontlib/shared/T1Font.cpp Wed Nov 26 21:10:32 2008
@@ -19,6 +19,7 @@
  * @version $Revision$
  */
 
+#include <stdio.h>
 #include <string>
 #include <string.h>
 #include <stdlib.h>

Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/fontlib/shared/TTFont.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/fontlib/shared/TTFont.cpp?rev=721077&r1=721076&r2=721077&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/fontlib/shared/TTFont.cpp (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/fontlib/shared/TTFont.cpp Wed Nov 26 21:10:32 2008
@@ -18,6 +18,8 @@
  * @author Dmitriy S. Matveev
  * @version $Revision$
  */
+
+#include <stdio.h>
 #include "TTFont.h"
 #include "Tables.h"
 

Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/gl/windows/GDIBlitter.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/gl/windows/GDIBlitter.cpp?rev=721077&r1=721076&r2=721077&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/gl/windows/GDIBlitter.cpp (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/gl/windows/GDIBlitter.cpp Wed Nov 26 21:10:32 2008
@@ -564,7 +564,7 @@
              break;
          }
      }
-     delete(tmp);
+     free(tmp);
  }
 
 BOOL isRepeatColor(UINT idx, DWORD *colormap, UINT size){

Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/gl/windows/WinGraphicsEnvironment.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/gl/windows/WinGraphicsEnvironment.cpp?rev=721077&r1=721076&r2=721077&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/gl/windows/WinGraphicsEnvironment.cpp (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/gl/windows/WinGraphicsEnvironment.cpp Wed Nov 26 21:10:32 2008
@@ -123,8 +123,8 @@
 
     bits = bmpInfo.bmiHeader.biBitCount;
 
+    mask = (DWORD *)bmpInfo.bmiColors;
     if(bmpInfo.bmiHeader.biCompression == BI_BITFIELDS){
-        mask = (DWORD *)bmpInfo.bmiColors;
 
         if(mask[0] == 0x7c00 && mask[1] == 0x03e0 && mask[2] == 0x1f){
 

Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/win32wrapper/windows/WinDataTransfer.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/win32wrapper/windows/WinDataTransfer.cpp?rev=721077&r1=721076&r2=721077&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/win32wrapper/windows/WinDataTransfer.cpp (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/win32wrapper/windows/WinDataTransfer.cpp Wed Nov 26 21:10:32 2008
@@ -580,7 +580,7 @@
     jint rMask = 0, gMask = 0, bMask = 0;
     jint bitCount = hdr.biBitCount;
     jint stride = hdr.biWidth;
-    jsize height = abs(hdr.biHeight);
+    jsize height = labs(hdr.biHeight);
     jobject result = NULL;
     
     switch(hdr.biCompression) {

Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/winfont/windows/winFont.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/winfont/windows/winFont.cpp?rev=721077&r1=721076&r2=721077&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/winfont/windows/winFont.cpp (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/winfont/windows/winFont.cpp Wed Nov 26 21:10:32 2008
@@ -66,7 +66,7 @@
 
     DPtoLP(hDC, P, 2); // map device coordinate to logical size
 
-    return abs(P[1].y - P[0].y) / 72 / divisor;
+    return labs(P[1].y - P[0].y) / 72 / divisor;
 }
 
 /* Returns font style of the LOGFONT structure */
@@ -367,7 +367,7 @@
     
     res = enumFamilies();
 
-    if (res = FONTLIB_ERROR){
+    if (res == FONTLIB_ERROR){
         throwNPException(env, "Not enough memory to enumerate font family names list.");
         return NULL;
     }
@@ -405,7 +405,7 @@
     jobjectArray faces;
     res = enumFonts();
 
-    if (res = FONTLIB_ERROR){
+    if (res == FONTLIB_ERROR){
         throwNPException(env, "Not enough memory to enumerate font names list.");
         return;
     }

Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/test/impl/boot/java/awt/ComponentSerialize.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/test/impl/boot/java/awt/ComponentSerialize.java?rev=721077&r1=721076&r2=721077&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/test/impl/boot/java/awt/ComponentSerialize.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/test/impl/boot/java/awt/ComponentSerialize.java Wed Nov 26 21:10:32 2008
@@ -91,6 +91,7 @@
     private Component writeAndRead(Component original)
                 throws IOException, ClassNotFoundException {
         File tempFile = File.createTempFile("save", ".object");
+        tempFile.deleteOnExit();
 
         FileOutputStream fos = new FileOutputStream(tempFile);
 
@@ -103,7 +104,8 @@
         ObjectInputStream ois = new ObjectInputStream(fis);
 
         Component restored = (Component)ois.readObject();
-        tempFile.delete();
+        ois.close();
+
         return restored;
     }
 }



Mime
View raw message