harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ton...@apache.org
Subject svn commit: r592673 [1/10] - in /harmony/enhanced/classlib/branches/java6: depends/build/ depends/build/platform/ depends/manifests/icu4j_3.8/META-INF/ make/ modules/archive/ modules/archive/src/main/native/archive/unix/ modules/archive/src/main/native...
Date Wed, 07 Nov 2007 09:51:11 GMT
Author: tonywu
Date: Wed Nov  7 01:51:00 2007
New Revision: 592673

URL: http://svn.apache.org/viewvc?rev=592673&view=rev
Log:
Merge updates from classlib trunk@592602 since r589774

Added:
    harmony/enhanced/classlib/branches/java6/depends/build/platform/zos.s390.mk
      - copied unchanged from r592602, harmony/enhanced/classlib/trunk/depends/build/platform/zos.s390.mk
    harmony/enhanced/classlib/branches/java6/depends/build/platform/zos.s390x.mk
      - copied unchanged from r592602, harmony/enhanced/classlib/trunk/depends/build/platform/zos.s390x.mk
    harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/ldap/Filter.java
      - copied unchanged from r592602, harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/ldap/Filter.java
    harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/ldap/LdapContextFactory.java
      - copied unchanged from r592602, harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/ldap/LdapContextFactory.java
    harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/ldap/LdapContextImpl.java
      - copied unchanged from r592602, harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/ldap/LdapContextImpl.java
    harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/ldap/LdapControl.java
      - copied unchanged from r592602, harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/ldap/LdapControl.java
    harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/ldap/LdapNamingEnumeration.java
      - copied unchanged from r592602, harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/ldap/LdapNamingEnumeration.java
    harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/ldap/LdapSearchResult.java
      - copied unchanged from r592602, harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/ldap/LdapSearchResult.java
    harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/ldap/LdapUtils.java
      - copied unchanged from r592602, harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/ldap/LdapUtils.java
    harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/ldap/NotYetImplementedException.java
      - copied unchanged from r592602, harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/ldap/NotYetImplementedException.java
    harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/ldap/SearchOp.java
      - copied unchanged from r592602, harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/ldap/SearchOp.java
    harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/ldap/asn1/ASN1LdapFilter.java
      - copied unchanged from r592602, harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/ldap/asn1/ASN1LdapFilter.java
    harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/ldap/asn1/ASN1Null.java
      - copied unchanged from r592602, harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/ldap/asn1/ASN1Null.java
    harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/ldap/parser/
      - copied from r592602, harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/ldap/parser/
    harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/ldap/parser/FilterParser.java
      - copied unchanged from r592602, harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/ldap/parser/FilterParser.java
    harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/ldap/parser/FilterParserConstants.java
      - copied unchanged from r592602, harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/ldap/parser/FilterParserConstants.java
    harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/ldap/parser/FilterParserTokenManager.java
      - copied unchanged from r592602, harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/ldap/parser/FilterParserTokenManager.java
    harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/ldap/parser/LdapUrlParser.java
      - copied unchanged from r592602, harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/ldap/parser/LdapUrlParser.java
    harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/ldap/parser/LdapUrlParserConstants.java
      - copied unchanged from r592602, harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/ldap/parser/LdapUrlParserConstants.java
    harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/ldap/parser/LdapUrlParserTokenManager.java
      - copied unchanged from r592602, harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/ldap/parser/LdapUrlParserTokenManager.java
    harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/ldap/parser/ParseException.java
      - copied unchanged from r592602, harmony/enhanced/classlib/trunk/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/README
      - copied unchanged from r592602, harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/ldap/parser/README
    harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/ldap/parser/SimpleCharStream.java
      - copied unchanged from r592602, harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/ldap/parser/SimpleCharStream.java
    harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/ldap/parser/Token.java
      - copied unchanged from r592602, harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/ldap/parser/Token.java
    harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/ldap/parser/TokenMgrError.java
      - copied unchanged from r592602, harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/ldap/parser/TokenMgrError.java
    harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/ldap/parser/filter.g
      - copied unchanged from r592602, harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/ldap/parser/filter.g
    harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/ldap/parser/url.g
      - copied unchanged from r592602, harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/ldap/parser/url.g
    harmony/enhanced/classlib/branches/java6/modules/jndi/src/test/java/org/apache/harmony/jndi/provider/ldap/FilterTest.java
      - copied unchanged from r592602, harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/org/apache/harmony/jndi/provider/ldap/FilterTest.java
    harmony/enhanced/classlib/branches/java6/modules/jndi/src/test/java/org/apache/harmony/jndi/provider/ldap/LdapContextFactoryTest.java
      - copied unchanged from r592602, harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/org/apache/harmony/jndi/provider/ldap/LdapContextFactoryTest.java
    harmony/enhanced/classlib/branches/java6/modules/jndi/src/test/java/org/apache/harmony/jndi/provider/ldap/LdapContextImplTest.java
      - copied unchanged from r592602, harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/org/apache/harmony/jndi/provider/ldap/LdapContextImplTest.java
    harmony/enhanced/classlib/branches/java6/modules/jndi/src/test/java/org/apache/harmony/jndi/provider/ldap/LdapControlTest.java
      - copied unchanged from r592602, harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/org/apache/harmony/jndi/provider/ldap/LdapControlTest.java
    harmony/enhanced/classlib/branches/java6/modules/jndi/src/test/java/org/apache/harmony/jndi/provider/ldap/LdapNamingEnumerationTest.java
      - copied unchanged from r592602, harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/org/apache/harmony/jndi/provider/ldap/LdapNamingEnumerationTest.java
    harmony/enhanced/classlib/branches/java6/modules/jndi/src/test/java/org/apache/harmony/jndi/provider/ldap/SearchOpTest.java
      - copied unchanged from r592602, harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/org/apache/harmony/jndi/provider/ldap/SearchOpTest.java
    harmony/enhanced/classlib/branches/java6/modules/jndi/src/test/java/org/apache/harmony/jndi/provider/ldap/parser/
      - copied from r592602, harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/org/apache/harmony/jndi/provider/ldap/parser/
    harmony/enhanced/classlib/branches/java6/modules/jndi/src/test/java/org/apache/harmony/jndi/provider/ldap/parser/FilterParserTest.java
      - copied unchanged from r592602, harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/org/apache/harmony/jndi/provider/ldap/parser/FilterParserTest.java
    harmony/enhanced/classlib/branches/java6/modules/jndi/src/test/java/org/apache/harmony/jndi/provider/ldap/parser/LdapUrlParserTest.java
      - copied unchanged from r592602, harmony/enhanced/classlib/trunk/modules/jndi/src/test/java/org/apache/harmony/jndi/provider/ldap/parser/LdapUrlParserTest.java
    harmony/enhanced/classlib/branches/java6/modules/jndi/src/test/resources/parser/
      - copied from r592602, harmony/enhanced/classlib/trunk/modules/jndi/src/test/resources/parser/
    harmony/enhanced/classlib/branches/java6/modules/jndi/src/test/resources/parser/parser.filter.test
      - copied unchanged from r592602, harmony/enhanced/classlib/trunk/modules/jndi/src/test/resources/parser/parser.filter.test
    harmony/enhanced/classlib/branches/java6/modules/jndi/src/test/resources/parser/parser.url.test
      - copied unchanged from r592602, harmony/enhanced/classlib/trunk/modules/jndi/src/test/resources/parser/parser.url.test
