You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by qi...@apache.org on 2009/07/04 10:38:24 UTC
svn commit: r791082 [1/8] - in /harmony/enhanced/classlib/branches/java6: ./
depends/build/ depends/build/platform/ depends/manifests/asm-3.1/ make/
modules/accessibility/ modules/accessibility/make/
modules/accessibility/src/main/java/javax/accessibil...
Author: qiuxx
Date: Sat Jul 4 08:38:13 2009
New Revision: 791082
URL: http://svn.apache.org/viewvc?rev=791082&view=rev
Log:
Merge updates from classlib trunk@790471 since r785553
Added:
harmony/enhanced/classlib/branches/java6/depends/build/platform/macosx.x86_64.mk
- copied unchanged from r790471, harmony/enhanced/classlib/trunk/depends/build/platform/macosx.x86_64.mk
harmony/enhanced/classlib/branches/java6/modules/pack200/depends/
- copied from r790471, harmony/enhanced/classlib/trunk/modules/pack200/depends/
harmony/enhanced/classlib/branches/java6/modules/pack200/depends/manifests/
- copied from r790471, harmony/enhanced/classlib/trunk/modules/pack200/depends/manifests/
harmony/enhanced/classlib/branches/java6/modules/pack200/depends/manifests/asm-3.1/ (props changed)
- copied from r790471, harmony/enhanced/classlib/trunk/modules/pack200/depends/manifests/asm-3.1/
harmony/enhanced/classlib/branches/java6/modules/pack200/depends/manifests/asm-3.1/META-INF/
- copied from r790471, harmony/enhanced/classlib/trunk/modules/pack200/depends/manifests/asm-3.1/META-INF/
harmony/enhanced/classlib/branches/java6/modules/pack200/depends/manifests/asm-3.1/META-INF/MANIFEST.MF
- copied unchanged from r790471, harmony/enhanced/classlib/trunk/modules/pack200/depends/manifests/asm-3.1/META-INF/MANIFEST.MF
harmony/enhanced/classlib/branches/java6/modules/pack200/make/depends.properties
- copied unchanged from r790471, harmony/enhanced/classlib/trunk/modules/pack200/make/depends.properties
harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/PackingUtils.java
- copied unchanged from r790471, harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/PackingUtils.java
Removed:
harmony/enhanced/classlib/branches/java6/depends/manifests/asm-3.1/
Modified:
harmony/enhanced/classlib/branches/java6/ (props changed)
harmony/enhanced/classlib/branches/java6/build.xml
harmony/enhanced/classlib/branches/java6/depends/build/defines.mk
harmony/enhanced/classlib/branches/java6/depends/build/platform/aix.ppc32.mk
harmony/enhanced/classlib/branches/java6/depends/build/platform/aix.ppc64.mk
harmony/enhanced/classlib/branches/java6/depends/build/platform/freebsd.x86.mk
harmony/enhanced/classlib/branches/java6/depends/build/platform/freebsd.x86_64.mk
harmony/enhanced/classlib/branches/java6/depends/build/platform/linux.ia64.mk
harmony/enhanced/classlib/branches/java6/depends/build/platform/linux.ppc32.mk
harmony/enhanced/classlib/branches/java6/depends/build/platform/linux.ppc64.mk
harmony/enhanced/classlib/branches/java6/depends/build/platform/linux.s390.mk
harmony/enhanced/classlib/branches/java6/depends/build/platform/linux.s390x.mk
harmony/enhanced/classlib/branches/java6/depends/build/platform/linux.x86.mk
harmony/enhanced/classlib/branches/java6/depends/build/platform/linux.x86_64.mk
harmony/enhanced/classlib/branches/java6/depends/build/platform/macosx.ppc32.mk
harmony/enhanced/classlib/branches/java6/depends/build/platform/macosx.x86.mk
harmony/enhanced/classlib/branches/java6/depends/build/platform/zos.s390.mk
harmony/enhanced/classlib/branches/java6/depends/build/platform/zos.s390x.mk
harmony/enhanced/classlib/branches/java6/depends/build/rules.mk
harmony/enhanced/classlib/branches/java6/make/build-java.xml
harmony/enhanced/classlib/branches/java6/make/build-test.xml
harmony/enhanced/classlib/branches/java6/make/depends-common.xml (contents, props changed)
harmony/enhanced/classlib/branches/java6/make/depends.properties
harmony/enhanced/classlib/branches/java6/make/depends.xml
harmony/enhanced/classlib/branches/java6/make/run-test.xml
harmony/enhanced/classlib/branches/java6/modules/accessibility/build.xml
harmony/enhanced/classlib/branches/java6/modules/accessibility/make/hyproperties.xml
harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleRelationSet.java
harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleStateSet.java
harmony/enhanced/classlib/branches/java6/modules/annotation/build.xml
harmony/enhanced/classlib/branches/java6/modules/annotation/make/hyproperties.xml
harmony/enhanced/classlib/branches/java6/modules/applet/build.xml
harmony/enhanced/classlib/branches/java6/modules/applet/make/hyproperties.xml
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/native/archive/unix/makefile
harmony/enhanced/classlib/branches/java6/modules/archive/src/main/native/archive/windows/makefile
harmony/enhanced/classlib/branches/java6/modules/archive/src/main/native/zlib/unix/makefile
harmony/enhanced/classlib/branches/java6/modules/auth/build.xml
harmony/enhanced/classlib/branches/java6/modules/auth/make/hyproperties.xml
harmony/enhanced/classlib/branches/java6/modules/auth/src/main/java/common/javax/security/auth/Subject.java
harmony/enhanced/classlib/branches/java6/modules/auth/src/main/native/auth/unix/makefile
harmony/enhanced/classlib/branches/java6/modules/auth/src/main/native/auth/windows/makefile
harmony/enhanced/classlib/branches/java6/modules/awt/META-INF/MANIFEST.MF
harmony/enhanced/classlib/branches/java6/modules/awt/build.xml
harmony/enhanced/classlib/branches/java6/modules/awt/make/hyproperties.xml
harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/SystemColor.java
harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/event/MouseEvent.java
harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/font/NumericShaper.java
harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/MultiRectArea.java
harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/fontlib/unix/makefile
harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/gl/unix/makefile
harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/jpegdecoder/unix/makefile
harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/lcmm/unix/makefile
harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/linuxfont/unix/makefile
harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/oglwrapper/unix/makefile
harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/x11wrapper/unix/makefile
harmony/enhanced/classlib/branches/java6/modules/awt/src/test/impl/boot/java/awt/SystemColorRTest.java
harmony/enhanced/classlib/branches/java6/modules/beans/build.xml
harmony/enhanced/classlib/branches/java6/modules/beans/make/hyproperties.xml
harmony/enhanced/classlib/branches/java6/modules/beans/src/main/java/java/beans/XMLDecoder.java
harmony/enhanced/classlib/branches/java6/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/XMLDecoderTest.java
harmony/enhanced/classlib/branches/java6/modules/concurrent/build.xml
harmony/enhanced/classlib/branches/java6/modules/concurrent/make/hyproperties.xml
harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/CopyOnWriteArrayList.java
harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/atomic/ (props changed)
harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/locks/ (props changed)
harmony/enhanced/classlib/branches/java6/modules/crypto/build.xml
harmony/enhanced/classlib/branches/java6/modules/crypto/make/hyproperties.xml
harmony/enhanced/classlib/branches/java6/modules/imageio/build.xml
harmony/enhanced/classlib/branches/java6/modules/imageio/make/hyproperties.xml
harmony/enhanced/classlib/branches/java6/modules/imageio/src/main/java/javax/imageio/plugins/jpeg/JPEGHuffmanTable.java
harmony/enhanced/classlib/branches/java6/modules/imageio/src/main/java/javax/imageio/stream/ImageInputStreamImpl.java
harmony/enhanced/classlib/branches/java6/modules/imageio/src/main/native/jpegencoder/unix/makefile
harmony/enhanced/classlib/branches/java6/modules/imageio/src/main/native/pngencoder/unix/makefile
harmony/enhanced/classlib/branches/java6/modules/instrument/build.xml
harmony/enhanced/classlib/branches/java6/modules/instrument/make/hyproperties.xml
harmony/enhanced/classlib/branches/java6/modules/instrument/src/main/native/instrument/unix/makefile
harmony/enhanced/classlib/branches/java6/modules/instrument/src/main/native/instrument/windows/makefile
harmony/enhanced/classlib/branches/java6/modules/jmx/META-INF/ (props changed)
harmony/enhanced/classlib/branches/java6/modules/jndi/build.xml
harmony/enhanced/classlib/branches/java6/modules/jndi/make/hyproperties.xml
harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/LinkException.java
harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/NameClassPair.java
harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/NamingException.java
harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/directory/AttributeModificationException.java
harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/directory/ModificationItem.java
harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/directory/SearchResult.java
harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/ldap/LdapName.java
harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/ldap/Rdn.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/main/java/org/apache/harmony/jndi/provider/dns/Message.java
harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/dns/ProviderMgr.java
harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/dns/QuestionRecord.java
harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/dns/ResourceRecord.java
harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/dns/dnsURLContextFactory.java
harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/ldap/parser/ParseException.java
harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/ldap/parser/TokenMgrError.java
harmony/enhanced/classlib/branches/java6/modules/lang-management/build.xml
harmony/enhanced/classlib/branches/java6/modules/lang-management/make/hyproperties.xml
harmony/enhanced/classlib/branches/java6/modules/lang-management/src/test/api/java/org/apache/harmony/lang/management/tests/java/util/logging/ (props changed)
harmony/enhanced/classlib/branches/java6/modules/logging/build.xml
harmony/enhanced/classlib/branches/java6/modules/logging/make/hyproperties.xml
harmony/enhanced/classlib/branches/java6/modules/luni-kernel/src/main/java/java/lang/Throwable.java
harmony/enhanced/classlib/branches/java6/modules/luni/META-INF/MANIFEST.MF
harmony/enhanced/classlib/branches/java6/modules/luni/build.xml
harmony/enhanced/classlib/branches/java6/modules/luni/make/hyproperties.xml
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/io/DataInputStream.java
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/io/PushbackInputStream.java
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/io/StreamTokenizer.java
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/lang/Math.java
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/lang/String.java
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/lang/reflect/Modifier.java
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/net/ServerSocket.java
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/net/SocketImpl.java
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/net/SocketPermission.java
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/net/URI.java
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/net/URIEncoderDecoder.java
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/net/URLConnection.java
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/net/URLEncoder.java
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/net/URLStreamHandler.java
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/BitSet.java
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/Calendar.java
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/Date.java
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/HashMap.java
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/Locale.java
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/Properties.java
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/TimeZone.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/net/www/protocol/ftp/FtpURLConnection.java
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/http/HttpURLConnection.java
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/jar/Handler.java
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/internal/reflect/ProxyClassFile.java
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/platform/IMemorySystem.java
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/platform/OSNetworkSystem.java
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/util/Util.java
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/fdlibm/unix/makefile
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/shared/file.c
harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/lang/MathTest.java
harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/lang/String2Test.java
harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/URLTest.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/PropertiesTest.java
harmony/enhanced/classlib/branches/java6/modules/math/build.xml
harmony/enhanced/classlib/branches/java6/modules/math/make/hyproperties.xml
harmony/enhanced/classlib/branches/java6/modules/math/src/main/java/java/math/BigDecimal.java
harmony/enhanced/classlib/branches/java6/modules/math/src/main/java/java/math/Conversion.java
harmony/enhanced/classlib/branches/java6/modules/math/src/main/java/java/math/MathContext.java
harmony/enhanced/classlib/branches/java6/modules/misc/build.xml
harmony/enhanced/classlib/branches/java6/modules/misc/make/hyproperties.xml
harmony/enhanced/classlib/branches/java6/modules/misc/src/main/native/accessors/unix/makefile
harmony/enhanced/classlib/branches/java6/modules/misc/src/main/native/accessors/windows/makefile
harmony/enhanced/classlib/branches/java6/modules/nio/META-INF/MANIFEST.MF
harmony/enhanced/classlib/branches/java6/modules/nio/build.xml
harmony/enhanced/classlib/branches/java6/modules/nio/make/hyproperties.xml
harmony/enhanced/classlib/branches/java6/modules/nio/src/main/java/common/java/nio/ByteBuffer.java
harmony/enhanced/classlib/branches/java6/modules/nio/src/main/java/common/java/nio/CharBuffer.java
harmony/enhanced/classlib/branches/java6/modules/nio/src/main/java/common/java/nio/DoubleBuffer.java
harmony/enhanced/classlib/branches/java6/modules/nio/src/main/java/common/java/nio/FloatBuffer.java
harmony/enhanced/classlib/branches/java6/modules/nio/src/main/java/common/java/nio/IntBuffer.java
harmony/enhanced/classlib/branches/java6/modules/nio/src/main/java/common/java/nio/LongBuffer.java
harmony/enhanced/classlib/branches/java6/modules/nio/src/main/java/common/java/nio/ShortBuffer.java
harmony/enhanced/classlib/branches/java6/modules/nio/src/main/java/common/java/nio/channels/FileLock.java
harmony/enhanced/classlib/branches/java6/modules/nio/src/main/native/nio/unix/makefile
harmony/enhanced/classlib/branches/java6/modules/nio/src/main/native/nio/windows/makefile
harmony/enhanced/classlib/branches/java6/modules/nio_char/build.xml
harmony/enhanced/classlib/branches/java6/modules/nio_char/make/hyproperties.xml
harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/native/niochar/windows/hyniochar.def
harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/native/niochar/windows/makefile
harmony/enhanced/classlib/branches/java6/modules/pack200/build.xml
harmony/enhanced/classlib/branches/java6/modules/pack200/make/hyproperties.xml
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/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/MetadataBandGroup.java
harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/NewAttribute.java
harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/NewAttributeBands.java
harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/Pack200ClassReader.java
harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/Pack200Exception.java
harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/PackingOptions.java
harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/PopulationCodec.java
harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/RunCodec.java
harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/Segment.java
harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java5/org/apache/harmony/pack200/Pack200Adapter.java (props changed)
harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java5/org/apache/harmony/pack200/Pack200PackerAdapter.java (props changed)
harmony/enhanced/classlib/branches/java6/modules/pack200/src/test/java/org/apache/harmony/pack200/tests/ArchiveTest.java
harmony/enhanced/classlib/branches/java6/modules/portlib/build.xml
harmony/enhanced/classlib/branches/java6/modules/portlib/make/hyproperties.xml
harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/include/shared/hyport.h
harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/include/shared/hyporterror.h
harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/include/shared/hythread.h
harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/port/shared/portpriv.h
harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/port/unix/hymem.c
harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/port/unix/hysl.c
harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/port/unix/hysock.c
harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/port/windows/hymem.c
harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/port/windows/hysl.c
harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/port/windows/hysock.c
harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/thread/shared/hythread.c
harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/thread/shared/hythreadinspect.c
harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/thread/shared/hythreadinspect.h
harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/thread/unix/thrtypes.h
harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/thread/windows/thrtypes.h
harmony/enhanced/classlib/branches/java6/modules/portlib/src/test/native/hymmap/shared/hymmap.c
harmony/enhanced/classlib/branches/java6/modules/prefs/build.xml
harmony/enhanced/classlib/branches/java6/modules/prefs/make/exclude.common
harmony/enhanced/classlib/branches/java6/modules/prefs/make/hyproperties.xml
harmony/enhanced/classlib/branches/java6/modules/prefs/src/main/java/java/util/prefs/AbstractPreferences.java
harmony/enhanced/classlib/branches/java6/modules/prefs/src/main/java/java/util/prefs/RegistryPreferencesImpl.java
harmony/enhanced/classlib/branches/java6/modules/prefs/src/main/java/java/util/prefs/XMLParser.java
harmony/enhanced/classlib/branches/java6/modules/prefs/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/AbstractPreferencesTest.java
harmony/enhanced/classlib/branches/java6/modules/prefs/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/FilePreferencesImplTest.java
harmony/enhanced/classlib/branches/java6/modules/prefs/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/MockAbstractPreferences.java
harmony/enhanced/classlib/branches/java6/modules/print/build.xml
harmony/enhanced/classlib/branches/java6/modules/print/make/hyproperties.xml
harmony/enhanced/classlib/branches/java6/modules/print/src/main/java/common/javax/print/attribute/SetOfIntegerSyntax.java
harmony/enhanced/classlib/branches/java6/modules/print/src/main/java/common/org/apache/harmony/x/print/Graphics2D2PS.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/attributes/MediaMargins.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/native/print/windows/print.def
harmony/enhanced/classlib/branches/java6/modules/print/src/main/native/print/windows/print.rc
harmony/enhanced/classlib/branches/java6/modules/regex/build.xml
harmony/enhanced/classlib/branches/java6/modules/regex/make/hyproperties.xml
harmony/enhanced/classlib/branches/java6/modules/regex/src/main/java/java/util/regex/CharClass.java
harmony/enhanced/classlib/branches/java6/modules/regex/src/main/java/java/util/regex/DecomposedCharSet.java
harmony/enhanced/classlib/branches/java6/modules/regex/src/main/java/java/util/regex/Lexer.java
harmony/enhanced/classlib/branches/java6/modules/regex/src/main/java/java/util/regex/Matcher.java
harmony/enhanced/classlib/branches/java6/modules/regex/src/main/java/java/util/regex/Pattern.java
harmony/enhanced/classlib/branches/java6/modules/regex/src/main/java/java/util/regex/UCISequenceSet.java
harmony/enhanced/classlib/branches/java6/modules/rmi/build.xml
harmony/enhanced/classlib/branches/java6/modules/rmi/make/hyproperties.xml
harmony/enhanced/classlib/branches/java6/modules/rmi/src/main/java/org/apache/harmony/rmi/common/EclipseJavaCompiler.java
harmony/enhanced/classlib/branches/java6/modules/rmi/src/main/java/org/apache/harmony/rmi/common/RMIUtil.java
harmony/enhanced/classlib/branches/java6/modules/rmi/src/main/java/org/apache/harmony/rmi/compiler/ClassStub.java
harmony/enhanced/classlib/branches/java6/modules/rmi/src/main/java/org/apache/harmony/rmi/compiler/Indenter.java
harmony/enhanced/classlib/branches/java6/modules/rmi/src/main/java/org/apache/harmony/rmi/compiler/RmicUtil.java
harmony/enhanced/classlib/branches/java6/modules/security/build.xml
harmony/enhanced/classlib/branches/java6/modules/security/make/hyproperties.xml
harmony/enhanced/classlib/branches/java6/modules/security/src/main/java/common/java/security/Certificate.java
harmony/enhanced/classlib/branches/java6/modules/security/src/main/java/common/java/security/CodeSigner.java
harmony/enhanced/classlib/branches/java6/modules/security/src/main/java/common/java/security/IdentityScope.java
harmony/enhanced/classlib/branches/java6/modules/security/src/main/java/common/java/security/KeyStore.java
harmony/enhanced/classlib/branches/java6/modules/security/src/main/java/common/java/security/PermissionCollection.java
harmony/enhanced/classlib/branches/java6/modules/security/src/main/java/common/java/security/ProtectionDomain.java
harmony/enhanced/classlib/branches/java6/modules/security/src/main/java/common/java/security/Timestamp.java
harmony/enhanced/classlib/branches/java6/modules/security/src/main/java/common/java/security/cert/CertPath.java
harmony/enhanced/classlib/branches/java6/modules/security/src/main/java/common/java/security/cert/CollectionCertStoreParameters.java
harmony/enhanced/classlib/branches/java6/modules/security/src/main/java/common/java/security/cert/LDAPCertStoreParameters.java
harmony/enhanced/classlib/branches/java6/modules/security/src/main/java/common/java/security/cert/PKIXBuilderParameters.java
harmony/enhanced/classlib/branches/java6/modules/security/src/main/java/common/java/security/cert/PKIXCertPathBuilderResult.java
harmony/enhanced/classlib/branches/java6/modules/security/src/main/java/common/java/security/cert/PKIXCertPathValidatorResult.java
harmony/enhanced/classlib/branches/java6/modules/security/src/main/java/common/java/security/cert/PKIXParameters.java
harmony/enhanced/classlib/branches/java6/modules/security/src/main/java/common/java/security/cert/PolicyQualifierInfo.java
harmony/enhanced/classlib/branches/java6/modules/security/src/main/java/common/java/security/cert/TrustAnchor.java
harmony/enhanced/classlib/branches/java6/modules/security/src/main/java/common/java/security/cert/X509CRLSelector.java
harmony/enhanced/classlib/branches/java6/modules/security/src/main/java/common/java/security/cert/X509CertSelector.java
harmony/enhanced/classlib/branches/java6/modules/security/src/main/java/common/org/apache/harmony/security/asn1/ASN1Oid.java
harmony/enhanced/classlib/branches/java6/modules/security/src/main/java/common/org/apache/harmony/security/asn1/ObjectIdentifier.java
harmony/enhanced/classlib/branches/java6/modules/security/src/main/java/common/org/apache/harmony/security/fortress/DefaultPolicyParser.java
harmony/enhanced/classlib/branches/java6/modules/security/src/main/java/common/org/apache/harmony/security/fortress/Engine.java
harmony/enhanced/classlib/branches/java6/modules/security/src/main/java/common/org/apache/harmony/security/fortress/Services.java
harmony/enhanced/classlib/branches/java6/modules/security/src/main/java/common/org/apache/harmony/security/pkcs10/CertificationRequestInfo.java
harmony/enhanced/classlib/branches/java6/modules/security/src/main/java/common/org/apache/harmony/security/pkcs7/ContentInfo.java
harmony/enhanced/classlib/branches/java6/modules/security/src/main/java/common/org/apache/harmony/security/pkcs7/SignedData.java
harmony/enhanced/classlib/branches/java6/modules/security/src/main/java/common/org/apache/harmony/security/pkcs7/SignerInfo.java
harmony/enhanced/classlib/branches/java6/modules/security/src/main/java/common/org/apache/harmony/security/utils/AlgNameMapper.java
harmony/enhanced/classlib/branches/java6/modules/security/src/main/java/common/org/apache/harmony/security/utils/ObjectIdentifier.java
harmony/enhanced/classlib/branches/java6/modules/security/src/main/java/common/org/apache/harmony/security/x501/AttributeValue.java
harmony/enhanced/classlib/branches/java6/modules/security/src/main/java/common/org/apache/harmony/security/x509/AccessDescription.java
harmony/enhanced/classlib/branches/java6/modules/security/src/main/java/common/org/apache/harmony/security/x509/GeneralName.java
harmony/enhanced/classlib/branches/java6/modules/security/src/main/java/common/org/apache/harmony/security/x509/InfoAccessSyntax.java
harmony/enhanced/classlib/branches/java6/modules/security/src/main/java/common/org/apache/harmony/security/x509/tsp/PKIStatusInfo.java
harmony/enhanced/classlib/branches/java6/modules/security/src/main/java/common/org/apache/harmony/security/x509/tsp/TSTInfo.java
harmony/enhanced/classlib/branches/java6/modules/security/src/main/java/common/org/apache/harmony/security/x509/tsp/TimeStampReq.java
harmony/enhanced/classlib/branches/java6/modules/security/src/main/java/common/org/apache/harmony/security/x509/tsp/TimeStampResp.java
harmony/enhanced/classlib/branches/java6/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/cert/X509CertSelectorTest.java
harmony/enhanced/classlib/branches/java6/modules/sound/build.xml
harmony/enhanced/classlib/branches/java6/modules/sound/make/hyproperties.xml
harmony/enhanced/classlib/branches/java6/modules/sql/build.xml
harmony/enhanced/classlib/branches/java6/modules/sql/make/hyproperties.xml
harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/javax/sql/rowset/serial/SQLOutputImpl.java
harmony/enhanced/classlib/branches/java6/modules/suncompat/build.xml
harmony/enhanced/classlib/branches/java6/modules/suncompat/make/hyproperties.xml
harmony/enhanced/classlib/branches/java6/modules/swing/build.xml
harmony/enhanced/classlib/branches/java6/modules/swing/make/exclude.common
harmony/enhanced/classlib/branches/java6/modules/swing/make/hyproperties.xml
harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/JViewport.java
harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/UIManager.java
harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/basic/BasicFileChooserUI.java
harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/basic/BasicListUI.java
harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/basic/BasicTableUI.java
harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/basic/BasicTreeUI.java
harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/metal/MetalFileChooserUI.java
harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/table/AbstractTableModel.java
harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/text/AbstractDocument.java
harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/text/AbstractWriter.java
harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/text/ComponentView.java
harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/text/DefaultEditorKit.java
harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/text/TabSet.java
harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/text/TabStop.java
harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/text/html/CSS.java
harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/text/html/CascadedStyle.java
harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/text/html/HTMLWriter.java
harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/text/html/Selector.java
harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/text/html/SimpleSelector.java
harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/org/apache/harmony/x/swing/ExtendedListCellRenderer.java
harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/org/apache/harmony/x/swing/text/html/cssparser/CSSParser.java
harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/org/apache/harmony/x/swing/text/html/cssparser/ParseException.java
harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/org/apache/harmony/x/swing/text/html/cssparser/TokenMgrError.java
harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/org/apache/harmony/x/swing/text/html/cssparser/TokenResolver.java
harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/org/apache/harmony/x/swing/text/html/cssparser/metamodel/RuleSet.java
harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/org/apache/harmony/x/swing/text/html/cssparser/metamodel/Sheet.java
harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/org/apache/harmony/x/swing/text/rtf/ParseException.java
harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/org/apache/harmony/x/swing/text/rtf/RTFParser.java
harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/org/apache/harmony/x/swing/text/rtf/TokenMgrError.java
harmony/enhanced/classlib/branches/java6/modules/swing/src/test/api/java.injected/javax/swing/BasicSwingTestCase.java (props changed)
harmony/enhanced/classlib/branches/java6/modules/swing/src/test/api/java.injected/javax/swing/SwingTestCase.java (props changed)
harmony/enhanced/classlib/branches/java6/modules/swing/src/test/api/java.injected/javax/swing/text/ComponentViewTest.java
harmony/enhanced/classlib/branches/java6/modules/swing/src/test/api/java.injected/javax/swing/text/StyleConstantsTest.java
harmony/enhanced/classlib/branches/java6/modules/swing/src/test/api/java.injected/javax/swing/text/parser/ (props changed)
harmony/enhanced/classlib/branches/java6/modules/text/META-INF/MANIFEST.MF
harmony/enhanced/classlib/branches/java6/modules/text/build.xml
harmony/enhanced/classlib/branches/java6/modules/text/make/hyproperties.xml
harmony/enhanced/classlib/branches/java6/modules/text/src/main/java/java/text/AttributedString.java
harmony/enhanced/classlib/branches/java6/modules/text/src/main/java/java/text/ChoiceFormat.java
harmony/enhanced/classlib/branches/java6/modules/text/src/main/java/java/text/DateFormatSymbols.java
harmony/enhanced/classlib/branches/java6/modules/text/src/main/java/java/text/DecimalFormat.java
harmony/enhanced/classlib/branches/java6/modules/text/src/main/java/java/text/DecimalFormatSymbols.java
harmony/enhanced/classlib/branches/java6/modules/text/src/main/java/java/text/MessageFormat.java
harmony/enhanced/classlib/branches/java6/modules/text/src/main/java/java/text/NumberFormat.java
harmony/enhanced/classlib/branches/java6/modules/text/src/main/java/java/text/SimpleDateFormat.java
harmony/enhanced/classlib/branches/java6/modules/x-net/build.xml
harmony/enhanced/classlib/branches/java6/modules/x-net/make/hyproperties.xml
Propchange: harmony/enhanced/classlib/branches/java6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jul 4 08:38:13 2009
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk:713674-735919,765923-785553
+/harmony/enhanced/classlib/trunk:713674-735919,765923-790471
Modified: harmony/enhanced/classlib/branches/java6/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/build.xml?rev=791082&r1=791081&r2=791082&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/build.xml Sat Jul 4 08:38:13 2009
@@ -174,6 +174,15 @@
<ant antfile="make/build-test.xml" inheritall="false" target="test-all"/>
</target>
+ <target name="test-jar" depends="-init-hdk"
+ description="Jar all tests">
+ <echo>
+========================================
+Archive testing classes ...
+========================================
+</echo>
+ <ant antfile="make/build-test.xml" inheritall="false" target="test-jar-modules"/>
+ </target>
<!-- =================================
target: doc
Modified: harmony/enhanced/classlib/branches/java6/depends/build/defines.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/depends/build/defines.mk?rev=791082&r1=791081&r2=791082&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/depends/build/defines.mk (original)
+++ harmony/enhanced/classlib/branches/java6/depends/build/defines.mk Sat Jul 4 08:38:13 2009
@@ -21,6 +21,7 @@
CPP = $(CC) -E
AS = as
AR = ar
+RANLIB=echo
ARFLAGS = rcv
DLL_LD = $(CC)
DLL_LDFLAGS = -shared -Wl,-soname=$(@F) -Wl,--version-script,$(EXPFILE)
@@ -34,46 +35,25 @@
EXERPATHPREFIX = -Xlinker -z -Xlinker origin -Xlinker -rpath \
-Xlinker \$$ORIGIN/ -Xlinker -rpath-link \
-Xlinker
-ifneq ($(HY_OS),zos)
WARNFLAGS=-Werror
-else
-WARNFLAGS=
-endif
-include $(HY_HDK)/build/make/platform/$(HY_PLATFORM).mk
-
-ifeq ($(RANLIB),)
-RANLIB=echo
-endif
-
-ifneq ($(HY_OS),freebsd)
-ifneq ($(HY_OS),zos)
-OSLIBS += -ldl
-endif
-endif
+PLATFORM = -fpic
+HYDEBUGCFLAGS = -ggdb -O0
+HYRELEASECFLAGS = -O1 -DNDEBUG
EXEPATH=../
LIBPATH=$(HY_HDK)/lib/
-
-ifneq ($(HY_OS),zos)
DLLPATH=$(HY_HDK)/jdk/jre/bin/
-else
-# 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)
-endif
SHAREDSUB=../shared/
-
-DEFINES += -D_REENTRANT
INCLUDES += -I$(HY_HDK)/include -I$(HY_HDK)/jdk/include -I. -I$(SHAREDSUB)
ifndef HYDEBUGCFLAGS
HYDEBUGCFLAGS = -ggdb -O0
endif
-ifndef HYRELEASECFLAGS
-HYRELEASECFLAGS = -O1 -DNDEBUG
-endif
+include $(HY_HDK)/build/make/platform/$(HY_PLATFORM).mk
+
+DEFINES += -D_REENTRANT
ifeq ($(HY_CFG),release)
OPT += $(HYRELEASECFLAGS)
Modified: harmony/enhanced/classlib/branches/java6/depends/build/platform/aix.ppc32.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/depends/build/platform/aix.ppc32.mk?rev=791082&r1=791081&r2=791082&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/depends/build/platform/aix.ppc32.mk (original)
+++ harmony/enhanced/classlib/branches/java6/depends/build/platform/aix.ppc32.mk Sat Jul 4 08:38:13 2009
@@ -13,16 +13,20 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-DEFINES += -DAIX -DAIX_PPC32 -DHYPPC32 -D_Xconst="" -DIPv6_FUNCTION_SUPPORT
-OPT += -fpic -qcpluscmt -O3 -s -q mbcs -qlanglvl=extended -qarch=ppc -qinfo=pro -qalias=noansi -D_XOPEN_SOURCE_EXTENDED=1 -D_ALL_SOURCE -D_LARGE_FILES -qsuppress=1500-010
+CC = xlc
+DEFINES += -DAIX -DAIX_PPC32 -DHYPPC32 -D_Xconst="" -DIPv6_FUNCTION_SUPPORT \
+PLATFORM += -qcpluscmt -q32 -q mbcs -qlanglvl=extended -qarch=ppc -qinfo=pro \
+ -qalias=noansi -D_XOPEN_SOURCE_EXTENDED=1 -D_ALL_SOURCE \
+ -D_LARGE_FILES -qsuppress=1500-010
OSLIBS = -lc_r -lC_r -lm -lpthread -liconv
XLIBS = -L/opt/freeware/lib -lX11 -lXft -lfreetype -lfontconfig -lXext -lXtst
STDCLIBS =
WARNFLAGS =
-HYDEBUGCFLAGS = -g
+HYDEBUGCFLAGS = -g -O0
+HYRELEASEFLAGS = -s -O3 -DNDEBUG
ARFLAGS = -X32 rcv
-ASFLAGS += -mppc
+ASFLAGS += -a32 -mppc
DLL_LD = $(LD)
DLL_LDFLAGS = -bE:$(EXPFILE)
LDFLAGS += -G -bnoentry -bernotok
Modified: harmony/enhanced/classlib/branches/java6/depends/build/platform/aix.ppc64.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/depends/build/platform/aix.ppc64.mk?rev=791082&r1=791081&r2=791082&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/depends/build/platform/aix.ppc64.mk (original)
+++ harmony/enhanced/classlib/branches/java6/depends/build/platform/aix.ppc64.mk Sat Jul 4 08:38:13 2009
@@ -13,13 +13,17 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+CC = xlc
DEFINES += -DAIX -DAIX_PPC64 -DHYPPC64 -D_Xconst="" -DIPv6_FUNCTION_SUPPORT
-OPT += -fpic -q64 -qcpluscmt -O3 -s -q64 -DPPC64 -q mbcs -qlanglvl=extended -qarch=ppc -qinfo=pro -qalias=noansi -D_XOPEN_SOURCE_EXTENDED=1 -D_ALL_SOURCE -D_LARGE_FILES -qsuppress=1500-010
+PLATFORM += -qcpluscmt -q64 -DPPC64 -q mbcs -qlanglvl=extended -qarch=ppc \
+ -qinfo=pro -qalias=noansi -D_XOPEN_SOURCE_EXTENDED=1 -D_ALL_SOURCE \
+ -D_LARGE_FILES -qsuppress=1500-010
OSLIBS = -lc_r -lC_r -lm -lpthread -liconv
XLIBS = -L/opt/freeware/lib -lX11 -lXft -lfreetype -lfontconfig -lXext -lXtst
STDCLIBS =
WARNFLAGS =
-HYDEBUGCFLAGS = -g
+HYDEBUGCFLAGS = -g -O0
+HYRELEASEFLAGS = -s -O3 -DNDEBUG
ARFLAGS = -X64 rcv
ASFLAGS += -a64 -many
Modified: harmony/enhanced/classlib/branches/java6/depends/build/platform/freebsd.x86.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/depends/build/platform/freebsd.x86.mk?rev=791082&r1=791081&r2=791082&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/depends/build/platform/freebsd.x86.mk (original)
+++ harmony/enhanced/classlib/branches/java6/depends/build/platform/freebsd.x86.mk Sat Jul 4 08:38:13 2009
@@ -13,8 +13,9 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-DEFINES += -DFREEBSD -DFREEBSD_X86 -DHYX86 -DNEEDS_SYS_TYPES -DIPv6_FUNCTION_SUPPORT
-OPT += -fpic -march=pentium3
+DEFINES += -DFREEBSD -DFREEBSD_X86 -DHYX86 -DNEEDS_SYS_TYPES \
+ -DIPv6_FUNCTION_SUPPORT
+PLATFORM += -march=pentium3
OSLIBS = -L/usr/local/lib -lpthread -lm
INCLUDES += -I/usr/local/include
XLIBS = -lX11 -lXft -lXext -lXtst
Modified: harmony/enhanced/classlib/branches/java6/depends/build/platform/freebsd.x86_64.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/depends/build/platform/freebsd.x86_64.mk?rev=791082&r1=791081&r2=791082&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/depends/build/platform/freebsd.x86_64.mk (original)
+++ harmony/enhanced/classlib/branches/java6/depends/build/platform/freebsd.x86_64.mk Sat Jul 4 08:38:13 2009
@@ -13,8 +13,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-DEFINES += -DFREEBSD -DFREEBSD_X86_64 -DHYX86_64 -DNEEDS_SYS_TYPES -DIPv6_FUNCTION_SUPPORT
-OPT += -fpic
+DEFINES += -DFREEBSD -DFREEBSD_X86_64 -DHYX86_64 -DNEEDS_SYS_TYPES \
+ -DIPv6_FUNCTION_SUPPORT
OSLIBS = -L/usr/local/lib -lpthread -lm
INCLUDES += -I/usr/local/include
XLIBS = -lX11 -lXft -lXext -lXtst
Modified: harmony/enhanced/classlib/branches/java6/depends/build/platform/linux.ia64.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/depends/build/platform/linux.ia64.mk?rev=791082&r1=791081&r2=791082&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/depends/build/platform/linux.ia64.mk (original)
+++ harmony/enhanced/classlib/branches/java6/depends/build/platform/linux.ia64.mk Sat Jul 4 08:38:13 2009
@@ -14,5 +14,4 @@
# limitations under the License.
DEFINES += -DLINUX -DLINUX_IA64 -DHYIA64 -DIPv6_FUNCTION_SUPPORT
-
-OPT += -fpic
+OSLIBS += -ldl
Modified: harmony/enhanced/classlib/branches/java6/depends/build/platform/linux.ppc32.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/depends/build/platform/linux.ppc32.mk?rev=791082&r1=791081&r2=791082&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/depends/build/platform/linux.ppc32.mk (original)
+++ harmony/enhanced/classlib/branches/java6/depends/build/platform/linux.ppc32.mk Sat Jul 4 08:38:13 2009
@@ -14,7 +14,7 @@
# limitations under the License.
DEFINES += -DLINUX -DLINUX_PPC32 -DHYPPC32 -DIPv6_FUNCTION_SUPPORT
-OPT += -fpic -m32
-
+PLATFORM += -m32
ASFLAGS += -a32
LDFLAGS += -m32
+OSLIBS += -ldl
Modified: harmony/enhanced/classlib/branches/java6/depends/build/platform/linux.ppc64.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/depends/build/platform/linux.ppc64.mk?rev=791082&r1=791081&r2=791082&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/depends/build/platform/linux.ppc64.mk (original)
+++ harmony/enhanced/classlib/branches/java6/depends/build/platform/linux.ppc64.mk Sat Jul 4 08:38:13 2009
@@ -14,8 +14,8 @@
# limitations under the License.
DEFINES += -DLINUX -DLINUX_PPC64 -DHYPPC64 -DIPv6_FUNCTION_SUPPORT
-OPT += -fpic -m64
+PLATFORM += -m64
XLIBS = -L/usr/X11R6/lib64 -lX11 -lXft -lXext -lXtst
-
ASFLAGS += -a64
LDFLAGS += -m64
+OSLIBS += -ldl
Modified: harmony/enhanced/classlib/branches/java6/depends/build/platform/linux.s390.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/depends/build/platform/linux.s390.mk?rev=791082&r1=791081&r2=791082&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/depends/build/platform/linux.s390.mk (original)
+++ harmony/enhanced/classlib/branches/java6/depends/build/platform/linux.s390.mk Sat Jul 4 08:38:13 2009
@@ -14,7 +14,7 @@
# limitations under the License.
DEFINES += -DLINUX -DLINUX_S390 -DHYS390 -DIPv6_FUNCTION_SUPPORT
-OPT += -fpic -m31
-
+PLATFORM += -m31
ASFLAGS += -m31
LDFLAGS += -m31
+OSLIBS += -ldl
Modified: harmony/enhanced/classlib/branches/java6/depends/build/platform/linux.s390x.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/depends/build/platform/linux.s390x.mk?rev=791082&r1=791081&r2=791082&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/depends/build/platform/linux.s390x.mk (original)
+++ harmony/enhanced/classlib/branches/java6/depends/build/platform/linux.s390x.mk Sat Jul 4 08:38:13 2009
@@ -14,7 +14,7 @@
# limitations under the License.
DEFINES += -DLINUX -DLINUX_S390X -DHYS390X -DIPv6_FUNCTION_SUPPORT
-OPT += -fpic -m64
-
+PLATFORM += -m64
ASFLAGS += -m64
LDFLAGS += -m64
+OSLIBS += -ldl
Modified: harmony/enhanced/classlib/branches/java6/depends/build/platform/linux.x86.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/depends/build/platform/linux.x86.mk?rev=791082&r1=791081&r2=791082&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/depends/build/platform/linux.x86.mk (original)
+++ harmony/enhanced/classlib/branches/java6/depends/build/platform/linux.x86.mk Sat Jul 4 08:38:13 2009
@@ -14,4 +14,5 @@
# limitations under the License.
DEFINES += -DLINUX -DLINUX_X86 -DHYX86 -DIPv6_FUNCTION_SUPPORT
-OPT += -fpic -march=pentium3
+PLATFORM += -march=pentium3
+OSLIBS += -ldl
Modified: harmony/enhanced/classlib/branches/java6/depends/build/platform/linux.x86_64.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/depends/build/platform/linux.x86_64.mk?rev=791082&r1=791081&r2=791082&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/depends/build/platform/linux.x86_64.mk (original)
+++ harmony/enhanced/classlib/branches/java6/depends/build/platform/linux.x86_64.mk Sat Jul 4 08:38:13 2009
@@ -14,5 +14,5 @@
# limitations under the License.
DEFINES += -DLINUX -DLINUX_X86_64 -DHYX86_64 -DIPv6_FUNCTION_SUPPORT
-OPT += -fpic
XLIBS = -L/usr/X11R6/lib64 -lX11 -lXft -lXext -lXtst
+OSLIBS += -ldl
Modified: harmony/enhanced/classlib/branches/java6/depends/build/platform/macosx.ppc32.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/depends/build/platform/macosx.ppc32.mk?rev=791082&r1=791081&r2=791082&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/depends/build/platform/macosx.ppc32.mk (original)
+++ harmony/enhanced/classlib/branches/java6/depends/build/platform/macosx.ppc32.mk Sat Jul 4 08:38:13 2009
@@ -14,8 +14,8 @@
# limitations under the License.
DEFINES += -DMACOSX -DMACOSX_PPC32 -DPPC32 -DIPv6_FUNCTION_SUPPORT
-OPT += -fpic -fno-common
-OSLIBS = -lc -lm -ldl -liconv
+PLATFORM += -fno-common
+OSLIBS += -ldl -liconv
XLIBS = -L/usr/X11R6/lib -lX11 -lXft -lXext -lXtst -lXrender -lexpat \
-L/sw/lib/freetype2/lib -lfreetype -lfontconfig
MDLLIBPREFIX =
Modified: harmony/enhanced/classlib/branches/java6/depends/build/platform/macosx.x86.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/depends/build/platform/macosx.x86.mk?rev=791082&r1=791081&r2=791082&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/depends/build/platform/macosx.x86.mk (original)
+++ harmony/enhanced/classlib/branches/java6/depends/build/platform/macosx.x86.mk Sat Jul 4 08:38:13 2009
@@ -17,7 +17,7 @@
# Add the default location of the macports.org install to the includes
INCLUDES += -I/opt/local/include
-OPT += -fPIC -fno-common
+PLATFORM = -fPIC -fno-common
OSLIBS = -L/opt/local/lib -lc -lm -ldl -liconv
XLIBS = -L/usr/X11R6/lib -lX11 -lXft -lXext -lXtst -lXrender -lexpat \
-lfreetype -lfontconfig
Modified: harmony/enhanced/classlib/branches/java6/depends/build/platform/zos.s390.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/depends/build/platform/zos.s390.mk?rev=791082&r1=791081&r2=791082&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/depends/build/platform/zos.s390.mk (original)
+++ harmony/enhanced/classlib/branches/java6/depends/build/platform/zos.s390.mk Sat Jul 4 08:38:13 2009
@@ -20,12 +20,14 @@
CXX = cxx
DEFINES += -DZOS -DZOS_S390 -DHYS390 -DHY_ATOE
-OPT += -Wc,xplink,convlit\(ISO8859-1\),FLOAT\(IEEE,FOLD,AFP\) -Wa,goff -Wc,NOANSIALIAS -Wc,DLL,EXPORTALL
+PLATFORM = -Wc,xplink,convlit\(ISO8859-1\),FLOAT\(IEEE,FOLD,AFP\) -Wa,goff \
+ -Wc,NOANSIALIAS -Wc,DLL,EXPORTALL
CFLAGS += -Wc,"SSCOMM" -Wc,"langlvl(commonc)" -Wc,gonumber
CXXFLAGS += -+ -Wc,"langlvl(extended)" -Wc,gonumber
-ASFLAGS += -Wc,xplink,convlit\(ISO8859-1\) -Wc,gonumber -Wa,goff -Wc,NOANSIALIAS -Wc,DLL,EXPORTALL -c
+ASFLAGS += -Wc,xplink,convlit\(ISO8859-1\) -Wc,gonumber -Wa,goff \
+ -Wc,NOANSIALIAS -Wc,DLL,EXPORTALL -c
LDFLAGS += -Wl,xplink,dll
# No need for --start-group and --end-group tags here
@@ -41,5 +43,12 @@
# We can't use the -Xlinker options on zOS
EXERPATHPREFIX =
-# Override default debug flags
+# Different compiler on zOS
+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)
Modified: harmony/enhanced/classlib/branches/java6/depends/build/platform/zos.s390x.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/depends/build/platform/zos.s390x.mk?rev=791082&r1=791081&r2=791082&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/depends/build/platform/zos.s390x.mk (original)
+++ harmony/enhanced/classlib/branches/java6/depends/build/platform/zos.s390x.mk Sat Jul 4 08:38:13 2009
@@ -20,12 +20,14 @@
CXX = cxx
DEFINES += -DZOS -DZOS_S390X -DHYS390X -DHY_ATOE
-OPT += -Wc,lp64,xplink,convlit\(ISO8859-1\),FLOAT\(IEEE,FOLD,AFP\) -Wa,goff -Wc,NOANSIALIAS -Wc,DLL,EXPORTALL
+PLATFORM = -Wc,lp64,xplink,convlit\(ISO8859-1\),FLOAT\(IEEE,FOLD,AFP\) \
+ -Wa,goff -Wc,NOANSIALIAS -Wc,DLL,EXPORTALL
CFLAGS += -Wc,"SSCOMM" -Wc,"langlvl(commonc)"
CXXFLAGS += -+ -Wc,"langlvl(extended)"
-ASFLAGS += -Wc,lp64,xplink,convlit\(ISO8859-1\) -Wa,goff -Wc,NOANSIALIAS -Wc,DLL,EXPORTALL -Wa,SYSPARM\(BIT64\) -c
+ASFLAGS += -Wc,lp64,xplink,convlit\(ISO8859-1\) -Wa,goff -Wc,NOANSIALIAS \
+ -Wc,DLL,EXPORTALL -Wa,SYSPARM\(BIT64\) -c
LDFLAGS += -Wl,lp64 -Wl,xplink,dll
# No need for --start-group and --end-group tags here
@@ -41,5 +43,12 @@
# We can't use the -Xlinker options on z/OS
EXERPATHPREFIX =
-# Override default debug flags
+# Different compiler on zOS
+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)
Modified: harmony/enhanced/classlib/branches/java6/depends/build/rules.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/depends/build/rules.mk?rev=791082&r1=791081&r2=791082&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/depends/build/rules.mk (original)
+++ harmony/enhanced/classlib/branches/java6/depends/build/rules.mk Sat Jul 4 08:38:13 2009
@@ -17,8 +17,8 @@
# Configuration Makefile
#
-CFLAGS := $(DEFINES) $(INCLUDES) $(OPT) $(CFLAGS) $(WARNFLAGS)
-CXXFLAGS := $(DEFINES) $(INCLUDES) $(OPT) $(CXXFLAGS) $(WARNFLAGS)
+CFLAGS := $(DEFINES) $(INCLUDES) $(OPT) $(PLATFORM) $(CFLAGS) $(WARNFLAGS)
+CXXFLAGS := $(DEFINES) $(INCLUDES) $(OPT) $(PLATFORM) $(CXXFLAGS) $(WARNFLAGS)
EXPFILE = $(notdir $(basename $(DLLNAME))).exp
ifneq ($(HY_OS),zos)
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=791082&r1=791081&r2=791082&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/make/build-java.xml (original)
+++ harmony/enhanced/classlib/branches/java6/make/build-java.xml Sat Jul 4 08:38:13 2009
@@ -201,7 +201,6 @@
<!-- Copy across the boot dependency jars --><!-- TOFIX clean these? -->
<copy todir="${hy.jdk}/jre/lib/boot">
<fileset dir="${depends.jars}">
- <patternset includes="asm-3.1/*.jar" />
<patternset includes="icu4j_4.0/*.jar" />
<patternset includes="xalan-j_2.7.0/xalan.jar" />
<patternset includes="xerces_2.9.1/*.jar" />
Modified: harmony/enhanced/classlib/branches/java6/make/build-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/make/build-test.xml?rev=791082&r1=791081&r2=791082&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/make/build-test.xml (original)
+++ harmony/enhanced/classlib/branches/java6/make/build-test.xml Sat Jul 4 08:38:13 2009
@@ -39,8 +39,10 @@
<!-- this list of components to test will grow to eventually be all modules -->
<target name="test-all"
- depends="clean-test-output, test-modules, process-empty, gen-report, check-test-result">
- </target>
+ depends="clean-test-output, test-jar-init, test-modules, process-test-output" />
+
+ <target name="process-test-output"
+ depends="process-empty, gen-report, check-test-result" />
<target name="clean">
<delete dir="${tests.output}" />
@@ -54,9 +56,16 @@
</target>
<target name="test-modules" depends="support-jar, test-jre-vm-info">
+ <poll-modules target="-test-module" />
+ </target>
+
+ <target name="test-jar-init">
<copy file="${basedir}/make/test.properties" tofile="${hy.hdk}/build/test/test.properties"/>
<copy file="${basedir}/make/run-test.xml" tofile="${hy.hdk}/build/test/build.xml"/>
- <poll-modules target="-test-module" />
+ </target>
+
+ <target name="test-jar-modules" depends="test-jar-init">
+ <poll-modules target="test-jar" />
</target>
<target name="gen-report" depends="full-report,short-report" />
Modified: harmony/enhanced/classlib/branches/java6/make/depends-common.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/make/depends-common.xml?rev=791082&r1=791081&r2=791082&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/make/depends-common.xml (original)
+++ harmony/enhanced/classlib/branches/java6/make/depends-common.xml Sat Jul 4 08:38:13 2009
@@ -25,7 +25,9 @@
where possible.
</description>
- <loadproperties srcfile="${basedir}/make/depends.properties">
+ <!-- temporary workaround for Ant bug 47382 - to be removed when that is resolved and released -->
+ <copy file="${basedir}/make/depends.properties" tofile="${basedir}/make/depends.properties.ascii" outputencoding="ISO-8859-1" />
+ <loadproperties srcfile="${basedir}/make/depends.properties.ascii" encoding="ISO-8859-1">
<filterchain>
<filterreader classname="org.apache.tools.ant.filters.ReplaceTokens">
<param type="token" name="${hy.arch}" value=""/>
@@ -35,6 +37,7 @@
</filterreader>
</filterchain>
</loadproperties>
+ <delete file="${basedir}/make/depends.properties.ascii" />
<macrodef name="download-one-file">
<attribute name="src" />
Propchange: harmony/enhanced/classlib/branches/java6/make/depends-common.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jul 4 08:38:13 2009
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/make/depends-common.xml:768152-785553
+/harmony/enhanced/classlib/trunk/make/depends-common.xml:768152-790471
Modified: harmony/enhanced/classlib/branches/java6/make/depends.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/make/depends.properties?rev=791082&r1=791081&r2=791082&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/make/depends.properties (original)
+++ harmony/enhanced/classlib/branches/java6/make/depends.properties Sat Jul 4 08:38:13 2009
@@ -112,12 +112,6 @@
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
-
icu4j.ver=icu4j_4.0
icu4j.dir=${depends.jars}/${icu4j.ver}
icu4j.jar=${icu4j.dir}/icu4j-4_0.jar
Modified: harmony/enhanced/classlib/branches/java6/make/depends.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/make/depends.xml?rev=791082&r1=791081&r2=791082&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/make/depends.xml (original)
+++ harmony/enhanced/classlib/branches/java6/make/depends.xml Sat Jul 4 08:38:13 2009
@@ -42,7 +42,6 @@
<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}" />
<check-one-file src="${icu4j.url}" dest="${icu4j.jar}" />
<check-one-file src="${icu4j-charsets.url}" dest="${icu4j-charsets.jar}" />
</target>
@@ -176,10 +175,6 @@
dest="${derby.jar}"
md5="${derby.md5}" />
- <mkdir dir="${asm.dir}" />
- <download-one-file src="${asm.url}" dest="${asm.jar}"
- md5="${asm.md5}" />
-
<mkdir dir="${icu4j.dir}" />
<download-one-file src="${icu4j.url}"
dest="${icu4j.jar}"
Modified: harmony/enhanced/classlib/branches/java6/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/make/run-test.xml?rev=791082&r1=791081&r2=791082&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/make/run-test.xml (original)
+++ harmony/enhanced/classlib/branches/java6/make/run-test.xml Sat Jul 4 08:38:13 2009
@@ -18,6 +18,7 @@
<project name="Harmony Test" default="test" basedir=".">
+ <property name="test.jre.home" location="../../jdk/jre" />
<property file="test.properties" />
<property name="build.module" value="all"/>
<import file="properties.xml" />
@@ -95,6 +96,9 @@
</fileset>
<report format="frames" todir="${test.report.dir}" />
</junitreport>
+ <property name="display-location"
+ location="${test.report.dir}/index.html"/>
+ <echo message="The test report is in ${display-location}"/>
</target>
<target name="failure">
Modified: harmony/enhanced/classlib/branches/java6/modules/accessibility/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/accessibility/build.xml?rev=791082&r1=791081&r2=791082&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/accessibility/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/accessibility/build.xml Sat Jul 4 08:38:13 2009
@@ -23,6 +23,8 @@
<property name="hy.hdk" location="${basedir}/../../deploy" />
<import file="${hy.hdk}/build/ant/properties.xml" />
+ <property name="tests.output" location="../../build/test_report" />
+
<!-- set global properties for this build. -->
<xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
@@ -169,7 +171,7 @@
<target name="run-tests">
- <mkdir dir="${hy.tests.reports}" />
+ <mkdir dir="${tests.output}" />
<property name="test.jre.home" value="${hy.jdk}/jre" />
@@ -193,7 +195,7 @@
<formatter type="xml" />
- <batchtest todir="${hy.tests.reports}" haltonfailure="no">
+ <batchtest todir="${tests.output}" haltonfailure="no">
<fileset dir="${hy.accessibility.src.test.api}/java/common">
<!-- if ${test.case} -->
@@ -209,12 +211,12 @@
</target>
<target name="touch-failures-file" if="test.failures">
- <echo file="${hy.tests.reports}/test.failures"
+ <echo file="${tests.output}/test.failures"
append="true">accessibility${line.separator}</echo>
</target>
<target name="touch-errors-file" if="test.errors">
- <echo file="${hy.tests.reports}/test.errors"
+ <echo file="${tests.output}/test.errors"
append="true">accessibility${line.separator}</echo>
</target>
Modified: harmony/enhanced/classlib/branches/java6/modules/accessibility/make/hyproperties.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/accessibility/make/hyproperties.xml?rev=791082&r1=791081&r2=791082&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/accessibility/make/hyproperties.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/accessibility/make/hyproperties.xml Sat Jul 4 08:38:13 2009
@@ -42,7 +42,4 @@
<jdk location="../../deploy/jdk" />
<build location="../../build/classes" />
- <tests>
- <reports location="../../build/test_report" />
- </tests>
</hy>
Modified: harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleRelationSet.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleRelationSet.java?rev=791082&r1=791081&r2=791082&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleRelationSet.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleRelationSet.java Sat Jul 4 08:38:13 2009
@@ -117,7 +117,7 @@
if (relations == null) {
return ""; //$NON-NLS-1$
}
- StringBuffer result = new StringBuffer();
+ StringBuilder result = new StringBuilder();
for (Iterator<AccessibleRelation> it = relations.iterator(); it
.hasNext();) {
result.append(it.next());
Modified: harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleStateSet.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleStateSet.java?rev=791082&r1=791081&r2=791082&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleStateSet.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/accessibility/src/main/java/javax/accessibility/AccessibleStateSet.java Sat Jul 4 08:38:13 2009
@@ -91,7 +91,7 @@
if (states == null) {
return null;
}
- StringBuffer str = new StringBuffer();
+ StringBuilder str = new StringBuilder();
for (Iterator<AccessibleState> it = states.iterator(); it.hasNext();) {
str.append(it.next().toString());
if (it.hasNext()) {
Modified: harmony/enhanced/classlib/branches/java6/modules/annotation/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/annotation/build.xml?rev=791082&r1=791081&r2=791082&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/annotation/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/annotation/build.xml Sat Jul 4 08:38:13 2009
@@ -23,6 +23,8 @@
<property name="hy.hdk" location="${basedir}/../../deploy" />
<import file="${hy.hdk}/build/ant/properties.xml" />
+ <property name="tests.output" location="../../build/test_report" />
+
<!-- set global properties for this build. -->
<xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
@@ -149,7 +151,7 @@
<target name="run-tests">
- <mkdir dir="${hy.tests.reports}" />
+ <mkdir dir="${tests.output}" />
<property name="test.jre.home" value="${hy.jdk}/jre" />
@@ -176,7 +178,7 @@
<formatter type="xml" />
- <batchtest todir="${hy.tests.reports}" haltonfailure="no" >
+ <batchtest todir="${tests.output}" haltonfailure="no" >
<fileset dir="${hy.annotation.src.test.java}">
<!-- if ${test.case} -->
@@ -192,12 +194,12 @@
</target>
<target name="touch-failures-file" if="test.failures">
- <echo file="${hy.tests.reports}/test.failures"
+ <echo file="${tests.output}/test.failures"
append="true">annotation${line.separator}</echo>
</target>
<target name="touch-errors-file" if="test.errors">
- <echo file="${hy.tests.reports}/test.errors"
+ <echo file="${tests.output}/test.errors"
append="true">annotation${line.separator}</echo>
</target>
Modified: harmony/enhanced/classlib/branches/java6/modules/annotation/make/hyproperties.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/annotation/make/hyproperties.xml?rev=791082&r1=791081&r2=791082&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/annotation/make/hyproperties.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/annotation/make/hyproperties.xml Sat Jul 4 08:38:13 2009
@@ -42,7 +42,4 @@
<jdk location="../../deploy/jdk" />
<build location="../../build/classes" />
- <tests>
- <reports location="../../build/test_report" />
- </tests>
</hy>
Modified: harmony/enhanced/classlib/branches/java6/modules/applet/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/applet/build.xml?rev=791082&r1=791081&r2=791082&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/applet/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/applet/build.xml Sat Jul 4 08:38:13 2009
@@ -23,6 +23,8 @@
<property name="hy.hdk" location="${basedir}/../../deploy" />
<import file="${hy.hdk}/build/ant/properties.xml" />
+ <property name="tests.output" location="../../build/test_report" />
+
<!-- set global properties for this build. -->
<xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
@@ -148,7 +150,7 @@
<target name="run-tests">
- <mkdir dir="${hy.tests.reports}" />
+ <mkdir dir="${tests.output}" />
<property name="test.jre.home" value="${hy.jdk}/jre" />
@@ -174,7 +176,7 @@
<formatter type="xml" />
- <batchtest todir="${hy.tests.reports}" haltonfailure="no" >
+ <batchtest todir="${tests.output}" haltonfailure="no" >
<fileset dir="${hy.applet.src.test.java}">
<!-- if ${test.case} -->
@@ -190,12 +192,12 @@
</target>
<target name="touch-failures-file" if="test.failures">
- <echo file="${hy.tests.reports}/test.failures"
+ <echo file="${tests.output}/test.failures"
append="true">applet${line.separator}</echo>
</target>
<target name="touch-errors-file" if="test.errors">
- <echo file="${hy.tests.reports}/test.errors"
+ <echo file="${tests.output}/test.errors"
append="true">applet${line.separator}</echo>
</target>
Modified: harmony/enhanced/classlib/branches/java6/modules/applet/make/hyproperties.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/applet/make/hyproperties.xml?rev=791082&r1=791081&r2=791082&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/applet/make/hyproperties.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/applet/make/hyproperties.xml Sat Jul 4 08:38:13 2009
@@ -41,7 +41,4 @@
<jdk location="../../deploy/jdk" />
<build location="../../build/classes" />
- <tests>
- <reports location="../../build/test_report" />
- </tests>
</hy>
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=791082&r1=791081&r2=791082&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/archive/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/archive/build.xml Sat Jul 4 08:38:13 2009
@@ -23,6 +23,8 @@
<property name="hy.hdk" location="${basedir}/../../deploy" />
<import file="${hy.hdk}/build/ant/properties.xml" />
+ <property name="tests.output" location="../../build/test_report" />
+
<!-- set global properties for this build. -->
<xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
@@ -294,7 +296,7 @@
<target name="run-tests">
- <mkdir dir="${hy.tests.reports}" />
+ <mkdir dir="${tests.output}" />
<property name="test.jre.home" value="${hy.jdk}/jre" />
@@ -326,7 +328,7 @@
<formatter type="xml" />
- <batchtest todir="${hy.tests.reports}" haltonfailure="no" >
+ <batchtest todir="${tests.output}" haltonfailure="no" >
<fileset dir="${hy.archive.src.test.internal}">
<!-- if ${test.case} -->
@@ -366,7 +368,7 @@
<formatter type="xml" />
- <batchtest todir="${hy.tests.reports}" haltonfailure="no" >
+ <batchtest todir="${tests.output}" haltonfailure="no" >
<fileset dir="${hy.archive.src.test.java}">
<!-- if ${test.case} -->
@@ -382,12 +384,12 @@
</target>
<target name="touch-failures-file" if="test.failures">
- <echo file="${hy.tests.reports}/test.failures"
+ <echo file="${tests.output}/test.failures"
append="true">archive${line.separator}</echo>
</target>
<target name="touch-errors-file" if="test.errors">
- <echo file="${hy.tests.reports}/test.errors"
+ <echo file="${tests.output}/test.errors"
append="true">archive${line.separator}</echo>
</target>
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=791082&r1=791081&r2=791082&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/archive/make/hyproperties.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/archive/make/hyproperties.xml Sat Jul 4 08:38:13 2009
@@ -44,7 +44,4 @@
<jdk location="../../deploy/jdk" />
<build location="../../build/classes" />
- <tests>
- <reports location="../../build/test_report" />
- </tests>
</hy>
Modified: harmony/enhanced/classlib/branches/java6/modules/archive/src/main/native/archive/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/archive/src/main/native/archive/unix/makefile?rev=791082&r1=791081&r2=791082&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/archive/src/main/native/archive/unix/makefile (original)
+++ harmony/enhanced/classlib/branches/java6/modules/archive/src/main/native/archive/unix/makefile Sat Jul 4 08:38:13 2009
@@ -31,7 +31,7 @@
MDLLIBFILES += \
$(MDLLIBZLIB) $(LIBPATH)libhypool.a \
- $(LIBPATH)libhyfdlibm.a $(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX)
+ $(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX)
DLLNAME=../libhyarchive$(HY_SHLIB_SUFFIX)
EXPNAME=HYARCHIVE_0.1
Modified: harmony/enhanced/classlib/branches/java6/modules/archive/src/main/native/archive/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/archive/src/main/native/archive/windows/makefile?rev=791082&r1=791081&r2=791082&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/archive/src/main/native/archive/windows/makefile (original)
+++ harmony/enhanced/classlib/branches/java6/modules/archive/src/main/native/archive/windows/makefile Sat Jul 4 08:38:13 2009
@@ -43,7 +43,7 @@
MDLLIBFILES = $(MDLLIBFILES) \
$(LIBPATH)hyzlib$(HY_LINKLIB_SUFFIX) \
$(LIBPATH)hypool$(HY_LINKLIB_SUFFIX) \
- $(LIBPATH)hyfdlibm$(HY_LINKLIB_SUFFIX) $(LIBPATH)vmi$(HY_LINKLIB_SUFFIX)
+ $(LIBPATH)vmi$(HY_LINKLIB_SUFFIX)
DLLBASE=0x13100000
!include <$(HY_HDK)\build\make\rules.mak>
Modified: harmony/enhanced/classlib/branches/java6/modules/archive/src/main/native/zlib/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/archive/src/main/native/zlib/unix/makefile?rev=791082&r1=791081&r2=791082&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/archive/src/main/native/zlib/unix/makefile (original)
+++ harmony/enhanced/classlib/branches/java6/modules/archive/src/main/native/zlib/unix/makefile Sat Jul 4 08:38:13 2009
@@ -20,6 +20,8 @@
# We don't need to debug into zlib
HY_CFG=release
+include $(HY_HDK)/build/make/defines.mk
+
HYRELEASECFLAGS = -O3
# Further performance improvement on x86 and x86_64
@@ -27,8 +29,6 @@
HYRELEASECFLAGS += -DUNALIGNED_OK
endif
-include $(HY_HDK)/build/make/defines.mk
-
ZLIB_DIST=../../zlib_dist/# Path to zlib
BUILDFILES = \
Modified: harmony/enhanced/classlib/branches/java6/modules/auth/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/auth/build.xml?rev=791082&r1=791081&r2=791082&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/auth/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/auth/build.xml Sat Jul 4 08:38:13 2009
@@ -24,6 +24,8 @@
<property name="hy.hdk" location="${basedir}/../../deploy" />
<import file="${hy.hdk}/build/ant/properties.xml" />
+ <property name="tests.output" location="../../build/test_report" />
+
<!-- set global properties for this build. -->
<xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
@@ -202,7 +204,7 @@
<target name="run-tests">
- <mkdir dir="${hy.tests.reports}" />
+ <mkdir dir="${tests.output}" />
<property name="test.jre.home" value="${hy.jdk}/jre" />
@@ -235,7 +237,7 @@
<formatter type="xml" />
- <batchtest todir="${hy.tests.reports}" haltonfailure="no" >
+ <batchtest todir="${tests.output}" haltonfailure="no" >
<fileset dir="${hy.auth.src.test.java.platform}">
<!-- if ${test.case} -->
@@ -261,12 +263,12 @@
</target>
<target name="touch-failures-file" if="test.failures">
- <echo file="${hy.tests.reports}/test.failures"
+ <echo file="${tests.output}/test.failures"
append="true">auth${line.separator}</echo>
</target>
<target name="touch-errors-file" if="test.errors">
- <echo file="${hy.tests.reports}/test.errors"
+ <echo file="${tests.output}/test.errors"
append="true">auth${line.separator}</echo>
</target>
Modified: harmony/enhanced/classlib/branches/java6/modules/auth/make/hyproperties.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/auth/make/hyproperties.xml?rev=791082&r1=791081&r2=791082&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/auth/make/hyproperties.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/auth/make/hyproperties.xml Sat Jul 4 08:38:13 2009
@@ -43,7 +43,4 @@
<jdk location="../../deploy/jdk" />
<build location="../../build/classes" />
- <tests>
- <reports location="../../build/test_report" />
- </tests>
</hy>
Modified: harmony/enhanced/classlib/branches/java6/modules/auth/src/main/java/common/javax/security/auth/Subject.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/auth/src/main/java/common/javax/security/auth/Subject.java?rev=791082&r1=791081&r2=791082&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/auth/src/main/java/common/javax/security/auth/Subject.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/auth/src/main/java/common/javax/security/auth/Subject.java Sat Jul 4 08:38:13 2009
@@ -430,7 +430,7 @@
@Override
public String toString() {
- StringBuffer buf = new StringBuffer("Subject:\n"); //$NON-NLS-1$
+ StringBuilder buf = new StringBuilder("Subject:\n"); //$NON-NLS-1$
Iterator<?> it = principals.iterator();
while (it.hasNext()) {
Modified: harmony/enhanced/classlib/branches/java6/modules/auth/src/main/native/auth/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/auth/src/main/native/auth/unix/makefile?rev=791082&r1=791081&r2=791082&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/auth/src/main/native/auth/unix/makefile (original)
+++ harmony/enhanced/classlib/branches/java6/modules/auth/src/main/native/auth/unix/makefile Sat Jul 4 08:38:13 2009
@@ -26,7 +26,7 @@
endif
MDLLIBFILES += \
- $(LIBPATH)libhypool.a $(LIBPATH)libhyfdlibm.a \
+ $(LIBPATH)libhypool.a \
$(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX)
DLLNAME = ../libhyauth$(HY_SHLIB_SUFFIX)
Modified: harmony/enhanced/classlib/branches/java6/modules/auth/src/main/native/auth/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/auth/src/main/native/auth/windows/makefile?rev=791082&r1=791081&r2=791082&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/auth/src/main/native/auth/windows/makefile (original)
+++ harmony/enhanced/classlib/branches/java6/modules/auth/src/main/native/auth/windows/makefile Sat Jul 4 08:38:13 2009
@@ -34,7 +34,7 @@
!ENDIF
MDLLIBFILES = $(MDLLIBFILES) $(LIBPATH)hypool$(HY_LINKLIB_SUFFIX) \
- $(LIBPATH)hyfdlibm$(HY_LINKLIB_SUFFIX) $(LIBPATH)vmi$(HY_LINKLIB_SUFFIX)
+ $(LIBPATH)vmi$(HY_LINKLIB_SUFFIX)
DLLBASE=0x1300000
COMMENT=/comment:"Auth component native code. (c) Copyright 2005, 2007 The Apache Software Foundation or its licensors, as applicable."
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/META-INF/MANIFEST.MF?rev=791082&r1=791081&r2=791082&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/META-INF/MANIFEST.MF (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/META-INF/MANIFEST.MF Sat Jul 4 08:38:13 2009
@@ -30,7 +30,6 @@
javax.print,
javax.print.attribute,
javax.print.attribute.standard,
- javax.print.event,
javax.swing,
javax.swing.event,
javax.swing.text,
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/build.xml?rev=791082&r1=791081&r2=791082&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/build.xml Sat Jul 4 08:38:13 2009
@@ -23,6 +23,8 @@
<property name="hy.hdk" location="${basedir}/../../deploy" />
<import file="${hy.hdk}/build/ant/properties.xml" />
+ <property name="tests.output" location="../../build/test_report" />
+
<!-- set global properties for this build. -->
<xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
@@ -384,7 +386,7 @@
</target>
<target name="run-tests">
- <mkdir dir="${hy.tests.reports}" />
+ <mkdir dir="${tests.output}" />
<property name="test.jre.home" value="${hy.jdk}/jre" />
<!-- bootclasspath tests -->
@@ -403,7 +405,7 @@
<formatter type="xml" />
- <batchtest todir="${hy.tests.reports}" haltonfailure="no">
+ <batchtest todir="${tests.output}" haltonfailure="no">
<fileset dir="${hy.awt.src.test.impl.boot}">
<include name="${converted.tc}" if="test.case" />
<include name="**/*Test.java" unless="test.case" />
@@ -434,7 +436,7 @@
<formatter type="xml" />
- <batchtest todir="${hy.tests.reports}">
+ <batchtest todir="${tests.output}">
<fileset dir="${hy.awt.src.test.api.java}">
<include name="${converted.tc}" if="test.case" />
<include name="**/*Test.java" unless="test.case" />
@@ -467,7 +469,7 @@
<formatter type="xml" />
- <batchtest todir="${hy.tests.reports}" haltonfailure="no" >
+ <batchtest todir="${tests.output}" haltonfailure="no" >
<fileset dir="${hy.awt.src.test.impl.boot}">
<include name="${converted.tc}" if="test.case" />
<include name="**/*Headless*Test.java" unless="test.case" />
@@ -487,12 +489,12 @@
</target>
<target name="touch-failures-file" if="test.failures">
- <echo file="${hy.tests.reports}/test.failures"
+ <echo file="${tests.output}/test.failures"
append="true">awt${line.separator}</echo>
</target>
<target name="touch-errors-file" if="test.errors">
- <echo file="${hy.tests.reports}/test.errors"
+ <echo file="${tests.output}/test.errors"
append="true">awt${line.separator}</echo>
</target>
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/make/hyproperties.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/make/hyproperties.xml?rev=791082&r1=791081&r2=791082&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/make/hyproperties.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/make/hyproperties.xml Sat Jul 4 08:38:13 2009
@@ -52,7 +52,4 @@
<jdk location="../../deploy/jdk"/>
<build location="../../build/classes"/>
- <tests>
- <reports location="../../build/test_report"/>
- </tests>
</hy>