Removed:
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/internal/locale/
Modified:
    harmony/enhanced/classlib/branches/java6/depends/build/defines.mak
    harmony/enhanced/classlib/branches/java6/depends/build/defines.mk
    harmony/enhanced/classlib/branches/java6/depends/build/platform/aix.ppc32.mk
    harmony/enhanced/classlib/branches/java6/depends/build/platform/aix.ppc64.mk
    harmony/enhanced/classlib/branches/java6/depends/build/platform/freebsd.x86.mk
    harmony/enhanced/classlib/branches/java6/depends/build/platform/linux.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/rules.mak
    harmony/enhanced/classlib/branches/java6/depends/manifests/icu4j_3.8/META-INF/MANIFEST.MF   (contents, props changed)
    harmony/enhanced/classlib/branches/java6/make/build-native.xml
    harmony/enhanced/classlib/branches/java6/make/properties.xml
    harmony/enhanced/classlib/branches/java6/modules/archive/build.xml
    harmony/enhanced/classlib/branches/java6/modules/archive/src/main/native/archive/unix/makefile
    harmony/enhanced/classlib/branches/java6/modules/archive/src/main/native/zip/unix/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/src/main/native/auth/unix/makefile
    harmony/enhanced/classlib/branches/java6/modules/awt/build.xml
    harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/render/JavaBlitter.java
    harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/im/InputMethodContext.java
    harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/unix/org/apache/harmony/awt/gl/linux/XBlitter.java
    harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/windows/WinGDIPGraphics2D.java
    harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/windows/WinGraphicsDevice.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/gl/windows/WinGDIPGraphics2D.cpp
    harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/gl/windows/include/org_apache_harmony_awt_gl_windows_WinGDIPGraphics2D.h
    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/win32wrapper/windows/WinDataTransfer.cpp
    harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/win32wrapper/windows/WinDataTransfer.h
    harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/x11wrapper/unix/makefile
    harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/x11wrapper/unix/nativelib_common.h
    harmony/enhanced/classlib/branches/java6/modules/awt/src/test/api/java/common/java/awt/CardLayoutRTest.java
    harmony/enhanced/classlib/branches/java6/modules/imageio/build.xml
    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/src/main/native/instrument/unix/makefile
    harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/org/apache/harmony/jndi/internal/nls/messages.properties
    harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/ldap/LdapClient.java
    harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/ldap/LdapMessage.java
    harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/ldap/asn1/ASN1Decodable.java
    harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/ldap/asn1/ASN1Encodable.java
    harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/ldap/asn1/LdapASN1Constant.java
    harmony/enhanced/classlib/branches/java6/modules/jndi/src/test/java/org/apache/harmony/jndi/provider/ldap/asn1/ASN1TestUtils.java
    harmony/enhanced/classlib/branches/java6/modules/lang-management/make/exclude.linux.x86.ibm
    harmony/enhanced/classlib/branches/java6/modules/lang-management/make/exclude.windows.x86.ibm
    harmony/enhanced/classlib/branches/java6/modules/luni/build.xml
    harmony/enhanced/classlib/branches/java6/modules/luni/make/exclude.common
    harmony/enhanced/classlib/branches/java6/modules/luni/make/exclude.linux.x86.drl
    harmony/enhanced/classlib/branches/java6/modules/luni/make/exclude.linux.x86.drl.interm
    harmony/enhanced/classlib/branches/java6/modules/luni/make/exclude.linux.x86.ibm
    harmony/enhanced/classlib/branches/java6/modules/luni/make/exclude.linux.x86_64.drl
    harmony/enhanced/classlib/branches/java6/modules/luni/make/exclude.windows.x86.drl
    harmony/enhanced/classlib/branches/java6/modules/luni/make/exclude.windows.x86_64.drl
    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/Currency.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/TimeZone.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/fdlibm/unix/makefile
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/launcher/shared/main.c
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/launcher/unix/main_hlp.c
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/shared/cbigint.c
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/shared/dblparse.c
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/shared/fltparse.c
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/shared/luniglob.c
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/unix/OSFileSystemLinux32.c
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/unix/OSMemoryLinux32.c
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/unix/OSNetworkSystemLinux.c
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/unix/makefile
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/vmi/unix/makefile
    harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/tests/api/java/util/DateTest.java
    harmony/enhanced/classlib/branches/java6/modules/misc/build.xml
    harmony/enhanced/classlib/branches/java6/modules/misc/src/main/native/accessors/shared/MemMacros.h
    harmony/enhanced/classlib/branches/java6/modules/misc/src/main/native/accessors/unix/makefile
    harmony/enhanced/classlib/branches/java6/modules/nio/build.xml
    harmony/enhanced/classlib/branches/java6/modules/nio/src/main/native/nio/unix/makefile
    harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/native/niochar/unix/makefile
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/AttributeLayout.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/BandSet.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/ClassBands.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/Codec.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/PopulationCodec.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/SegmentUtils.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/test/java/org/apache/harmony/pack200/tests/AttributeLayoutTest.java
    harmony/enhanced/classlib/branches/java6/modules/portlib/build.xml
    harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/include/shared/hycomp.h
    harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/include/unix/hysock.h
    harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/port/unix/hyerrorhelpers.c
    harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/port/unix/hyipcmutex.c
    harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/port/unix/hysharedhelper.c
    harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/port/unix/hyshsem.h
    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/unix/makefile
    harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/sig/unix/makefile
    harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/thread/unix/makefile
    harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/thrstub/unix/makefile
    harmony/enhanced/classlib/branches/java6/modules/prefs/build.xml
    harmony/enhanced/classlib/branches/java6/modules/print/build.xml
    harmony/enhanced/classlib/branches/java6/modules/regex/src/test/java/org/apache/harmony/tests/java/util/regex/Matcher2Test.java
    harmony/enhanced/classlib/branches/java6/modules/regex/src/test/java/org/apache/harmony/tests/java/util/regex/MatcherTest.java
    harmony/enhanced/classlib/branches/java6/modules/regex/src/test/java/org/apache/harmony/tests/java/util/regex/ModeTest.java
    harmony/enhanced/classlib/branches/java6/modules/regex/src/test/java/org/apache/harmony/tests/java/util/regex/Pattern2Test.java
    harmony/enhanced/classlib/branches/java6/modules/regex/src/test/java/org/apache/harmony/tests/java/util/regex/PatternErrorTest.java
    harmony/enhanced/classlib/branches/java6/modules/regex/src/test/java/org/apache/harmony/tests/java/util/regex/PatternSyntaxExceptionTest.java
    harmony/enhanced/classlib/branches/java6/modules/regex/src/test/java/org/apache/harmony/tests/java/util/regex/PatternTest.java
    harmony/enhanced/classlib/branches/java6/modules/regex/src/test/java/org/apache/harmony/tests/java/util/regex/ReplaceTest.java
    harmony/enhanced/classlib/branches/java6/modules/regex/src/test/java/org/apache/harmony/tests/java/util/regex/SplitTest.java
    harmony/enhanced/classlib/branches/java6/modules/security/build.xml
    harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/javax/sql/rowset/BaseRowSet.java
    harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/javax/sql/rowset/serial/DefaultUDTMap.java
    harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/org/apache/harmony/sql/internal/nls/messages.properties
    harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/org/apache/harmony/sql/internal/rowset/CachedRow.java
    harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/org/apache/harmony/sql/internal/rowset/CachedRowSetImpl.java
    harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/org/apache/harmony/sql/internal/rowset/CachedRowSetReader.java
    harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/org/apache/harmony/sql/internal/rowset/CachedRowSetWriter.java
    harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/org/apache/harmony/sql/internal/rowset/HYOptimisticProvider.java
    harmony/enhanced/classlib/branches/java6/modules/sql/src/test/java/org/apache/harmony/sql/tests/internal/rowset/CachedRowSetImplTest.java
    harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/JComboBox.java
    harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/SwingUtilities.java
    harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/basic/BasicComboBoxUI.java
    harmony/enhanced/classlib/branches/java6/modules/swing/src/test/api/java.injected/javax/swing/AbstractButtonTest.java
    harmony/enhanced/classlib/branches/java6/modules/swing/src/test/api/java.injected/javax/swing/JEditorPaneTest.java
    harmony/enhanced/classlib/branches/java6/modules/swing/src/test/api/java.injected/javax/swing/JListRTest.java
    harmony/enhanced/classlib/branches/java6/modules/swing/src/test/api/java.injected/javax/swing/SwingUtilitiesRTest.java
    harmony/enhanced/classlib/branches/java6/modules/swing/src/test/api/java.injected/javax/swing/plaf/metal/MetalBordersTest.java
    harmony/enhanced/classlib/branches/java6/modules/swing/src/test/api/java.injected/javax/swing/text/UtilitiesTest.java
    harmony/enhanced/classlib/branches/java6/modules/swing/src/test/api/java.injected/org/apache/harmony/swing/tests/javax/swing/text/html/parser/DTDTest.java
    harmony/enhanced/classlib/branches/java6/modules/swing/src/test/api/java.injected/org/apache/harmony/swing/tests/javax/swing/text/parser/ContentModelCompatilityTest.java
    harmony/enhanced/classlib/branches/java6/modules/text/make/exclude.common
    harmony/enhanced/classlib/branches/java6/modules/text/src/main/java/java/text/DateFormat.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/Format.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/text/src/test/java/org/apache/harmony/text/tests/java/text/CollationElementIteratorTest.java
    harmony/enhanced/classlib/branches/java6/modules/text/src/test/java/org/apache/harmony/text/tests/java/text/DateFormatSymbolsTest.java
    harmony/enhanced/classlib/branches/java6/modules/text/src/test/java/org/apache/harmony/text/tests/java/text/DecimalFormatSymbolsTest.java
    harmony/enhanced/classlib/branches/java6/modules/text/src/test/java/org/apache/harmony/text/tests/java/text/RuleBasedCollatorTest.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/KeyManagerFactory1Test.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/SSLSocketTest.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/TrustManagerFactory1Test.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/impl/java/org/apache/harmony/xnet/tests/provider/jsse/TrustManagerFactoryImplTest.java

Modified: harmony/enhanced/classlib/branches/java6/depends/build/defines.mak
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/depends/build/defines.mak?rev=592673&r1=592672&r2=592673&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/depends/build/defines.mak (original)
+++ harmony/enhanced/classlib/branches/java6/depends/build/defines.mak Wed Nov  7 01:51:00 2007
@@ -38,8 +38,11 @@
 !ENDIF
 
 HYCOMMONCFLAGS = \
-  -$(WARNING_LEVEL) -GF -Gs -MD -Zm400 \
-  -D_DLL -D_MT -D_WINSOCKAPI_ $(PLATFORM_64) \
+  -$(WARNING_LEVEL) -GF -Gs -MD -Zm400 $(PLATFORM_64) \
+  -D_CRT_SECURE_NO_DEPRECATE \
+  -D_CRT_SECURE_NO_WARNINGS \
+  -D_SCL_SECURE_NO_DEPRECATE \
+  -D_DLL -D_MT -D_WINSOCKAPI_ \
   /I$(HY_HDK)\include /I$(HY_HDK)\jdk\include /I.
 
 !ifndef HYDEBUGCFLAGS

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=592673&r1=592672&r2=592673&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/depends/build/defines.mk (original)
+++ harmony/enhanced/classlib/branches/java6/depends/build/defines.mk Wed Nov  7 01:51:00 2007
@@ -42,15 +42,24 @@
 endif
 
 ifneq ($(HY_OS),freebsd)
+ifneq ($(HY_OS),zos)
 OSLIBS += -ldl
 endif
+endif
 
 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 -DIPv6_FUNCTION_SUPPORT
+DEFINES += -D_REENTRANT
 INCLUDES += -I$(HY_HDK)/include -I$(HY_HDK)/jdk/include -I. -I$(SHAREDSUB)
 
 ifndef HYDEBUGCFLAGS

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=592673&r1=592672&r2=592673&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 Wed Nov  7 01:51:00 2007
@@ -13,7 +13,7 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-DEFINES += -DAIX -DAIX_PPC32 -DHYPPC32 -D_Xconst=""
+DEFINES += -DAIX -DAIX_PPC32 -DHYPPC32 -D_Xconst="" -DIPv6_FUNCTION_SUPPORT
 OPT += -fpic -qcpluscmt -O3 -s -q mbcs -qlanglvl=extended -qarch=ppc -qinfo=pro -qalias=noansi -D_XOPEN_SOURCE_EXTENDED=1 -D_ALL_SOURCE -D_LARGE_FILES -qsuppress=1500-010
 OSLIBS = -lc_r -lC_r -lm -lpthread -liconv
 XLIBS = -L/opt/freeware/lib -lX11 -lXft -lfreetype -lfontconfig

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=592673&r1=592672&r2=592673&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 Wed Nov  7 01:51:00 2007
@@ -13,7 +13,7 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-DEFINES += -DAIX -DAIX_PPC64 -DHYPPC64 -D_Xconst=""
+DEFINES += -DAIX -DAIX_PPC64 -DHYPPC64 -D_Xconst="" -DIPv6_FUNCTION_SUPPORT
 OPT += -fpic -q64 -qcpluscmt -O3 -s -q64 -DPPC64 -q mbcs -qlanglvl=extended -qarch=ppc -qinfo=pro -qalias=noansi -D_XOPEN_SOURCE_EXTENDED=1 -D_ALL_SOURCE -D_LARGE_FILES -qsuppress=1500-010
 OSLIBS = -lc_r -lC_r -lm -lpthread -liconv
 XLIBS = -L/opt/freeware/lib -lX11 -lXft -lfreetype -lfontconfig

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=592673&r1=592672&r2=592673&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/depends/build/platform/freebsd.x86.mk (original)
+++ harmony/enhanced/classlib/branches/java6/depends/build/platform/freebsd.x86.mk Wed Nov  7 01:51:00 2007
@@ -13,6 +13,6 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-DEFINES += -DFREEBSD -DFREEBSD_X86 -DHYX86 -DNEEDS_SYS_TYPES
-OPT += -march=pentium3
+DEFINES += -DFREEBSD -DFREEBSD_X86 -DHYX86 -DNEEDS_SYS_TYPES -DIPv6_FUNCTION_SUPPORT
+OPT += -fpic -march=pentium3
 OSLIBS = -lpthread -lm

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=592673&r1=592672&r2=592673&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 Wed Nov  7 01:51:00 2007
@@ -13,4 +13,6 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-DEFINES += -DLINUX -DLINUX_IA64 -DHYIA64
+DEFINES += -DLINUX -DLINUX_IA64 -DHYIA64 -DIPv6_FUNCTION_SUPPORT
+
+OPT += -fpic

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=592673&r1=592672&r2=592673&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 Wed Nov  7 01:51:00 2007
@@ -13,8 +13,8 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-DEFINES += -DLINUX -DLINUX_PPC32 -DHYPPC32
-OPT += -m32
+DEFINES += -DLINUX -DLINUX_PPC32 -DHYPPC32 -DIPv6_FUNCTION_SUPPORT
+OPT += -fpic -m32
 
 ASFLAGS += -a32
 LDFLAGS += -m32

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=592673&r1=592672&r2=592673&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 Wed Nov  7 01:51:00 2007
@@ -13,8 +13,8 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-DEFINES += -DLINUX -DLINUX_PPC64 -DHYPPC64
-OPT += -m64
+DEFINES += -DLINUX -DLINUX_PPC64 -DHYPPC64 -DIPv6_FUNCTION_SUPPORT
+OPT += -fpic -m64
 XLIBS = -L/usr/X11R6/lib64 -lX11 -lXft
 
 ASFLAGS += -a64

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=592673&r1=592672&r2=592673&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 Wed Nov  7 01:51:00 2007
@@ -13,7 +13,7 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-DEFINES += -DLINUX -DLINUX_S390 -DHYS390
+DEFINES += -DLINUX -DLINUX_S390 -DHYS390 -DIPv6_FUNCTION_SUPPORT
 OPT += -fpic -m31
 
 ASFLAGS += -m31

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=592673&r1=592672&r2=592673&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 Wed Nov  7 01:51:00 2007
@@ -13,7 +13,7 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-DEFINES += -DLINUX -DLINUX_S390X -DHYS390X
+DEFINES += -DLINUX -DLINUX_S390X -DHYS390X -DIPv6_FUNCTION_SUPPORT
 OPT += -fpic -m64
 
 ASFLAGS += -m64

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=592673&r1=592672&r2=592673&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 Wed Nov  7 01:51:00 2007
@@ -13,5 +13,5 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-DEFINES += -DLINUX -DLINUX_X86 -DHYX86
-OPT += -march=pentium3
+DEFINES += -DLINUX -DLINUX_X86 -DHYX86 -DIPv6_FUNCTION_SUPPORT
+OPT += -fpic -march=pentium3

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=592673&r1=592672&r2=592673&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 Wed Nov  7 01:51:00 2007
@@ -13,6 +13,6 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-DEFINES += -DLINUX -DLINUX_X86_64 -DHYX86_64
+DEFINES += -DLINUX -DLINUX_X86_64 -DHYX86_64 -DIPv6_FUNCTION_SUPPORT
 OPT += -fpic
 XLIBS = -L/usr/X11R6/lib64 -lX11 -lXft

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=592673&r1=592672&r2=592673&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 Wed Nov  7 01:51:00 2007
@@ -13,8 +13,8 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-DEFINES += -DMACOSX -DMACOSX_PPC32 -DPPC32
-OPT += -fno-common
+DEFINES += -DMACOSX -DMACOSX_PPC32 -DPPC32 -DIPv6_FUNCTION_SUPPORT
+OPT += -fpic -fno-common
 OSLIBS = -lc -lm -ldl -liconv
 XLIBS = -L/usr/X11R6/lib -lX11 -lXft -lXext -lXrender -lexpat \
         -L/sw/lib/freetype2/lib -lfreetype -lfontconfig

Modified: harmony/enhanced/classlib/branches/java6/depends/build/rules.mak
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/depends/build/rules.mak?rev=592673&r1=592672&r2=592673&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/depends/build/rules.mak (original)
+++ harmony/enhanced/classlib/branches/java6/depends/build/rules.mak Wed Nov  7 01:51:00 2007
@@ -39,18 +39,20 @@
 $(LIBNAME): $(BUILDFILES) $(VIRTFILES) $(MDLLIBFILES)
 	$(implib) /NOLOGO -subsystem:windows -out:$(LIBNAME) \
 	$(HYLDFLAGS) -machine:$(CPU) \
+	/NODEFAULTLIB:libc \
 	$(BUILDFILES) $(VIRTFILES) $(MDLLIBFILES)
 !endif
 
 !ifdef DLLNAME
 $(DLLNAME): $(LIBNAME)
 	link $(VMLINK) /debug /opt:icf /opt:ref /INCREMENTAL:NO /NOLOGO \
+	/NODEFAULTLIB:libcmt /NODEFAULTLIB:libc /FORCE:UNRESOLVED \
 	-entry:_DllMainCRTStartup$(DLLENTRY) -dll /BASE:$(DLLBASE) -machine:$(CPU) \
-		$(COMMENT) \
+	$(COMMENT) \
 	-subsystem:windows -out:$@ -map:$*.map \
 	$(BUILDFILES) $(VIRTFILES) $(MDLLIBFILES) $(SYSLIBFILES) \
-	kernel32.lib  ws2_32.lib advapi32.lib user32.lib gdi32.lib \
-		comdlg32.lib winspool.lib  $(LIBPATH)$(*F).exp
+	kernel32.lib  msvcrt.lib ws2_32.lib advapi32.lib user32.lib gdi32.lib \
+	comdlg32.lib winspool.lib  $(LIBPATH)$(*F).exp
 	if exist $(DLLNAME).manifest \
 		mt -manifest $(DLLNAME).manifest -outputresource:$(DLLNAME);#2
 !endif

Modified: harmony/enhanced/classlib/branches/java6/depends/manifests/icu4j_3.8/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/depends/manifests/icu4j_3.8/META-INF/MANIFEST.MF?rev=592673&r1=592672&r2=592673&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/depends/manifests/icu4j_3.8/META-INF/MANIFEST.MF (original)
+++ harmony/enhanced/classlib/branches/java6/depends/manifests/icu4j_3.8/META-INF/MANIFEST.MF Wed Nov  7 01:51:00 2007
@@ -3,7 +3,7 @@
 Bundle-Name: ICU4J
 Bundle-SymbolicName: com.ibm.icu4j;singleton:=true
 Bundle-Version: 3.8
-Bundle-ClassPath: icu4j-3_8.jar
+Bundle-ClassPath: icu4j-3_8.jar,icu4j-charsets-3_8.jar
 Eclipse-JREBundle: true
 Import-Package: java.io,
  java.lang,
@@ -22,4 +22,5 @@
 Export-Package: com.ibm.icu.lang,
  com.ibm.icu.math,
  com.ibm.icu.text,
- com.ibm.icu.util
+ com.ibm.icu.util,
+ com.ibm.icu.charset

Propchange: harmony/enhanced/classlib/branches/java6/depends/manifests/icu4j_3.8/META-INF/MANIFEST.MF
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: harmony/enhanced/classlib/branches/java6/make/build-native.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/make/build-native.xml?rev=592673&r1=592672&r2=592673&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/make/build-native.xml (original)
+++ harmony/enhanced/classlib/branches/java6/make/build-native.xml Wed Nov  7 01:51:00 2007
@@ -108,7 +108,7 @@
     <!-- ================================= 
           target: layout              
          ================================= -->
-    <target name="layout" depends="layout.windows"
+    <target name="layout" depends="layout.windows,layout.zos"
         description="Construct the correct directory structure for native binaries">
 
     	<!-- Create the target directory structure -->
@@ -133,6 +133,13 @@
     <target name="layout.windows" if="is.windows" depends="-select-win-deps-x86_64,-select-win-deps-x86">
         <!-- workaround until msdll is moved. -->
         <copy file="${msvcr.dll}" todir="${hy.jdk}/jre/bin" overwrite="yes" />
+    </target>
+
+    <target name="layout.zos" if="is.zos">
+        <!-- on z/OS copy across .x files to link against -->
+        <copy todir="${hy.hdk}/lib" overwrite="yes">
+            <fileset dir="${depends.libs}${hy.libstdc++.suffix}" includes="*${linklib.suffix}*" />
+        </copy>
     </target>
 
     <!-- ================================= 

Modified: harmony/enhanced/classlib/branches/java6/make/properties.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/make/properties.xml?rev=592673&r1=592672&r2=592673&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/make/properties.xml (original)
+++ harmony/enhanced/classlib/branches/java6/make/properties.xml Wed Nov  7 01:51:00 2007
@@ -469,6 +469,7 @@
         <attribute name="dir" />
         <attribute name="target" default="" />
         <sequential>
+            <echo>Making "@{target}" in @{dir}</echo>
             <exec failonerror="true"
                   executable="${make.command}"
                   dir="@{dir}">

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=592673&r1=592672&r2=592673&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/archive/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/archive/build.xml Wed Nov  7 01:51:00 2007
@@ -67,6 +67,24 @@
         <mkdir dir="${hy.archive.src.main.native}/zlib_dist" />
         <unzip src="${zlib.zip}" dest="${hy.archive.src.main.native}/zlib_dist" />
         <chmod dir="${hy.archive.src.main.native}/zlib_dist" perm="ugo+r" />
+        <antcall target="-ascii2ebcdic-conversion" />
+    </target>
+
+    <target name="-ascii2ebcdic-conversion" if="is.zos">
+        <move todir="${hy.archive.src.main.native}/zlib_dist_ascii">
+            <fileset dir="${hy.archive.src.main.native}/zlib_dist">
+                <include name="**/*" />
+                <exclude name="**/*.o" />
+            </fileset>
+        </move>
+        <copy todir="${hy.archive.src.main.native}/zlib_dist" outputencoding="IBM-1047" >
+            <fileset dir="${hy.archive.src.main.native}/zlib_dist_ascii">
+                <include name="**/*" />
+                <exclude name="**/*.o" />
+            </fileset>               
+        </copy>
+        <fixcrlf srcdir="${hy.archive.src.main.native}/zlib_dist" includes="**/*"  excludes="**/*.o" eol="unix" />
+        <delete dir="${hy.archive.src.main.native}/zlib_dist_ascii" />
     </target>
     
     <target name="clean-overlay-oss" unless="hy.skip.zlib" >
@@ -90,6 +108,12 @@
                 <exclude name="*${manifest.suffix}"/>
             </fileset>
         </copy>
+        <!-- Copy link exports file on z/OS -->
+        <copy todir="${hy.hdk}/lib" overwrite="yes">
+            <fileset dir="${hy.archive.src.main.native}/zlib/${hy.os.family}">
+                <include name="*${linklib.suffix}" if="is.zos" />
+            </fileset>
+        </copy>
     </target>
         
     <target name="-build-native-archive">
@@ -99,6 +123,12 @@
                 <include name="*${shlib.suffix}*"/>
                 <include name="*${progdb.suffix}*" if="is.windows" />
                 <exclude name="*${manifest.suffix}"/>
+            </fileset>
+        </copy>
+        <!-- Copy link exports file on z/OS -->
+        <copy todir="${hy.hdk}/lib" overwrite="yes">
+            <fileset dir="${hy.archive.src.main.native}/archive/${hy.os.family}">
+                <include name="*${linklib.suffix}" if="is.zos" />
             </fileset>
         </copy>
     </target>

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=592673&r1=592672&r2=592673&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 Wed Nov  7 01:51:00 2007
@@ -20,7 +20,6 @@
 include $(HY_HDK)/build/make/defines.mk
 
 INCLUDES += -I$(SHARED)common -I../../zlib_dist -I../../include/shared
-CFLAGS += -fpic
 
 BUILDFILES = $(SHAREDSUB)archive_copyright.o $(SHAREDSUB)jclcrc32.o \
 	$(SHAREDSUB)zip.o $(SHAREDSUB)adler32.o $(SHAREDSUB)inflater.o \

Modified: harmony/enhanced/classlib/branches/java6/modules/archive/src/main/native/zip/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/archive/src/main/native/zip/unix/makefile?rev=592673&r1=592672&r2=592673&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/archive/src/main/native/zip/unix/makefile (original)
+++ harmony/enhanced/classlib/branches/java6/modules/archive/src/main/native/zip/unix/makefile Wed Nov  7 01:51:00 2007
@@ -20,7 +20,6 @@
 include $(HY_HDK)/build/make/defines.mk
 
 INCLUDES += -I../../zlib_dist
-CFLAGS += -fpic
 
 BUILDFILES = $(SHAREDSUB)zcpool.o $(SHAREDSUB)zipalloc.o \
 	$(SHAREDSUB)zipcache.o $(SHAREDSUB)zipsup.o

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=592673&r1=592672&r2=592673&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 Wed Nov  7 01:51:00 2007
@@ -21,8 +21,6 @@
 
 ZLIB_DIST=../../zlib_dist/# Path to zlib
 
-CFLAGS += -fpic
-
 BUILDFILES = \
 	$(SHAREDSUB)zlib_copyright.o $(ZLIB_DIST)adler32.o $(ZLIB_DIST)compress.o \
 	$(ZLIB_DIST)crc32.o $(ZLIB_DIST)deflate.o $(ZLIB_DIST)infback.o $(ZLIB_DIST)inffast.o \
@@ -32,9 +30,15 @@
 EXPNAME = HYZLIB_0.1
 
 ifeq ($(DLL_LD),$(CC))
+ifneq ($(HY_OS),zos)
 ifneq ($(HY_OS),macosx)
 LDFLAGS += -Wl,-Bsymbolic
 endif
+endif
+endif
+
+ifeq ($(HY_OS),zos)
+OPT += -DSTDC
 endif
 
 include $(HY_HDK)/build/make/rules.mk

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=592673&r1=592672&r2=592673&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/auth/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/auth/build.xml Wed Nov  7 01:51:00 2007
@@ -82,6 +82,12 @@
                 <exclude name="*${manifest.suffix}"/>
             </fileset>
         </copy>
+        <!-- Copy link exports file on z/OS -->
+        <copy todir="${hy.hdk}/lib" overwrite="yes">
+            <fileset dir="${hy.auth.src.main.native}/auth/${hy.os.family}">
+                <include name="*${linklib.suffix}" if="is.zos" />
+            </fileset>
+        </copy>
     </target>
     
     <!-- Clean natives -->

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=592673&r1=592672&r2=592673&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 Wed Nov  7 01:51:00 2007
@@ -19,7 +19,6 @@
 
 include $(HY_HDK)/build/make/defines.mk
 
-CFLAGS += -fpic
 BUILDFILES = $(SHAREDSUB)auth_copyright.o authnix.o
 
 ifneq ($(HY_ZIP_API),true)

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=592673&r1=592672&r2=592673&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/build.xml Wed Nov  7 01:51:00 2007
@@ -162,6 +162,12 @@
                 <exclude name="*${manifest.suffix}"/>
             </fileset>
         </copy>
+        <!-- Copy link exports file on z/OS -->
+        <copy todir="${hy.hdk}/lib" overwrite="yes">
+            <fileset dir="${hy.awt.src.main.native}/lcmm/${hy.os.family}">
+                <include name="*${linklib.suffix}" if="is.zos" />
+            </fileset>
+        </copy>
 
         <make dir="${hy.awt.src.main.native}/jpegdecoder/${hy.os.family}" />
         <!-- Copy the built shared libs over to the jre/bin dir -->
@@ -172,6 +178,12 @@
                 <exclude name="*${manifest.suffix}"/>
             </fileset>
         </copy>
+        <!-- Copy link exports file on z/OS -->
+        <copy todir="${hy.hdk}/lib" overwrite="yes">
+            <fileset dir="${hy.awt.src.main.native}/jpegdecoder/${hy.os.family}">
+                <include name="*${linklib.suffix}" if="is.zos" />
+            </fileset>
+        </copy>
 
         <make dir="${hy.awt.src.main.native}/gl/${hy.os.family}" />
         <!-- Copy the built shared libs over to the jre/bin dir -->
@@ -182,6 +194,12 @@
                 <exclude name="*${manifest.suffix}"/>
             </fileset>
         </copy>
+        <!-- Copy link exports file on z/OS -->
+        <copy todir="${hy.hdk}/lib" overwrite="yes">
+            <fileset dir="${hy.awt.src.main.native}/gl/${hy.os.family}">
+                <include name="*${linklib.suffix}" if="is.zos" />
+            </fileset>
+        </copy>
         
         <make dir="${hy.awt.src.main.native}/oglwrapper/${hy.os.family}" />
         <!-- Copy the built shared libs over to the jre/bin dir -->
@@ -192,6 +210,12 @@
                 <exclude name="*${manifest.suffix}"/>
             </fileset>
         </copy>
+        <!-- Copy link exports file on z/OS -->
+        <copy todir="${hy.hdk}/lib" overwrite="yes">
+            <fileset dir="${hy.awt.src.main.native}/oglwrapper/${hy.os.family}">
+                <include name="*${linklib.suffix}" if="is.zos" />
+            </fileset>
+        </copy>
 
         <make dir="${hy.awt.src.main.native}/fontlib/${hy.os.family}" />
         <!-- Copy the built shared libs over to the jre/bin dir -->
@@ -202,6 +226,12 @@
                 <exclude name="*${manifest.suffix}"/>
             </fileset>
         </copy>
+        <!-- Copy link exports file on z/OS -->
+        <copy todir="${hy.hdk}/lib" overwrite="yes">
+            <fileset dir="${hy.awt.src.main.native}/fontlib/${hy.os.family}">
+                <include name="*${linklib.suffix}" if="is.zos" />
+            </fileset>
+        </copy>
     </target>
 
     <target name="-build-native-unix" if="is.unix">
@@ -212,12 +242,24 @@
                 <include name="*${shlib.suffix}*"/>
             </fileset>
         </copy>
+        <!-- Copy link exports file on z/OS -->
+        <copy todir="${hy.hdk}/lib" overwrite="yes">
+            <fileset dir="${hy.awt.src.main.native}/x11wrapper/${hy.os.family}">
+                <include name="*${linklib.suffix}" if="is.zos" />
+            </fileset>
+        </copy>
 
         <make dir="${hy.awt.src.main.native}/linuxfont/${hy.os.family}" />
         <!-- Copy the built shared libs over to the jre/bin dir -->
         <copy todir="${hy.jdk}/jre/bin" overwrite="yes">
             <fileset dir="${hy.awt.src.main.native}/linuxfont">
                 <include name="*${shlib.suffix}*"/>
+            </fileset>
+        </copy>
+        <!-- Copy link exports file on z/OS -->
+        <copy todir="${hy.hdk}/lib" overwrite="yes">
+            <fileset dir="${hy.awt.src.main.native}/linuxfont/${hy.os.family}">
+                <include name="*${linklib.suffix}" if="is.zos" />
             </fileset>
         </copy>
     </target>

Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/render/JavaBlitter.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/render/JavaBlitter.java?rev=592673&r1=592672&r2=592673&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/render/JavaBlitter.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/render/JavaBlitter.java Wed Nov  7 01:51:00 2007
@@ -34,6 +34,7 @@
 import java.awt.image.Raster;
 import java.awt.image.WritableRaster;
 
+import org.apache.harmony.awt.gl.ImageSurface;
 import org.apache.harmony.awt.gl.MultiRectArea;
 import org.apache.harmony.awt.gl.Surface;
 import org.apache.harmony.awt.gl.XORComposite;
@@ -134,6 +135,10 @@
 
                 transformedBlit(srcCM, srcR, 0, 0, dstCM, dstR, dstX, dstY, w, h,
                         sysxform, comp, bgcolor, clip);
+                
+                Rectangle dirtyReg = JavaBlitter.getBounds2D(sysxform, new Rectangle(dstX, dstY, w, h)).getBounds();
+                Rectangle bounds = new Rectangle(dstSurf.getWidth(), dstSurf.getHeight()).getBounds();
+                dstSurf.addDirtyRegion(bounds.intersection(dirtyReg));
 
         }
     }
@@ -148,6 +153,8 @@
                 dstSurf.getColorModel(), dstSurf.getRaster(),
                 width, height, comp, bgcolor, clip);
 
+        dstSurf.addDirtyRegion(new Rectangle(dstX, dstY, width, height));
+
     }
     public void javaBlt(int srcX, int srcY, int srcW, int srcH,
             ColorModel srcCM, Raster srcRast, int dstX, int dstY,
@@ -353,11 +360,11 @@
             int width, int height, AffineTransform at, Composite comp,
             Color bgcolor,MultiRectArea clip) {
 
-        Rectangle srcBounds = new Rectangle(width, height);
-        Rectangle dstBlitBounds = new Rectangle(dstX, dstY, srcR.getWidth(), srcR.getHeight());
+        Rectangle srcBounds = new Rectangle(srcX, srcY, width, height);
+        Rectangle dstBlitBounds = new Rectangle(dstX, dstY, width, height);
 
         Rectangle transSrcBounds = getBounds2D(at, srcBounds).getBounds();
-        Rectangle transDstBlitBounds = new Rectangle(0, 0, dstR.getWidth(), dstR.getHeight());
+        Rectangle transDstBlitBounds = getBounds2D(at, dstBlitBounds).getBounds();
 
         int translateX = transDstBlitBounds.x - transSrcBounds.x;
         int translateY = transDstBlitBounds.y - transSrcBounds.y;

Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/im/InputMethodContext.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/im/InputMethodContext.java?rev=592673&r1=592672&r2=592673&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/im/InputMethodContext.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/im/InputMethodContext.java Wed Nov  7 01:51:00 2007
@@ -156,6 +156,8 @@
     }
 
     private void activateIM(InputMethod im) {
+        Component c;
+        
         im.activate();
         if ((nativeIM != null) && (im != nativeIM)) {
             // when Java IM is active
@@ -164,6 +166,11 @@
             nativeIM.disableIME();
         }
         IMManager.setLastActiveIMC(this);
+        
+        c = getClient();
+        if (c != null) {
+           c.getInputMethodRequests();
+        }
     }
 
     @SuppressWarnings("deprecation")
@@ -313,10 +320,13 @@
         if (newIM != null) {
             closeIM(inputMethod);
             client = KeyboardFocusManager.
-            getCurrentKeyboardFocusManager().getFocusOwner();
+                    getCurrentKeyboardFocusManager().getFocusOwner();
+            if (client != null) {
+                client.getInputMethodRequests();
+            }
             initIM(newIM, locale);
             inputMethod = newIM;
-            
+
             return true;
         }
         return false;

Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/unix/org/apache/harmony/awt/gl/linux/XBlitter.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/unix/org/apache/harmony/awt/gl/linux/XBlitter.java?rev=592673&r1=592672&r2=592673&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/unix/org/apache/harmony/awt/gl/linux/XBlitter.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/unix/org/apache/harmony/awt/gl/linux/XBlitter.java Wed Nov  7 01:51:00 2007
@@ -168,16 +168,6 @@
                  );
                 break;
             default:
-                XSurface xDstSurf = (XSurface) dstSurf;
-
-                AffineTransform at = (AffineTransform) sysxform.clone();
-
-                Rectangle transDstBounds = JavaBlitter.getBounds2D(at, new Rectangle(dstX, dstY, width, height)).getBounds();
-                int tWidth = transDstBounds.width;
-                int tHeight = transDstBounds.height;
-                dstX = transDstBounds.x;
-                dstY = transDstBounds.y;
-
                 ColorModel cm = srcSurf.getColorModel();
                 WritableRaster compRaster = srcSurf.getRaster();
                 BufferedImage compIm = new BufferedImage(
@@ -187,28 +177,21 @@
                         null
                 );
 
-                BufferedImage transformed = new BufferedImage(tWidth, tHeight, BufferedImage.TYPE_INT_ARGB);
+                Rectangle transDstBounds = JavaBlitter.getBounds2D(sysxform, new Rectangle(dstX, dstY, width, height)).getBounds();
+                int tWidth = transDstBounds.width;
+                int tHeight = transDstBounds.height;
+                int tX = transDstBounds.x;
+                int tY = transDstBounds.y;
+
+                if(tWidth <= 0 || tHeight <= 0) return;
+                BufferedImage transformed = new BufferedImage(dstSurf.getWidth(), dstSurf.getHeight(), BufferedImage.TYPE_INT_ARGB);
 
                 Surface transfSurf = Surface.getImageSurface(transformed);
                 JavaBlitter.getInstance().blit(srcX, srcY, Surface.getImageSurface(compIm), 
-                        0, 0, transfSurf, width, height, at, AlphaComposite.Src, null, null);
-
-                if (dstX < 0){
-                    tWidth += dstX;
-                    srcX = -dstX;
-                    dstX = 0;
-                }
-
-                if (dstY < 0){
-                    tHeight += dstY;
-                    srcY = -dstY;
-                    dstY = 0;
-                }
-
-                if(tWidth <= 0 || tHeight <= 0 || srcX >= tWidth || srcY >= tHeight) return;
+                        dstX, dstY, transfSurf, width, height, sysxform, AlphaComposite.Src, null, null);
                 blit(
-                        srcX, srcY, transfSurf,
-                        dstX, dstY, dstSurf,
+                        tX, tY, transfSurf,
+                        tX, tY, dstSurf,
                         tWidth, tHeight,
                         comp, bgcolor, clip
                 );

Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/windows/WinGDIPGraphics2D.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/windows/WinGDIPGraphics2D.java?rev=592673&r1=592672&r2=592673&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/windows/WinGDIPGraphics2D.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/windows/WinGDIPGraphics2D.java Wed Nov  7 01:51:00 2007
@@ -147,6 +147,28 @@
         setTransform(getTransform());
     }
 
+    /**
+     * Create G2D associated with the specified device context.
+     * 
+     * @param hdc pointer to DC handle
+     * @param pageUnit one of Gdiplus::Unit specifying how to convert Graphics
+     *        coordinates to DC coordinates
+     * @param width Graphics width
+     * @param height Graphics height
+     */
+    public WinGDIPGraphics2D(final long hdc, final char pageUnit,
+                    final int width, final int height) {
+        size = new Dimension(width, height);
+        gi = createGraphicsInfoFor(hdc, pageUnit);
+
+        if (!FontManager.IS_FONTLIB) {
+            jtr = GDIPTextRenderer.inst;
+        }
+
+        dstSurf = new GDISurface(gi);
+        blitter = GDIBlitter.getInstance();
+    }
+
     @Override
     public void addRenderingHints(Map<?,?> hints) {
         super.addRenderingHints(hints);
@@ -532,6 +554,7 @@
 
     // Creates native GraphicsInfo structure
     private native long createGraphicsInfo(long hwnd, int x, int y, int width, int height);
+    private native long createGraphicsInfoFor(long hdc, char pageUnit);
     static native long createCompatibleImageInfo(long hwnd, int width, int height);
     static native long createCompatibleImageInfo(byte[] bytes, int width, int height);
     private native long copyImageInfo(long gi);

Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/windows/WinGraphicsDevice.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/windows/WinGraphicsDevice.java?rev=592673&r1=592672&r2=592673&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/windows/WinGraphicsDevice.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/windows/WinGraphicsDevice.java Wed Nov  7 01:51:00 2007
@@ -70,7 +70,7 @@
         type = TYPE_RASTER_SCREEN;
 
         long hmon = win32.MonitorFromWindow(hwnd, WindowsDefs.MONITOR_DEFAULTTOPRIMARY);
-        Win32.MONITORINFOEXW mi = win32.createMONITORINFOEXW(false);
+        Win32.MONITORINFOEXW mi = win32.createMONITORINFOEXW(true);
         mi.get_MONITORINFO().set_cbSize(mi.size());
         if (win32.GetMonitorInfoW(hmon, mi.shortLockPointer()) == 0) {
             // awt.15=Can not get monitor info

Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/fontlib/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/fontlib/unix/makefile?rev=592673&r1=592672&r2=592673&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/fontlib/unix/makefile (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/fontlib/unix/makefile Wed Nov  7 01:51:00 2007
@@ -15,7 +15,6 @@
 
 include $(HY_HDK)/build/make/defines.mk
 
-CFLAGS += -fpic
 INCLUDES += -I$(SHARED)common -I$(SHAREDSUB)include
 
 BUILDFILES = \

Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/gl/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/gl/unix/makefile?rev=592673&r1=592672&r2=592673&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/gl/unix/makefile (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/gl/unix/makefile Wed Nov  7 01:51:00 2007
@@ -17,7 +17,6 @@
 
 PNG_DIR=$(HY_HDK)/../depends/libs/build/png
 
-CFLAGS += -fpic
 INCLUDES += -I$(SHARED)common -I$(SHAREDSUB)/include -I$(PNG_DIR)
 
 BUILDFILES = \

Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/gl/windows/WinGDIPGraphics2D.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/gl/windows/WinGDIPGraphics2D.cpp?rev=592673&r1=592672&r2=592673&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/gl/windows/WinGDIPGraphics2D.cpp (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/gl/windows/WinGDIPGraphics2D.cpp Wed Nov  7 01:51:00 2007
@@ -109,6 +109,27 @@
 }
 
 /*
+ * Class:     org_apache_harmony_awt_gl_windows_WinGDIPGraphics2D
+ * Method:    createGraphicsInfoFor
+ * Signature: (JC)J
+ */
+JNIEXPORT jlong JNICALL Java_org_apache_harmony_awt_gl_windows_WinGDIPGraphics2D_createGraphicsInfoFor
+  (JNIEnv * env, jobject obj, jlong hdc, jchar pageUnit) {
+	GraphicsInfo * gi = (GraphicsInfo *) malloc(sizeof(GraphicsInfo));
+
+	gi->hdc = (HDC) hdc;
+	gi->graphics = new Graphics(gi->hdc);
+	gi->pen = 0;
+	gi->brush = 0;
+	gi->bmp = 0;
+	gi->matrix = new Matrix();
+
+	gi->graphics->SetPageUnit((Gdiplus::Unit) pageUnit);
+
+	return (jlong)gi;
+}
+
+/*
  * Creates compatible GraphicsInfo structure for specified device context
  */
 static inline GraphicsInfo *createCompatibleImageInfo(JNIEnv *env, HDC hdc, jint width, jint height) {

Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/gl/windows/include/org_apache_harmony_awt_gl_windows_WinGDIPGraphics2D.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/gl/windows/include/org_apache_harmony_awt_gl_windows_WinGDIPGraphics2D.h?rev=592673&r1=592672&r2=592673&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/gl/windows/include/org_apache_harmony_awt_gl_windows_WinGDIPGraphics2D.h (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/gl/windows/include/org_apache_harmony_awt_gl_windows_WinGDIPGraphics2D.h Wed Nov  7 01:51:00 2007
@@ -74,6 +74,14 @@
 
 /*
  * Class:     org_apache_harmony_awt_gl_windows_WinGDIPGraphics2D
+ * Method:    createGraphicsInfoFor
+ * Signature: (JC)J
+ */
+JNIEXPORT jlong JNICALL Java_org_apache_harmony_awt_gl_windows_WinGDIPGraphics2D_createGraphicsInfoFor
+  (JNIEnv *, jobject, jlong, jchar);
+
+/*
+ * Class:     org_apache_harmony_awt_gl_windows_WinGDIPGraphics2D
  * Method:    createCompatibleImageInfo
  * Signature: (JII)J
  */

Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/jpegdecoder/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/jpegdecoder/unix/makefile?rev=592673&r1=592672&r2=592673&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/jpegdecoder/unix/makefile (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/jpegdecoder/unix/makefile Wed Nov  7 01:51:00 2007
@@ -17,7 +17,6 @@
 
 JPEG_DIR=$(HY_HDK)/../depends/libs/build/jpeg/
 
-CFLAGS += -fpic
 INCLUDES += -I$(SHARED)common -I$(SHAREDSUB)include -I$(JPEG_DIR)
 
 BUILDFILES = \

Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/lcmm/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/lcmm/unix/makefile?rev=592673&r1=592672&r2=592673&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/lcmm/unix/makefile (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/lcmm/unix/makefile Wed Nov  7 01:51:00 2007
@@ -17,7 +17,6 @@
 
 LCMS_DIR=$(HY_HDK)/../depends/libs/build/lcms
 
-CFLAGS += -fpic
 INCLUDES += -I$(SHARED)common -I$(SHAREDSUB)/include -I$(LCMS_DIR)
 
 BUILDFILES = \

Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/linuxfont/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/linuxfont/unix/makefile?rev=592673&r1=592672&r2=592673&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/linuxfont/unix/makefile (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/linuxfont/unix/makefile Wed Nov  7 01:51:00 2007
@@ -15,7 +15,6 @@
 
 include $(HY_HDK)/build/make/defines.mk
 
-CFLAGS += -fpic
 INCLUDES += -I$(SHARED)common -I/usr/X11R6/include -I/usr/include/freetype2 \
             -Iinclude -I../../fontlib/unix -I../../fontlib/shared # TOFIX move includes
 ifeq ($(HY_OS),freebsd)

Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/oglwrapper/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/oglwrapper/unix/makefile?rev=592673&r1=592672&r2=592673&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/oglwrapper/unix/makefile (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/oglwrapper/unix/makefile Wed Nov  7 01:51:00 2007
@@ -15,7 +15,6 @@
 
 include $(HY_HDK)/build/make/defines.mk
 
-CFLAGS += -fpic
 INCLUDES += -I$(SHARED)common -I$(SHAREDSUB)/include
 
 BUILDFILES = \

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=592673&r1=592672&r2=592673&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  7 01:51:00 2007
@@ -797,7 +797,7 @@
     enum { maskText = 1, maskFileList = 2, maskUrl = 4, maskHtml = 8, maskImage = 16 };
     DWORD formatsMask = 0;
     
-    CAtlArray<jstring> formatList;
+    CSimpleArray<jstring> formatList;
 
     FORMATETC format;
     DWORD count = 0;
@@ -812,7 +812,7 @@
         if ((format.tymed & TYMED_ENHMF) != 0 
                 && format.cfFormat == CF_ENHMETAFILE) {
             jstring jstr = env->NewStringUTF(FORMAT_IMAGE);
-            formatList.SetAtGrow(formatList.GetCount(), jstr);
+            formatList.Add(jstr);
             continue;
         }
         if ((format.tymed & TYMED_HGLOBAL) == 0) {
@@ -820,38 +820,38 @@
         }
         if (format.cfFormat == CF_UNICODETEXT || format.cfFormat == CF_TEXT) {
             jstring jstr = env->NewStringUTF(FORMAT_TEXT);
-            formatList.SetAtGrow(formatList.GetCount(), jstr);
+            formatList.Add(jstr);
             continue;
         }
         if (format.cfFormat == CF_HDROP) {
             jstring jstr = env->NewStringUTF(FORMAT_FILE_LIST);
-            formatList.SetAtGrow(formatList.GetCount(), jstr);
+            formatList.Add(jstr);
             continue;
         }
         if (format.cfFormat == CF_DIB) {
             jstring jstr = env->NewStringUTF(FORMAT_IMAGE);
-            formatList.SetAtGrow(formatList.GetCount(), jstr);
+            formatList.Add(jstr);
             continue;
         }
         if (format.cfFormat == cfShellUrlA || format.cfFormat == cfShellUrlW) {
             jstring jstr = env->NewStringUTF(FORMAT_URL);
-            formatList.SetAtGrow(formatList.GetCount(), jstr);
+            formatList.Add(jstr);
             continue;
         }
         if (format.cfFormat == cfHTML) {
             jstring jstr = env->NewStringUTF(FORMAT_HTML);
-            formatList.SetAtGrow(formatList.GetCount(), jstr);
+            formatList.Add(jstr);
             continue;
         }
         jstring jstr = getSerializedFormatName(env, format.cfFormat);
         if (jstr != NULL) {
-            formatList.SetAtGrow(formatList.GetCount(), jstr);
+            formatList.Add(jstr);
         }
     }
     enumFormats.Release();
 
-    jobjectArray result = env->NewObjectArray((jsize)formatList.GetCount(), classString, NULL);
-    for (jsize i = 0; i < (jsize)formatList.GetCount(); i++) {
+    jobjectArray result = env->NewObjectArray((jsize)formatList.GetSize(), classString, NULL);
+    for (jsize i = 0; i < (jsize)formatList.GetSize(); i++) {
         env->SetObjectArrayElement(result, i, formatList[i]);
     }
     return result;
@@ -1011,13 +1011,13 @@
         FORMATETC * list;
         int listLen = getFormatsForName(env, formatName, &list);
         for (int j = 0; j < listLen; j++) {
-            formatArray.SetAtGrow(formatArray.GetCount(), list[j]);
+            formatArray.Add(list[j]);
         }
         if (listLen == 0) {
             UINT serializedFormat = getSerializedFormat(env, formatName);
             if (serializedFormat != 0) {
                 FORMATETC fmt = { serializedFormat, 0, DVASPECT_CONTENT, -1, TYMED_HGLOBAL };
-                formatArray.SetAtGrow(formatArray.GetCount(), fmt);
+                formatArray.Add(fmt);
             }
         }
     }
@@ -1089,7 +1089,7 @@
 STDMETHODIMP WinDataObject::EnumFormatEtc(DWORD dwDirection, 
                                           IEnumFORMATETC ** ppEnumFormatEtc) {
     if(dwDirection == DATADIR_GET) {
-        return SHCreateStdEnumFmtEtc((UINT)formatArray.GetCount(), 
+        return SHCreateStdEnumFmtEtc((UINT)formatArray.GetSize(), 
                 formatArray.GetData(), ppEnumFormatEtc);
     }
     return E_NOTIMPL;
@@ -1108,8 +1108,8 @@
 }
 
 int WinDataObject::getFormatIndex(FORMATETC * fmt) {
-    for (size_t i=0; i<formatArray.GetCount(); i++) {
-        const FORMATETC & f = formatArray.GetAt(i);
+    for (int i=0; i<formatArray.GetSize(); i++) {
+        const FORMATETC & f = formatArray[i];
         if (f.cfFormat == fmt->cfFormat
                 && f.ptd == fmt->ptd
                 && f.dwAspect == fmt->dwAspect

Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/win32wrapper/windows/WinDataTransfer.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/win32wrapper/windows/WinDataTransfer.h?rev=592673&r1=592672&r2=592673&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/win32wrapper/windows/WinDataTransfer.h (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/win32wrapper/windows/WinDataTransfer.h Wed Nov  7 01:51:00 2007
@@ -122,7 +122,7 @@
     HRESULT getImage(UINT format, STGMEDIUM * pMedium);
     HRESULT getSerializedObject(UINT format, STGMEDIUM * pMedium);
 
-    CAtlArray<FORMATETC> formatArray;
+    CSimpleArray<FORMATETC> formatArray;
     jobject dataSnapshotGlobalRef;
 };
 

Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/x11wrapper/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/x11wrapper/unix/makefile?rev=592673&r1=592672&r2=592673&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/x11wrapper/unix/makefile (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/x11wrapper/unix/makefile Wed Nov  7 01:51:00 2007
@@ -15,7 +15,6 @@
 
 include $(HY_HDK)/build/make/defines.mk
 
-CFLAGS += -fpic
 INCLUDES += -I$(SHARED)common -I/usr/X11R6/include
 
 BUILDFILES = \

Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/x11wrapper/unix/nativelib_common.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/x11wrapper/unix/nativelib_common.h?rev=592673&r1=592672&r2=592673&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/x11wrapper/unix/nativelib_common.h (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/x11wrapper/unix/nativelib_common.h Wed Nov  7 01:51:00 2007
@@ -21,10 +21,17 @@
 #ifndef NATIVELIB_COMMON_H
 #define NATIVELIB_COMMON_H
 
-#if defined(LINUX) || defined(FREEBSD) || defined(AIX) || defined(MACOSX)
+#if defined(LINUX) || defined(FREEBSD) || defined(AIX) || defined(MACOSX) || defined(ZOS)
 // common linux section--------------------------------
-#include <dlfcn.h>
+#ifndef ZOS
 #include <stdint.h>
+#else
+#include <stddef.h>
+#ifndef __SUSV3
+#define __SUSV3
+#endif
+#endif
+#include <dlfcn.h>
 
 #define mkstr(x) #x
 
@@ -33,7 +40,7 @@
 
 #define FindFunction(lib, name) (void *)dlsym(lib, name)
 
-#if !defined(__INTEL_COMPILER) && !defined(AIX)
+#if !defined(__INTEL_COMPILER) && !defined(AIX) && !defined(ZOS)
     typedef long long __int64;
 #endif
 

Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/test/api/java/common/java/awt/CardLayoutRTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/test/api/java/common/java/awt/CardLayoutRTest.java?rev=592673&r1=592672&r2=592673&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/test/api/java/common/java/awt/CardLayoutRTest.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/test/api/java/common/java/awt/CardLayoutRTest.java Wed Nov  7 01:51:00 2007
@@ -74,7 +74,6 @@
     
     public void testLayoutContainer() {       
         layout.layoutContainer(emptyContainer);
-        assertTrue(true);
     }
     
     public final void testMaximumLayoutSize1() {

Modified: harmony/enhanced/classlib/branches/java6/modules/imageio/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/imageio/build.xml?rev=592673&r1=592672&r2=592673&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/imageio/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/imageio/build.xml Wed Nov  7 01:51:00 2007
@@ -110,6 +110,13 @@
                 <exclude name="*${manifest.suffix}"/>
             </fileset>
         </copy>
+        <!-- Copy link exports file on z/OS -->
+        <copy todir="${hy.hdk}/lib" overwrite="yes">
+            <fileset dir="${hy.imageio.src.main.native}/jpegencoder/${hy.os.family}">
+                <include name="*${linklib.suffix}" if="is.zos" />
+            </fileset>
+        </copy>
+
         <make dir="${hy.imageio.src.main.native}/pngencoder/${hy.os.family}" />
         <!-- Copy the built shared libs over to the jre/bin dir -->
         <copy todir="${hy.jdk}/jre/bin" overwrite="yes">
@@ -117,6 +124,12 @@
                 <include name="*${shlib.suffix}*"/>
                 <include name="*${progdb.suffix}*" if="is.windows" />
                 <exclude name="*${manifest.suffix}"/>
+            </fileset>
+        </copy>
+        <!-- Copy link exports file on z/OS -->
+        <copy todir="${hy.hdk}/lib" overwrite="yes">
+            <fileset dir="${hy.imageio.src.main.native}/pngencoder/${hy.os.family}">
+                <include name="*${linklib.suffix}" if="is.zos" />
             </fileset>
         </copy>
     </target>

Modified: harmony/enhanced/classlib/branches/java6/modules/imageio/src/main/native/jpegencoder/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/imageio/src/main/native/jpegencoder/unix/makefile?rev=592673&r1=592672&r2=592673&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/imageio/src/main/native/jpegencoder/unix/makefile (original)
+++ harmony/enhanced/classlib/branches/java6/modules/imageio/src/main/native/jpegencoder/unix/makefile Wed Nov  7 01:51:00 2007
@@ -17,7 +17,6 @@
 
 JPEG_DIR=$(HY_HDK)/../depends/libs/build/jpeg/
 
-CFLAGS += -fpic
 INCLUDES += -I$(SHARED)common -I$(SHAREDSUB)include -I$(JPEG_DIR)
 
 BUILDFILES = \

Modified: harmony/enhanced/classlib/branches/java6/modules/imageio/src/main/native/pngencoder/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/imageio/src/main/native/pngencoder/unix/makefile?rev=592673&r1=592672&r2=592673&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/imageio/src/main/native/pngencoder/unix/makefile (original)
+++ harmony/enhanced/classlib/branches/java6/modules/imageio/src/main/native/pngencoder/unix/makefile Wed Nov  7 01:51:00 2007
@@ -17,7 +17,6 @@
 
 PNG_DIR=$(HY_HDK)/../depends/libs/build/png/
 
-CFLAGS += -fpic
 INCLUDES += -I$(SHARED)common -I$(SHAREDSUB)include -I$(PNG_DIR)
 
 BUILDFILES = \

Modified: harmony/enhanced/classlib/branches/java6/modules/instrument/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/instrument/build.xml?rev=592673&r1=592672&r2=592673&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/instrument/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/instrument/build.xml Wed Nov  7 01:51:00 2007
@@ -86,6 +86,12 @@
                 <exclude name="*${manifest.suffix}*" />
             </fileset>
         </copy>
+        <!-- Copy link exports file on z/OS -->
+        <copy todir="${hy.hdk}/lib" overwrite="yes">
+            <fileset dir="${hy.instrument.src.main.native}/instrument/${hy.os.family}">
+                <include name="*${linklib.suffix}" if="is.zos" />
+            </fileset>
+        </copy>
     </target>
     
     <!-- Clean natives -->

Modified: harmony/enhanced/classlib/branches/java6/modules/instrument/src/main/native/instrument/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/instrument/src/main/native/instrument/unix/makefile?rev=592673&r1=592672&r2=592673&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/instrument/src/main/native/instrument/unix/makefile (original)
+++ harmony/enhanced/classlib/branches/java6/modules/instrument/src/main/native/instrument/unix/makefile Wed Nov  7 01:51:00 2007
@@ -19,8 +19,6 @@
 
 include $(HY_HDK)/build/make/defines.mk
 
-CFLAGS += -fpic
-
 BUILDFILES = \
 	../shared/instrument.o ../shared/inst_agt.o 
 

Modified: harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/org/apache/harmony/jndi/internal/nls/messages.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/org/apache/harmony/jndi/internal/nls/messages.properties?rev=592673&r1=592672&r2=592673&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/org/apache/harmony/jndi/internal/nls/messages.properties (original)
+++ harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/org/apache/harmony/jndi/internal/nls/messages.properties Wed Nov  7 01:51:00 2007
@@ -195,3 +195,9 @@
 ldap.21=was not found
 ldap.22=foundObjects is null
 ldap.23= not found in jar file 
+ldap.26=Only instances of CompositeName class or LdapName class are acceptable
+ldap.28=Parameter of filter should not be null
+ldap.29=Invalid search filter
+ldap.2B=LDAP URL should not be null
+ldap.2C=Invalid LDAP URL
+ldap.2D=LDAP URL may only contain host, port and dn components



Mime
View raw message