harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r941466 [1/2] - in /harmony/enhanced/java/branches/java6: ./ classlib/ classlib/depends/libs/ classlib/depends/oss/ classlib/modules/archive/ classlib/modules/archive/make/ classlib/modules/archive/src/main/native/zlib/windows/ classlib/mod...
Date Wed, 05 May 2010 20:21:01 GMT
Author: hindessm
Date: Wed May  5 20:20:59 2010
New Revision: 941466

URL: http://svn.apache.org/viewvc?rev=941466&view=rev
Log:
Merging from trunk@940795.

Added:
    harmony/enhanced/java/branches/java6/classlib/modules/archive/make/depends.properties
      - copied unchanged from r940795, harmony/enhanced/java/trunk/classlib/modules/archive/make/depends.properties
Removed:
    harmony/enhanced/java/branches/java6/classlib/depends/oss/zlib_1.2.3.zip
Modified:
    harmony/enhanced/java/branches/java6/   (props changed)
    harmony/enhanced/java/branches/java6/classlib/   (props changed)
    harmony/enhanced/java/branches/java6/classlib/depends/libs/   (props changed)
    harmony/enhanced/java/branches/java6/classlib/depends/oss/   (props changed)
    harmony/enhanced/java/branches/java6/classlib/modules/archive/build.xml
    harmony/enhanced/java/branches/java6/classlib/modules/archive/src/main/native/zlib/windows/makefile
    harmony/enhanced/java/branches/java6/classlib/modules/awt/make/depends.properties
    harmony/enhanced/java/branches/java6/classlib/modules/awt/src/main/native/gl/windows/makefile
    harmony/enhanced/java/branches/java6/classlib/modules/awt/src/main/native/lcmm/windows/makefile
    harmony/enhanced/java/branches/java6/classlib/modules/imageio/make/depends.properties
    harmony/enhanced/java/branches/java6/classlib/modules/imageio/src/main/native/pngencoder/windows/makefile
    harmony/enhanced/java/branches/java6/classlib/modules/instrument/src/main/java/org/apache/harmony/instrument/internal/InstrumentationImpl.java
    harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/java/java/io/RandomAccessFile.java
    harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/java/org/apache/harmony/luni/platform/Environment.java
    harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/java/org/apache/harmony/luni/platform/IFileSystem.java
    harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/java/org/apache/harmony/luni/platform/OSFileSystem.java
    harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/native/luni/shared/OSFileSystem.c
    harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/native/luni/unix/OSFileSystemLinux32.c
    harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/native/luni/unix/exports.txt
    harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/native/luni/windows/OSFileSystemWin32.c
    harmony/enhanced/java/branches/java6/classlib/modules/nio/src/main/java/common/org/apache/harmony/nio/internal/FileChannelImpl.java
    harmony/enhanced/java/branches/java6/classlib/modules/nio/src/main/java/common/org/apache/harmony/nio/internal/SocketChannelImpl.java
    harmony/enhanced/java/branches/java6/classlib/modules/nio/src/test/java/common/org/apache/harmony/nio/tests/java/nio/channels/FileChannelTest.java
    harmony/enhanced/java/branches/java6/classlib/modules/rmi/src/test/api/java/org/apache/harmony/rmi/ConnectionTest.java
    harmony/enhanced/java/branches/java6/classlib/modules/rmi/src/test/api/java/org/apache/harmony/rmi/RegistryTest.java
    harmony/enhanced/java/branches/java6/classlib/modules/security/src/main/java/common/org/apache/harmony/security/DefaultPolicyScanner.java
    harmony/enhanced/java/branches/java6/classlib/modules/security/src/test/impl/java.injected/org/apache/harmony/security/DefaultPolicyScannerTest.java
    harmony/enhanced/java/branches/java6/common_resources/   (props changed)
    harmony/enhanced/java/branches/java6/drlvm/   (props changed)
    harmony/enhanced/java/branches/java6/drlvm/make/depends.properties
    harmony/enhanced/java/branches/java6/drlvm/make/vm/vmcore.xml
    harmony/enhanced/java/branches/java6/jdktools/   (props changed)
    harmony/enhanced/java/branches/java6/jdktools/modules/jretools/.classpath   (props changed)
    harmony/enhanced/java/branches/java6/jdktools/modules/jretools/.project   (props changed)
    harmony/enhanced/java/branches/java6/jdktools/modules/jretools/.settings/org.eclipse.jdt.core.prefs   (props changed)
    harmony/enhanced/java/branches/java6/jdktools/modules/jretools/.settings/org.eclipse.jdt.ui.prefs   (props changed)
    harmony/enhanced/java/branches/java6/jdktools/modules/jretools/META-INF/MANIFEST.MF   (props changed)
    harmony/enhanced/java/branches/java6/jdktools/modules/jretools/build.xml   (props changed)
    harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/internal/nls/Messages.java   (props changed)
    harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/internal/nls/messages.properties   (props changed)
    harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/ArgumentsParser.java   (props changed)
    harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CRLManager.java   (props changed)
    harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CSRGenerator.java   (props changed)
    harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertChainVerifier.java   (props changed)
    harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertExporter.java   (props changed)
    harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertImporter.java   (props changed)
    harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertReader.java   (props changed)
    harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/Command.java   (props changed)
    harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/EntryManager.java   (props changed)
    harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/HelpPrinter.java   (props changed)
    harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyCertGenerator.java   (props changed)
    harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyStoreCertPrinter.java   (props changed)
    harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyStoreConverter.java   (props changed)
    harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolException.java   (props changed)
    harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolKSLoaderSaver.java   (props changed)
    harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolParameters.java   (props changed)
    harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/Main.java   (props changed)
    harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/Consts.java   (props changed)
    harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/Main.java   (props changed)
    harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/control/Controller.java   (props changed)
    harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/control/InvalidPolicyTextException.java   (props changed)
    harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/control/PolicyFileHandler.java   (props changed)
    harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/control/PolicyTextParser.java   (props changed)
    harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/model/CommentEntry.java   (props changed)
    harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/model/GrantEntry.java   (props changed)
    harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/model/KeystoreEntry.java   (props changed)
    harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/model/KeystorePasswordURLEntry.java   (props changed)
    harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/model/Permission.java   (props changed)
    harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/model/PolicyEntry.java   (props changed)
    harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/model/Principal.java   (props changed)
    harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/BaseFormDialog.java   (props changed)
    harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/DirectTextEditorPanel.java   (props changed)
    harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/EditorPanel.java   (props changed)
    harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/GrantEntryEditFormDialog.java   (props changed)
    harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/GraphicalEditorPanel.java   (props changed)
    harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/KeystoreEntryEditFormDialog.java   (props changed)
    harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/LAEFormDialog.java   (props changed)
    harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/ListAndEditPanel.java   (props changed)
    harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/MainFrame.java   (props changed)
    harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/PermissionEditFormDialog.java   (props changed)
    harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/PrincipalEditFormDialog.java   (props changed)
    harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/WarningLogDialog.java   (props changed)
    harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/apache.gif   (props changed)
    harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/toolutils/KeyStoreLoaderSaver.java   (props changed)
    harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/toolutils/Util.java   (props changed)
    harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/unpack200/Main.java   (props changed)
    harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/test/java/org/apache/harmony/jretools/tests/keytool/GenKeyTest.java   (props changed)
    harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/test/java/org/apache/harmony/jretools/tests/keytool/TestUtils.java   (props changed)
    harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/test/java/org/apache/harmony/jretools/tests/toolutils/KeyStoreLoaderSaverTest.java   (props changed)

Propchange: harmony/enhanced/java/branches/java6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May  5 20:20:59 2010
@@ -1,2 +1,2 @@
-/harmony/enhanced/java/trunk:929253-936843
+/harmony/enhanced/java/trunk:929253-940795
 /harmony/enhanced/trunk:810871-929252

Propchange: harmony/enhanced/java/branches/java6/classlib/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May  5 20:20:59 2010
@@ -1,6 +1,6 @@
 /harmony/enhanced/classlib/trunk:713674-735919,765923-926091,926318-926838
 /harmony/enhanced/classlib/trunk/working_classlib:884014-884286
-/harmony/enhanced/java/trunk/classlib:929253-936843
+/harmony/enhanced/java/trunk/classlib:929253-940795
 /harmony/enhanced/trunk/classlib:810871-929252
 /harmony/enhanced/trunk/working_classlib:476396-920147
 /incubator/harmony/enhanced/trunk/working_classlib:423974-476394

Propchange: harmony/enhanced/java/branches/java6/classlib/depends/libs/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May  5 20:20:59 2010
@@ -1,3 +1,3 @@
 /harmony/enhanced/classlib/trunk/depends/libs:544451-926091
-/harmony/enhanced/java/trunk/classlib/depends/libs:929253-936843
+/harmony/enhanced/java/trunk/classlib/depends/libs:929253-940795
 /harmony/enhanced/trunk/classlib/depends/libs:810871-929252

Propchange: harmony/enhanced/java/branches/java6/classlib/depends/oss/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed May  5 20:20:59 2010
@@ -1,2 +1,3 @@
 findbugs-1.3.9
 fdlibm-5.3
+zlib-1.2.5

Modified: harmony/enhanced/java/branches/java6/classlib/modules/archive/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/archive/build.xml?rev=941466&r1=941465&r2=941466&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/archive/build.xml (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/archive/build.xml Wed May  5 20:20:59 2010
@@ -23,15 +23,25 @@
     <property name="hy.hdk" location="${basedir}/../../deploy" />
     <property name="depends.dir" location="${basedir}/../../depends" />
     <import file="${hy.hdk}/build/ant/properties.xml" />
+    <import file="${hy.hdk}/build/ant/depends.xml" />
 
     <property file="../../make/depends.properties" />
+    <property file="make/depends.properties" />
 
-    <property name="zlib.zip" location="${depends.oss}/zlib_1.2.3.zip" />
-
-    <target name="build" depends="compile-java, build-jar" />
+    <target name="build" depends="check-depends,compile-java, build-jar" />
     
     <target name="clean" depends="clean-java,clean-native,clean-test" />
 
+    <target name="check-depends" unless="hy.skip.zlib">
+        <check-one-file src="${zlib.url}" dest="${zlib.tar}" />
+    </target>
+
+    <target name="fetch-depends" unless="hy.skip.zlib">
+        <mkdir dir="${zlib.dir}" />
+        <download-one-file src="${zlib.url}" dest="${zlib.tar}"
+                           md5="${zlib.md5}" />
+    </target>
+
     <target name="copy-native-includes"
             depends="overlay-oss, copy-zipsup-include, copy-zlib-include" />
 
@@ -56,15 +66,24 @@
             depends="-extract-props,-unzip-oss,-ascii2ebcdic-conversion"
             unless="hy.skip.zlib" />
 
-    <target name="-extract-props">
-        <uptodate property="zlib.uptodate"
-                  srcfile="${zlib.zip}"
+    <target name="-extract-props" unless="hy.skip.zlib">
+        <uptodate property="zlib.extracted"
+                  srcfile="${zlib.tar}"
                   targetfile="src/main/native/zlib_dist/README" />
+        <condition property="zlib.uptodate" value="true">
+            <or>
+                <isset property="hy.skip.zlib" />
+                <isset property="zlib.extracted" />
+            </or>
+        </condition>
     </target>
 
     <target name="-unzip-oss" unless="zlib.uptodate">
         <mkdir dir="src/main/native/zlib_dist" />
-        <unzip src="${zlib.zip}" dest="src/main/native/zlib_dist" />
+        <untar src="${zlib.tar}" dest="src/main/native/zlib_dist"
+               compression="gzip">
+            <mapper type="flatten"/>
+        </untar>
         <chmod dir="src/main/native/zlib_dist" perm="ugo+r" />
         <touch file="src/main/native/zlib_dist/README" />
     </target>
@@ -82,7 +101,8 @@
                 <exclude name="**/*.o" />
             </fileset>               
         </copy>
-        <fixcrlf srcdir="src/main/native/zlib_dist" includes="**/*"  excludes="**/*.o" eol="unix" />
+        <fixcrlf srcdir="src/main/native/zlib_dist"
+                 includes="**/*" excludes="**/*.o" eol="unix" />
         <delete dir="src/main/native/zlib_dist_ascii" />
     </target>
     

Modified: harmony/enhanced/java/branches/java6/classlib/modules/archive/src/main/native/zlib/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/archive/src/main/native/zlib/windows/makefile?rev=941466&r1=941465&r2=941466&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/archive/src/main/native/zlib/windows/makefile (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/archive/src/main/native/zlib/windows/makefile Wed May  5 20:20:59 2010
@@ -29,7 +29,7 @@ HYLDFLAGS = $(HYLDFLAGS) -def:$(LIBBASE)
 
 BUILDFILES = \
   $(SHAREDSUB)zlib_copyright.obj $(ZLIB_DIST)adler32.obj $(ZLIB_DIST)compress.obj \
-  $(ZLIB_DIST)crc32.obj $(ZLIB_DIST)deflate.obj $(ZLIB_DIST)gzio.obj $(ZLIB_DIST)infback.obj \
+  $(ZLIB_DIST)crc32.obj $(ZLIB_DIST)deflate.obj $(ZLIB_DIST)infback.obj \
   $(ZLIB_DIST)inffast.obj $(ZLIB_DIST)inflate.obj $(ZLIB_DIST)inftrees.obj $(ZLIB_DIST)trees.obj \
   $(ZLIB_DIST)uncompr.obj $(ZLIB_DIST)zutil.obj
 

Modified: harmony/enhanced/java/branches/java6/classlib/modules/awt/make/depends.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/awt/make/depends.properties?rev=941466&r1=941465&r2=941466&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/awt/make/depends.properties (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/awt/make/depends.properties Wed May  5 20:20:59 2010
@@ -25,25 +25,23 @@ awt.base=http://people.apache.org/~hinde
 jpeg.ver=6b
 jpeg.dir=${depends.lib.dir}/jpeg-${jpeg.ver}
 jpeg.testfile=${jpeg.dir}/jversion.h
-jpeg.tar=${depends.lib.dir}/jpeg-${jpeg.ver}.tar.gz
-jpeg.url=${awt.base}/jpeg-${jpeg.ver}.tar.gz
-jpeg.md5@x86@=610ebc3e6a9f93c9ac9d9261b3fe6611
-jpeg.md5@x86_64@=132fe7221ba3e5c3aa96b851a42ef2a4
+jpeg.tar=${depends.lib.dir}/harmony-jpeg-${jpeg.ver}.tar.gz
+jpeg.url=${awt.base}/harmony-jpeg-${jpeg.ver}.tar.gz
+jpeg.md5@x86@=84d69fb0eb5baca4e0dd36cf017dd6a6
+jpeg.md5@x86_64@=1c111660a0e8d048286ac645bd72c22c
 
-lcms.ver@x86@=1.18
-lcms.ver@x86_64@=1.15
+lcms.ver=1.19
 lcms.dir=${depends.lib.dir}/lcms-${lcms.ver}
-lcms.testfile=${lcms.dir}/lcms.h
-lcms.tar=${depends.lib.dir}/lcms-${lcms.ver}.tar.gz
-lcms.url=${awt.base}/lcms-${lcms.ver}.tar.gz
-lcms.md5@x86@=85cf182f4bf93c9fabe0ddd9fc396a8a
-lcms.md5@x86_64@=e23282246ba9e1cf8b32c52d7fe97c78
+lcms.testfile=${lcms.dir}/include/lcms.h
+lcms.tar=${depends.lib.dir}/harmony-lcms-${lcms.ver}.tar.gz
+lcms.url=${awt.base}/harmony-lcms-${lcms.ver}.tar.gz
+lcms.md5@x86@=48e8ce8481fcebdbb31cdebac38a0c05
+lcms.md5@x86_64@=d7dfc53649e352877e3eb6daad12c290
 
-png.ver@x86@=1.2.38
-png.ver@x86_64@=1.2.12
-png.dir=${depends.lib.dir}/png-${png.ver}
+png.ver=1.4.1
+png.dir=${depends.lib.dir}/libpng-${png.ver}
 png.testfile=${png.dir}/png.h
-png.tar=${depends.lib.dir}/png-${png.ver}.tar.gz
-png.url=${awt.base}/png-${png.ver}.tar.gz
-png.md5@x86@=d7cc20b44f12b4e46da29ed6cccbcba5
-png.md5@x86_64@=b562d8042aeb71d877cfd10518d019bc
+png.tar=${depends.lib.dir}/harmony-libpng-${png.ver}.tar.gz
+png.url=${awt.base}/harmony-libpng-${png.ver}.tar.gz
+png.md5@x86@=c1dda2d4e71557b6d901be921b77c761
+png.md5@x86_64@=083ff91fa54e4e354613785d6cae2f09

Modified: harmony/enhanced/java/branches/java6/classlib/modules/awt/src/main/native/gl/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/awt/src/main/native/gl/windows/makefile?rev=941466&r1=941465&r2=941466&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/awt/src/main/native/gl/windows/makefile (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/awt/src/main/native/gl/windows/makefile Wed May  5 20:20:59 2010
@@ -16,7 +16,7 @@
 APPVER = 5.0 # Need WINVER=0x0500 to get HMONITOR defined.
 !include <$(HY_HDK)\build\make\defines.mak>
 
-PNG_DIR=$(HY_HDK)\..\depends\libs\$(HY_PLATFORM)\png-$(HY_PNG_VER)\# avoid continuation
+PNG_DIR=$(HY_HDK)\..\depends\libs\$(HY_PLATFORM)\libpng-$(HY_PNG_VER)\# avoid continuation
 
 LIBBASE=gl
 DLLNAME=$(DLLPATH)$(LIBBASE).dll

Modified: harmony/enhanced/java/branches/java6/classlib/modules/awt/src/main/native/lcmm/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/awt/src/main/native/lcmm/windows/makefile?rev=941466&r1=941465&r2=941466&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/awt/src/main/native/lcmm/windows/makefile (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/awt/src/main/native/lcmm/windows/makefile Wed May  5 20:20:59 2010
@@ -22,7 +22,7 @@ DLLNAME=$(DLLPATH)$(LIBBASE).dll
 LIBNAME=$(LIBPATH)$(LIBBASE).lib
 HYLDFLAGS = $(HYLDFLAGS) -def:$(LIBBASE).def
 
-HYCFLAGS = $(HYCFLAGS) /I$(SHAREDSUB) /I$(LCMS_DIR) /I$(SHAREDSUB)include
+HYCFLAGS = $(HYCFLAGS) /I$(SHAREDSUB) /I$(LCMS_DIR)include /I$(SHAREDSUB)include
 
 BUILDFILES = \
   $(SHAREDSUB)cmmerror.obj \
@@ -35,7 +35,7 @@ VIRTFILES = $(LIBBASE).res
 SYSLIBFILES = ws2_32.lib Iphlpapi.lib
 
 MDLLIBFILES = $(MDLLIBFILES) \
-  $(LIBPATH)hypool$(HY_LINKLIB_SUFFIX) $(LIBPATH)vmi$(HY_LINKLIB_SUFFIX) $(LCMS_DIR)lcms$(HY_LINKLIB_SUFFIX)
+  $(LIBPATH)hypool$(HY_LINKLIB_SUFFIX) $(LIBPATH)vmi$(HY_LINKLIB_SUFFIX) $(LCMS_DIR)Lib/MS/lcms$(HY_LINKLIB_SUFFIX)
 
 DLLBASE=0x13300000
 

Modified: harmony/enhanced/java/branches/java6/classlib/modules/imageio/make/depends.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/imageio/make/depends.properties?rev=941466&r1=941465&r2=941466&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/imageio/make/depends.properties (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/imageio/make/depends.properties Wed May  5 20:20:59 2010
@@ -19,16 +19,15 @@ awt.base=http://people.apache.org/~hinde
 jpeg.ver=6b
 jpeg.dir=${depends.lib.dir}/jpeg-${jpeg.ver}
 jpeg.testfile=${jpeg.dir}/jversion.h
-jpeg.tar=${depends.lib.dir}/jpeg-${jpeg.ver}.tar.gz
-jpeg.url=${awt.base}/jpeg-${jpeg.ver}.tar.gz
-jpeg.md5@x86@=610ebc3e6a9f93c9ac9d9261b3fe6611
-jpeg.md5@x86_64@=132fe7221ba3e5c3aa96b851a42ef2a4
+jpeg.tar=${depends.lib.dir}/harmony-jpeg-${jpeg.ver}.tar.gz
+jpeg.url=${awt.base}/harmony-jpeg-${jpeg.ver}.tar.gz
+jpeg.md5@x86@=84d69fb0eb5baca4e0dd36cf017dd6a6
+jpeg.md5@x86_64@=1c111660a0e8d048286ac645bd72c22c
 
-png.ver@x86@=1.2.38
-png.ver@x86_64@=1.2.12
-png.dir=${depends.lib.dir}/png-${png.ver}
+png.ver=1.4.1
+png.dir=${depends.lib.dir}/libpng-${png.ver}
 png.testfile=${png.dir}/png.h
-png.tar=${depends.lib.dir}/png-${png.ver}.tar.gz
-png.url=${awt.base}/png-${png.ver}.tar.gz
-png.md5@x86@=d7cc20b44f12b4e46da29ed6cccbcba5
-png.md5@x86_64@=b562d8042aeb71d877cfd10518d019bc
+png.tar=${depends.lib.dir}/harmony-libpng-${png.ver}.tar.gz
+png.url=${awt.base}/harmony-libpng-${png.ver}.tar.gz
+png.md5@x86@=c1dda2d4e71557b6d901be921b77c761
+png.md5@x86_64@=083ff91fa54e4e354613785d6cae2f09

Modified: harmony/enhanced/java/branches/java6/classlib/modules/imageio/src/main/native/pngencoder/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/imageio/src/main/native/pngencoder/windows/makefile?rev=941466&r1=941465&r2=941466&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/imageio/src/main/native/pngencoder/windows/makefile (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/imageio/src/main/native/pngencoder/windows/makefile Wed May  5 20:20:59 2010
@@ -15,7 +15,7 @@
 
 !include <$(HY_HDK)\build\make\defines.mak>
 
-PNG_DIR=$(HY_HDK)\..\depends\libs\$(HY_PLATFORM)\png-$(HY_PNG_VER)\# avoid continuation
+PNG_DIR=$(HY_HDK)\..\depends\libs\$(HY_PLATFORM)\libpng-$(HY_PNG_VER)\# avoid continuation
 
 LIBBASE=pngencoder
 DLLNAME=$(DLLPATH)$(LIBBASE).dll

Modified: harmony/enhanced/java/branches/java6/classlib/modules/instrument/src/main/java/org/apache/harmony/instrument/internal/InstrumentationImpl.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/instrument/src/main/java/org/apache/harmony/instrument/internal/InstrumentationImpl.java?rev=941466&r1=941465&r2=941466&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/instrument/src/main/java/org/apache/harmony/instrument/internal/InstrumentationImpl.java (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/instrument/src/main/java/org/apache/harmony/instrument/internal/InstrumentationImpl.java Wed May  5 20:20:59 2010
@@ -22,6 +22,7 @@ import java.lang.instrument.ClassFileTra
 import java.lang.instrument.Instrumentation;
 import java.lang.instrument.UnmodifiableClassException;
 import java.lang.reflect.Method;
+import java.io.UnsupportedEncodingException;
 import java.security.ProtectionDomain;
 
 import org.apache.harmony.instrument.internal.nls.Messages;
@@ -185,7 +186,7 @@ public class InstrumentationImpl impleme
         byte[] source = classfileBuffer;
         byte[] result = null;
         byte[] trans = null;
-        String className = new String(classNameBytes);
+        String className = utf8BytesToString(classNameBytes);
         for (ClassFileTransformer t : transformers) {
             try {
                 trans = t.transform(loader, className, classBeingRedefined,
@@ -207,10 +208,10 @@ public class InstrumentationImpl impleme
     private void executePremain(byte[] className, byte[] options) {
         try {
             ClassLoader loader = ClassLoader.getSystemClassLoader();
-            Class c = loader.loadClass(new String(className));
+            Class c = loader.loadClass(utf8BytesToString(className));
             Method method = c.getMethod("premain", PREMAIN_SIGNATURE); //$NON-NLS-1$
             method.invoke(null, new Object[] {
-                    null == options ? null : new String(options), this });
+                    null == options ? null : utf8BytesToString(options), this });
         } catch (Exception e) {
             e.printStackTrace();
             System.err
@@ -218,4 +219,18 @@ public class InstrumentationImpl impleme
             System.exit(1);
         }
     }
+
+    private static String utf8BytesToString(byte[] bytes) {
+        if (bytes == null) {
+            return null;
+        }
+
+        try {
+            return new String(bytes, "UTF-8");
+        } catch (UnsupportedEncodingException e) {
+            // should never happen
+            throw new RuntimeException(e);
+        }
+    }
+
 }

Modified: harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/java/java/io/RandomAccessFile.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/java/java/io/RandomAccessFile.java?rev=941466&r1=941465&r2=941466&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/java/java/io/RandomAccessFile.java (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/java/java/io/RandomAccessFile.java Wed May  5 20:20:59 2010
@@ -262,15 +262,7 @@ public class RandomAccessFile implements
      */
     public long length() throws IOException {
         openCheck();
-        synchronized (repositionLock) {
-            long currentPosition = fileSystem.seek(fd.descriptor, 0L,
-                    IFileSystem.SEEK_CUR);
-            long endOfFilePosition = fileSystem.seek(fd.descriptor, 0L,
-                    IFileSystem.SEEK_END);
-            fileSystem.seek(fd.descriptor, currentPosition,
-                    IFileSystem.SEEK_SET);
-            return endOfFilePosition;
-        }
+        return fileSystem.size(fd.descriptor);
     }
 
     /**

Modified: harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/java/org/apache/harmony/luni/platform/Environment.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/java/org/apache/harmony/luni/platform/Environment.java?rev=941466&r1=941465&r2=941466&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/java/org/apache/harmony/luni/platform/Environment.java (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/java/org/apache/harmony/luni/platform/Environment.java Wed May  5 20:20:59 2010
@@ -16,6 +16,7 @@
 
 package org.apache.harmony.luni.platform;
 
+import java.io.UnsupportedEncodingException;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
@@ -63,11 +64,16 @@ public class Environment {
      * @return the value of the environment variable specified
      */
     public static String getenv(String name) {
-        byte[] env = getEnvByName(name.getBytes());
-        if (null == env) {
-            return null;
-        }
-        return new String(env);
+        try {
+             byte[] env = getEnvByName(name.getBytes("UTF-8"));
+             if (null == env) {
+                return null;
+            }
+            return new String(env, "UTF-8");
+        } catch (UnsupportedEncodingException e) {
+            // UTF-8 should always be supported so this should not be reached
+            throw new AssertionError(e);
+        }        
     }
 
     public static class EnvironmentMap extends HashMap<String, String> {

Modified: harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/java/org/apache/harmony/luni/platform/IFileSystem.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/java/org/apache/harmony/luni/platform/IFileSystem.java?rev=941466&r1=941465&r2=941466&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/java/org/apache/harmony/luni/platform/IFileSystem.java (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/java/org/apache/harmony/luni/platform/IFileSystem.java Wed May  5 20:20:59 2010
@@ -105,6 +105,8 @@ public interface IFileSystem {
     public long ttyAvailable() throws IOException;
 
     public long available(long fileDescriptor) throws IOException;
+
+    public long size(long fileDescriptor) throws IOException;
     
     public long ttyRead(byte[] bytes, int offset, int length) throws IOException;
 }

Modified: harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/java/org/apache/harmony/luni/platform/OSFileSystem.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/java/org/apache/harmony/luni/platform/OSFileSystem.java?rev=941466&r1=941465&r2=941466&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/java/org/apache/harmony/luni/platform/OSFileSystem.java (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/java/org/apache/harmony/luni/platform/OSFileSystem.java Wed May  5 20:20:59 2010
@@ -277,6 +277,16 @@ class OSFileSystem implements IFileSyste
 
     private native long availableImpl(long fileDescriptor);
 
+    public long size(long fileDescriptor) throws IOException {
+        long nChar = sizeImpl(fileDescriptor);
+        if (nChar < 0) {
+            throw new IOException();
+        }
+        return nChar;
+    }
+
+    private native long sizeImpl(long fileDescriptor);
+
     public long ttyRead(byte[] bytes, int offset, int length) throws IOException {
         long nChar = ttyReadImpl(bytes, offset, length);
         if (nChar < 0) {

Modified: harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/native/luni/shared/OSFileSystem.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/native/luni/shared/OSFileSystem.c?rev=941466&r1=941465&r2=941466&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/native/luni/shared/OSFileSystem.c (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/native/luni/shared/OSFileSystem.c Wed May  5 20:20:59 2010
@@ -285,11 +285,11 @@ JNIEXPORT jlong JNICALL Java_org_apache_
 }
 
 /*
- * Answers the number of remaining chars in the stdin.
+ * Answers the number of remaining chars on the file descriptor.
  *
  * Class:     org_apache_harmony_luni_platform_OSFileSystem
- * Method:    AvailableImpl
- * Signature: ()J
+ * Method:    availableImpl
+ * Signature: (J)J
  */
 JNIEXPORT jlong JNICALL Java_org_apache_harmony_luni_platform_OSFileSystem_availableImpl
 (JNIEnv *env, jobject thiz, jlong fd)

Modified: harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/native/luni/unix/OSFileSystemLinux32.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/native/luni/unix/OSFileSystemLinux32.c?rev=941466&r1=941465&r2=941466&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/native/luni/unix/OSFileSystemLinux32.c (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/native/luni/unix/OSFileSystemLinux32.c Wed May  5 20:20:59 2010
@@ -23,6 +23,7 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include <errno.h>
+#include <sys/stat.h>
 #if defined(FREEBSD) || defined(AIX) || defined(ZOS) || defined(MACOSX)
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -187,7 +188,7 @@ JNIEXPORT jlong JNICALL Java_org_apache_
     (*env)->ReleaseIntArrayElements(env, jlengths, lengths, JNI_ABORT);
   }
   hymem_free_memory(vectors);
-  return totalRead;
+  return totalRead == 0 ? -1 : totalRead;
 }
 
 /*
@@ -338,3 +339,21 @@ JNIEXPORT jlong JNICALL Java_org_apache_
 #endif
 #endif
 }
+
+
+/*
+ * Answers the size of the file pointed to by the file descriptor.
+ *
+ * Class:     org_apache_harmony_luni_platform_OSFileSystem
+ * Method:    sizeImpl
+ * Signature: (J)J
+ */
+JNIEXPORT jlong JNICALL Java_org_apache_harmony_luni_platform_OSFileSystem_sizeImpl
+(JNIEnv *env, jobject thiz, jlong fd)
+{
+  struct stat statbuf;
+  if (fstat(fd - FD_BIAS, &statbuf) < 0) {
+    return -1;
+  }
+  return (jlong)statbuf.st_size;
+}

Modified: harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/native/luni/unix/exports.txt
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/native/luni/unix/exports.txt?rev=941466&r1=941465&r2=941466&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/native/luni/unix/exports.txt (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/native/luni/unix/exports.txt Wed May  5 20:20:59 2010
@@ -154,6 +154,7 @@ Java_org_apache_harmony_luni_platform_OS
 Java_org_apache_harmony_luni_platform_OSFileSystem_transferImpl
 Java_org_apache_harmony_luni_platform_OSFileSystem_ttyAvailableImpl
 Java_org_apache_harmony_luni_platform_OSFileSystem_availableImpl
+Java_org_apache_harmony_luni_platform_OSFileSystem_sizeImpl
 Java_org_apache_harmony_luni_platform_OSFileSystem_ttyReadImpl
 Java_org_apache_harmony_luni_platform_OSMemory_isLoadedImpl
 Java_org_apache_harmony_luni_platform_OSMemory_loadImpl

Modified: harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/native/luni/windows/OSFileSystemWin32.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/native/luni/windows/OSFileSystemWin32.c?rev=941466&r1=941465&r2=941466&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/native/luni/windows/OSFileSystemWin32.c (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/native/luni/windows/OSFileSystemWin32.c Wed May  5 20:20:59 2010
@@ -230,13 +230,11 @@ Java_org_apache_harmony_luni_platform_OS
       (*env)->ReleaseByteArrayElements(env, toRelease, buf, JNI_ABORT);
     }
 
-    if(bytesWritten == -1 && hyerror_last_error_number() == HYPORT_ERROR_FILE_LOCKED){
-        throwNewExceptionByName(env, "java/io/IOException", netLookupErrorString(env, HYPORT_ERROR_FILE_LOCKED));
-	break;
-    }
-    if(bytesWritten == -1){
+    if(bytesWritten < 0){
+        throwNewExceptionByName(env, "java/io/IOException",
+            netLookupErrorString(env, hyerror_last_error_number()));
         totalWritten = -1;
-        break;
+	break;
     }
     totalWritten += bytesWritten;
    
@@ -296,3 +294,21 @@ JNIEXPORT jlong JNICALL Java_org_apache_
     return count;	
 }
 
+/*
+ * Answers the size of the file pointed to by the file descriptor.
+ *
+ * Class:     org_apache_harmony_luni_platform_OSFileSystem
+ * Method:    sizeImpl
+ * Signature: (J)J
+ */
+JNIEXPORT jlong JNICALL Java_org_apache_harmony_luni_platform_OSFileSystem_sizeImpl
+(JNIEnv *env, jobject thiz, jlong fd)
+{
+  BY_HANDLE_FILE_INFORMATION info;
+  HANDLE hfile = (HANDLE)fd;    	
+  if (GetFileInformationByHandle(hfile, (LPBY_HANDLE_FILE_INFORMATION) &info)) {
+    return (jlong) ((info.nFileSizeHigh<<0x20) + info.nFileSizeLow);
+  } else {
+    return (jlong)-1;
+  }
+}

Modified: harmony/enhanced/java/branches/java6/classlib/modules/nio/src/main/java/common/org/apache/harmony/nio/internal/FileChannelImpl.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/nio/src/main/java/common/org/apache/harmony/nio/internal/FileChannelImpl.java?rev=941466&r1=941465&r2=941466&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/nio/src/main/java/common/org/apache/harmony/nio/internal/FileChannelImpl.java (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/nio/src/main/java/common/org/apache/harmony/nio/internal/FileChannelImpl.java Wed May  5 20:20:59 2010
@@ -298,15 +298,9 @@ public abstract class FileChannelImpl ex
             throw new IndexOutOfBoundsException();
         }
         openCheck();
-        for (int i = offset; i < offset + length; i++) {
-            count += buffers[i].remaining();
-        }
-        if (0 == count) {
+        if (calculateTotalRemaining(buffers, offset, length) == 0) {
             return 0;
         }
-        if (size() == 0) {
-            return -1;
-        }
         ByteBuffer[] directBuffers = new ByteBuffer[length];
         long[] handles = new long[length];
         int[] offsets = new int[length];
@@ -376,14 +370,7 @@ public abstract class FileChannelImpl ex
      */
     public long size() throws IOException {
         openCheck();
-        synchronized (repositioningLock) {
-            long currentPosition = fileSystem.seek(handle, 0L,
-                    IFileSystem.SEEK_CUR);
-            long endOfFilePosition = fileSystem.seek(handle, 0L,
-                    IFileSystem.SEEK_END);
-            fileSystem.seek(handle, currentPosition, IFileSystem.SEEK_SET);
-            return endOfFilePosition;
-        }
+        return fileSystem.size(handle);
     }
 
     public long transferFrom(ReadableByteChannel src, long position, long count)
@@ -570,11 +557,7 @@ public abstract class FileChannelImpl ex
             throw new IndexOutOfBoundsException();
         }
         openCheck();
-        long count = 0;
-        for (int i = offset; i < offset + length; i++) {
-            count += sources[i].remaining();
-        }
-        if (0 == count) {
+        if (calculateTotalRemaining(sources, offset, length) == 0) {
             return 0;
         }
         Object[] src = new Object[length];
@@ -634,4 +617,13 @@ public abstract class FileChannelImpl ex
     public long getHandle() {
         return handle;
     }
+
+    private int calculateTotalRemaining(ByteBuffer[] buffers, int offset,
+            int length) {
+        int count = 0;
+        for (int i = offset; i < offset + length; i++) {
+            count += buffers[i].remaining();
+        }
+        return count;
+    }
 }

Modified: harmony/enhanced/java/branches/java6/classlib/modules/nio/src/main/java/common/org/apache/harmony/nio/internal/SocketChannelImpl.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/nio/src/main/java/common/org/apache/harmony/nio/internal/SocketChannelImpl.java?rev=941466&r1=941465&r2=941466&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/nio/src/main/java/common/org/apache/harmony/nio/internal/SocketChannelImpl.java (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/nio/src/main/java/common/org/apache/harmony/nio/internal/SocketChannelImpl.java Wed May  5 20:20:59 2010
@@ -399,7 +399,7 @@ class SocketChannelImpl extends SocketCh
         }
 
         checkOpenConnected();
-        int totalCount = calculateByteBufferArray(targets, offset, length);
+        int totalCount = calculateTotalRemaining(targets, offset, length);
         if (0 == totalCount) {
             return 0;
         }
@@ -491,11 +491,7 @@ class SocketChannelImpl extends SocketCh
         }
 
         checkOpenConnected();
-        long count = 0;
-        for (int i = offset; i < offset + length; i++) {
-            count += sources[i].remaining();
-        }
-        if (0 == count) {
+        if (calculateTotalRemaining(sources, offset, length) == 0) {
             return 0;
         }
 
@@ -569,13 +565,13 @@ class SocketChannelImpl extends SocketCh
         return writeCount;
     }
 
-    private int calculateByteBufferArray(ByteBuffer[] sources, int offset,
+    private int calculateTotalRemaining(ByteBuffer[] buffers, int offset,
             int length) {
-        int sum = 0;
-        for (int val = offset; val < offset + length; val++) {
-            sum = sum + sources[val].remaining();
+        int count = 0;
+        for (int i = offset; i < offset + length; i++) {
+            count += buffers[i].remaining();
         }
-        return sum;
+        return count;
     }
 
     /*

Modified: harmony/enhanced/java/branches/java6/classlib/modules/nio/src/test/java/common/org/apache/harmony/nio/tests/java/nio/channels/FileChannelTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/nio/src/test/java/common/org/apache/harmony/nio/tests/java/nio/channels/FileChannelTest.java?rev=941466&r1=941465&r2=941466&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/nio/src/test/java/common/org/apache/harmony/nio/tests/java/nio/channels/FileChannelTest.java (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/nio/src/test/java/common/org/apache/harmony/nio/tests/java/nio/channels/FileChannelTest.java Wed May  5 20:20:59 2010
@@ -516,6 +516,21 @@ public class FileChannelTest extends Tes
         writeDataToFile(fileOfReadOnlyFileChannel);
         assertEquals(fileOfReadOnlyFileChannel.length(), readOnlyFileChannel
                 .size());
+
+
+        // REGRESSION test for read(ByteBuffer[], int, int) on special files
+        try {
+            FileChannel specialFile =
+                new FileInputStream("/dev/zero").getChannel();
+            assertEquals(0, specialFile.size());
+            ByteBuffer buf = ByteBuffer.allocate(8);
+            assertEquals(8, specialFile.read(buf));
+            ByteBuffer[] bufs = { ByteBuffer.allocate(8) };
+            assertEquals(8, specialFile.read(bufs, 0, 1));
+            specialFile.close();
+        } catch (FileNotFoundException e) {
+            // skip test if special file doesn't exist
+        }
     }
 
     /**

Modified: harmony/enhanced/java/branches/java6/classlib/modules/rmi/src/test/api/java/org/apache/harmony/rmi/ConnectionTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/rmi/src/test/api/java/org/apache/harmony/rmi/ConnectionTest.java?rev=941466&r1=941465&r2=941466&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/rmi/src/test/api/java/org/apache/harmony/rmi/ConnectionTest.java (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/rmi/src/test/api/java/org/apache/harmony/rmi/ConnectionTest.java Wed May  5 20:20:59 2010
@@ -84,6 +84,11 @@ public class ConnectionTest extends RMIT
      *          If some error occurs.
      */
     public void testDirectSocket_SingleVM() throws Exception {
+        if (checkSocket("127.0.0.1", REGISTRY_PORT, TIMEOUT_TICK*3)) {
+            System.err.println("Registry DEFAULT port ("
+                               + REGISTRY_PORT + ") in use, skipping tests.");
+            return;
+        }
         System.err.println("testDirectSocket_SingleVM starting");
         testSingleVM(CONFIG_DIRECT_SOCKET, true);
     }
@@ -96,6 +101,11 @@ public class ConnectionTest extends RMIT
      *          If some error occurs.
      */
     public void testDirectHTTP_SingleVM() throws Exception {
+        if (checkSocket("127.0.0.1", REGISTRY_PORT, TIMEOUT_TICK*3)) {
+            System.err.println("Registry DEFAULT port ("
+                               + REGISTRY_PORT + ") in use, skipping tests.");
+            return;
+        }
         System.err.println("testDirectHTTP_SingleVM starting");
         testSingleVM(CONFIG_DIRECT_HTTP, true);
     }

Modified: harmony/enhanced/java/branches/java6/classlib/modules/rmi/src/test/api/java/org/apache/harmony/rmi/RegistryTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/rmi/src/test/api/java/org/apache/harmony/rmi/RegistryTest.java?rev=941466&r1=941465&r2=941466&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/rmi/src/test/api/java/org/apache/harmony/rmi/RegistryTest.java (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/rmi/src/test/api/java/org/apache/harmony/rmi/RegistryTest.java Wed May  5 20:20:59 2010
@@ -96,6 +96,13 @@ public class RegistryTest extends RMITes
 
             // Create registry.
             int port = REGISTRY_PORT;
+
+            if (checkSocket("127.0.0.1", port, TIMEOUT_TICK*3)) {
+                System.err.println("Registry DEFAULT port ("
+                                   + port + ") in use, skipping tests.");
+                return;
+            }
+
             Registry reg = LocateRegistry.createRegistry(port);
             System.out.println("Registry on DEFAULT port ("
                                + port + ") created.");

Modified: harmony/enhanced/java/branches/java6/classlib/modules/security/src/main/java/common/org/apache/harmony/security/DefaultPolicyScanner.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/security/src/main/java/common/org/apache/harmony/security/DefaultPolicyScanner.java?rev=941466&r1=941465&r2=941466&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/security/src/main/java/common/org/apache/harmony/security/DefaultPolicyScanner.java (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/security/src/main/java/common/org/apache/harmony/security/DefaultPolicyScanner.java Wed May  5 20:20:59 2010
@@ -271,7 +271,16 @@ public class DefaultPolicyScanner {
             st.nextToken();
         }
         if (st.ttype == '"') {
-            pe.name = st.sval;
+            StringBuilder sb = new StringBuilder();
+            String[] elements = st.sval.split("[,]"); //$NON-NLS-1$
+            int endIndex = elements.length - 1;
+            for (int index = 0; index < endIndex; index++) {
+                sb.append(elements[index].trim() + ',');
+            }
+            if (endIndex > -1) {
+                sb.append(elements[endIndex].trim());
+            }
+            pe.name = sb.toString();
         } else if (st.ttype == '*') {
             pe.name = PrincipalEntry.WILDCARD;
         } else {

Modified: harmony/enhanced/java/branches/java6/classlib/modules/security/src/test/impl/java.injected/org/apache/harmony/security/DefaultPolicyScannerTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/security/src/test/impl/java.injected/org/apache/harmony/security/DefaultPolicyScannerTest.java?rev=941466&r1=941465&r2=941466&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/security/src/test/impl/java.injected/org/apache/harmony/security/DefaultPolicyScannerTest.java (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/security/src/test/impl/java.injected/org/apache/harmony/security/DefaultPolicyScannerTest.java Wed May  5 20:20:59 2010
@@ -264,6 +264,10 @@ public class DefaultPolicyScannerTest ex
         pe = scanner.readPrincipalEntry(getST("clazz *"));
         assertEquals(DefaultPolicyScanner.PrincipalEntry.WILDCARD, pe.name);
         assertEquals("clazz", pe.klass);
+
+        pe = scanner.readPrincipalEntry(getST("\"a, b, c, d\""));
+        assertEquals("a,b,c,d", pe.name);
+        assertNull(pe.klass);
     }
 
     /**

Propchange: harmony/enhanced/java/branches/java6/common_resources/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May  5 20:20:59 2010
@@ -1,3 +1,3 @@
-/harmony/enhanced/java/trunk/common_resources:929253-936843
+/harmony/enhanced/java/trunk/common_resources:929253-940795
 /harmony/enhanced/trunk/common_resources:476396-929252
 /incubator/harmony/enhanced/trunk/common_resources:423974-476394

Propchange: harmony/enhanced/java/branches/java6/drlvm/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May  5 20:20:59 2010
@@ -1,4 +1,4 @@
-/harmony/enhanced/java/trunk/drlvm:929253-936843
+/harmony/enhanced/java/trunk/drlvm:929253-940795
 /harmony/enhanced/trunk/drlvm:810871-929252
 /harmony/enhanced/trunk/working_vm:476396-920147
 /incubator/harmony/enhanced/trunk/working_vm:423974-476394

Modified: harmony/enhanced/java/branches/java6/drlvm/make/depends.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/drlvm/make/depends.properties?rev=941466&r1=941465&r2=941466&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/drlvm/make/depends.properties (original)
+++ harmony/enhanced/java/branches/java6/drlvm/make/depends.properties Wed May  5 20:20:59 2010
@@ -30,17 +30,6 @@ apr.src.rootdir=apr-1.3.9
 apr.src.tgz.url=http://archive.apache.org/dist/apr/apr-1.3.9.tar.gz
 apr.src.tgz.md5=85bcd8005153b8fa63b1e3f95ea31f07
 
-# ZLIB, version 1.2.1 or above
-# http://www.zlib.net/
-zlib.dir@x86@=${base.dep.dir}/libs/${hy.platform.variant}/zlib-124
-zlib.dir@x86_64@=${base.dep.dir}/libs/${hy.platform.variant}/zlib-123
-zlib=${zlib.dir}/zlib.zip
-zlib.url@x86@=http://www.zlib.net/zlib124-dll.zip
-zlib.md5@x86@=8dc3c0e8d1c4f27df820bba86de3aa99
-zlib.url@x86_64@=https://issues.apache.org/jira/secure/attachment/12351498/zlib-x86_64-dll.zip
-zlib.md5@x86_64@=7397278304667d4e68e9af073da45d98
-
-
 # Ant-contrib, version 0.6 or above
 # http://sourceforge.net/project/showfiles.php?group_id=36177
 ant-contrib=${depends.jars}/ant-contrib-1.0b3/ant-contrib.zip

Modified: harmony/enhanced/java/branches/java6/drlvm/make/vm/vmcore.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/drlvm/make/vm/vmcore.xml?rev=941466&r1=941465&r2=941466&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/drlvm/make/vm/vmcore.xml (original)
+++ harmony/enhanced/java/branches/java6/drlvm/make/vm/vmcore.xml Wed May  5 20:20:59 2010
@@ -21,24 +21,16 @@
     <property name="component" value="vmcore"/>
     <import file="common-vm.xml"/>
 
-    <target name="fetch-depends" depends="fetch-depends-win">
+    <target name="fetch-depends">
         <fetch dep="icuhdr"/>
         <fetch dep="icudll"/>
     </target>
 
-    <target name="fetch-depends-win" if="is.windows">
-        <fetch dep="zlib"/>
-    </target>
-
-    <target name="check-depends" depends="check-depends-win">
+    <target name="check-depends">
         <check-one-file dest="${icuhdr}" src="${icuhdr.url}"/>
         <check-one-file dest="${icudll}" src="${icudll.url}"/>
     </target>
 
-    <target name="check-depends-win" if="is.windows">
-        <check-one-file dest="${zlib}" src="${zlib.url}"/>
-    </target>
-    
     <target name="-check-setup">
         <available file="${drlvm.include.dir}/unicode" property="icu4c.hdr.available"/>
         <available file="${drlvm.shlib.dir}/${linklib.prefix}icuuc${linklib.suffix}" 
@@ -51,7 +43,7 @@
         </condition>
     </target>
 
-    <target name="setup" depends="-check-setup,-setup-win" unless="setup.complete">
+    <target name="setup" depends="-check-setup" unless="setup.complete">
         <check-one-file dest="${icuhdr}" src="${icuhdr.url}"/>
         <check-one-file dest="${icudll}" src="${icudll.url}"/>
         <mkdir dir="${drlvm.include.dir}/unicode"/>
@@ -73,34 +65,6 @@
             dest="${drlvm.shlib.dir}/${linklib.prefix}icuuc${linklib.suffix}"/>
     </target>
 
-    <target name="-check-setup-win" if="is.windows">
-        <condition property="zlib.available">
-            <and>
-                <available file="${drlvm.bin.dir}/zlib1.dll"/>
-                <available file="${drlvm.include.dir}/zlib.h"/>
-            </and>
-        </condition>
-        <condition property="win.setup.complete">
-            <isset property="zlib.available"/>
-        </condition>
-    </target>
-
-    <target name="-setup-win" depends="-check-setup-win"
-        if="is.windows" unless="win.setup.complete">
-        <check-one-file dest="${zlib}" src="${zlib.url}"/>
-        <unzip src="${zlib}" dest="${zlib.dir}">
-            <mapper type="flatten" />
-        </unzip>
-        <copy file="${zlib.dir}/zlib1.dll" todir="${drlvm.bin.dir}"/>
-        <copy file="${zlib.dir}/zdll.lib" todir="${drlvm.lib.dir}" />
-        <copy todir="${drlvm.include.dir}">
-            <fileset dir="${zlib.dir}">
-                <include name="zconf.h" />
-                <include name="zlib.h" />
-            </fileset>
-        </copy>
-    </target>
-            
     <target name="build" depends="setup,stamp-version,-common-vm">
         <init-native component="vmcore"/>
         
@@ -134,6 +98,7 @@
                 <include name="port/src/encoder/ia32_em64t" if="is.x86_64"/>
                 <include name="vmcore/src/lil/em64t/include" if="is.x86_64"/>
             </dirset>
+            <pathelement location="${hy.hdk}/include" />
         </path>
         <depend-includes paths="vmcore.includes"/>
         <depend-selector rebuild-flag="vmcore.includes.uptodate" id="vmcore.depends"/>
@@ -222,15 +187,17 @@
                     dir="${drlvm.lib.dir}" />
                 <libset libs="hythr" dir="${drlvm.shlib.dir}" />
                 <libset libs="icuuc" dir="${drlvm.shlib.dir}"/>
-                <libset libs="zdll" dir="${drlvm.lib.dir}" if="is.windows"/>
                 <libset libs="ch" dir="${drlvm.shlib.dir}" />
+                <libset libs="hyzlib" dir="${hy.hdk.shlibs}"
+                        unless="hy.skip.zlib"/>
+                <syslibset type="shared" libs="z" if="hy.skip.zlib"/>
 
                 <linkerarg value="/DEF:${vm.home}/vmcore/src/harmonyvm64.def" if="is.windows.x86_64"/>
                 <linkerarg value="/DEF:${vm.home}/vmcore/src/harmonyvm.def" if="is.windows.x86"/>
                 <linkerarg value="--version-script=${vm.home}/vmcore/build/vmcore.exp" if="is.unix"/>
                 
-                <syslibset type="shared" libs="m,dl,stdc++,z,xml2,pthread,gcc_s,rt" if="is.linux"/>
-                <syslibset type="shared" libs="m,stdc++,z,pthread" if="is.freebsd"/> 
+                <syslibset type="shared" libs="m,dl,stdc++,xml2,pthread,gcc_s,rt" if="is.linux"/>
+                <syslibset type="shared" libs="m,stdc++,pthread" if="is.freebsd"/> 
                 <libset libs="xml2" dir="/usr/local/lib" if="is.freebsd"/>
                 <linkerarg value="--export-dynamic" if="is.freebsd"/>
             </linker>

Propchange: harmony/enhanced/java/branches/java6/jdktools/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May  5 20:20:59 2010
@@ -1,4 +1,4 @@
-/harmony/enhanced/java/trunk/jdktools:929253-936843
+/harmony/enhanced/java/trunk/jdktools:929253-940795
 /harmony/enhanced/jdktools/trunk:630107-925933
 /harmony/enhanced/trunk/jdktools:810871-929252
 /harmony/enhanced/trunk/working_jdktools:476396-920147

Propchange: harmony/enhanced/java/branches/java6/jdktools/modules/jretools/.classpath
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May  5 20:20:59 2010
@@ -1,4 +1,4 @@
-/harmony/enhanced/java/trunk/jdktools/modules/jretools/.classpath:929253-936843
+/harmony/enhanced/java/trunk/jdktools/modules/jretools/.classpath:929253-940795
 /harmony/enhanced/jdktools/trunk/modules/jretools/.classpath:702140-925933
 /harmony/enhanced/trunk/jdktools/modules/jretools/.classpath:810871-929252
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/.classpath:467609-476394

Propchange: harmony/enhanced/java/branches/java6/jdktools/modules/jretools/.project
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May  5 20:20:59 2010
@@ -1,4 +1,4 @@
-/harmony/enhanced/java/trunk/jdktools/modules/jretools/.project:929253-936843
+/harmony/enhanced/java/trunk/jdktools/modules/jretools/.project:929253-940795
 /harmony/enhanced/jdktools/trunk/modules/jretools/.project:702140-925933
 /harmony/enhanced/trunk/jdktools/modules/jretools/.project:810871-929252
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/.project:467609-476394

Propchange: harmony/enhanced/java/branches/java6/jdktools/modules/jretools/.settings/org.eclipse.jdt.core.prefs
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May  5 20:20:59 2010
@@ -1,4 +1,4 @@
-/harmony/enhanced/java/trunk/jdktools/modules/jretools/.settings/org.eclipse.jdt.core.prefs:929253-936843
+/harmony/enhanced/java/trunk/jdktools/modules/jretools/.settings/org.eclipse.jdt.core.prefs:929253-940795
 /harmony/enhanced/jdktools/trunk/modules/jretools/.settings/org.eclipse.jdt.core.prefs:702140-925933
 /harmony/enhanced/trunk/jdktools/modules/jretools/.settings/org.eclipse.jdt.core.prefs:810871-929252
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/.settings/org.eclipse.jdt.core.prefs:467609-476394

Propchange: harmony/enhanced/java/branches/java6/jdktools/modules/jretools/.settings/org.eclipse.jdt.ui.prefs
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May  5 20:20:59 2010
@@ -1,4 +1,4 @@
-/harmony/enhanced/java/trunk/jdktools/modules/jretools/.settings/org.eclipse.jdt.ui.prefs:929253-936843
+/harmony/enhanced/java/trunk/jdktools/modules/jretools/.settings/org.eclipse.jdt.ui.prefs:929253-940795
 /harmony/enhanced/jdktools/trunk/modules/jretools/.settings/org.eclipse.jdt.ui.prefs:702140-925933
 /harmony/enhanced/trunk/jdktools/modules/jretools/.settings/org.eclipse.jdt.ui.prefs:810871-929252
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/.settings/org.eclipse.jdt.ui.prefs:467609-476394

Propchange: harmony/enhanced/java/branches/java6/jdktools/modules/jretools/META-INF/MANIFEST.MF
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May  5 20:20:59 2010
@@ -1,4 +1,4 @@
-/harmony/enhanced/java/trunk/jdktools/modules/jretools/META-INF/MANIFEST.MF:929253-936843
+/harmony/enhanced/java/trunk/jdktools/modules/jretools/META-INF/MANIFEST.MF:929253-940795
 /harmony/enhanced/jdktools/trunk/modules/jretools/META-INF/MANIFEST.MF:702140-925933
 /harmony/enhanced/trunk/jdktools/modules/jretools/META-INF/MANIFEST.MF:810871-929252
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/META-INF/MANIFEST.MF:467609-476394

Propchange: harmony/enhanced/java/branches/java6/jdktools/modules/jretools/build.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May  5 20:20:59 2010
@@ -1,4 +1,4 @@
-/harmony/enhanced/java/trunk/jdktools/modules/jretools/build.xml:929253-936843
+/harmony/enhanced/java/trunk/jdktools/modules/jretools/build.xml:929253-940795
 /harmony/enhanced/jdktools/trunk/modules/jretools/build.xml:702140-925933
 /harmony/enhanced/trunk/jdktools/modules/jretools/build.xml:810871-929252
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/build.xml:467609-476394

Propchange: harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/internal/nls/Messages.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May  5 20:20:59 2010
@@ -1,4 +1,4 @@
-/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/internal/nls/Messages.java:929253-936843
+/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/internal/nls/Messages.java:929253-940795
 /harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/internal/nls/Messages.java:702140-925933
 /harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/internal/nls/Messages.java:810871-929252
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/internal/nls/Messages.java:467609-476394

Propchange: harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/internal/nls/messages.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May  5 20:20:59 2010
@@ -1,4 +1,4 @@
-/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/internal/nls/messages.properties:929253-936843
+/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/internal/nls/messages.properties:929253-940795
 /harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/internal/nls/messages.properties:702140-925933
 /harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/internal/nls/messages.properties:810871-929252
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/internal/nls/messages.properties:467609-476394

Propchange: harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/ArgumentsParser.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May  5 20:20:59 2010
@@ -1,4 +1,4 @@
-/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/ArgumentsParser.java:929253-936843
+/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/ArgumentsParser.java:929253-940795
 /harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/ArgumentsParser.java:702140-925933
 /harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/ArgumentsParser.java:810871-929252
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/ArgumentsParser.java:467609-476394

Propchange: harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CRLManager.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May  5 20:20:59 2010
@@ -1,4 +1,4 @@
-/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CRLManager.java:929253-936843
+/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CRLManager.java:929253-940795
 /harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CRLManager.java:702140-925933
 /harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CRLManager.java:810871-929252
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CRLManager.java:467609-476394

Propchange: harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CSRGenerator.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May  5 20:20:59 2010
@@ -1,4 +1,4 @@
-/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CSRGenerator.java:929253-936843
+/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CSRGenerator.java:929253-940795
 /harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CSRGenerator.java:702140-925933
 /harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CSRGenerator.java:810871-929252
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CSRGenerator.java:467609-476394

Propchange: harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertChainVerifier.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May  5 20:20:59 2010
@@ -1,4 +1,4 @@
-/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertChainVerifier.java:929253-936843
+/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertChainVerifier.java:929253-940795
 /harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertChainVerifier.java:702140-925933
 /harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertChainVerifier.java:810871-929252
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertChainVerifier.java:467609-476394

Propchange: harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertExporter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May  5 20:20:59 2010
@@ -1,4 +1,4 @@
-/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertExporter.java:929253-936843
+/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertExporter.java:929253-940795
 /harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertExporter.java:702140-925933
 /harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertExporter.java:810871-929252
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertExporter.java:467609-476394

Propchange: harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertImporter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May  5 20:20:59 2010
@@ -1,4 +1,4 @@
-/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertImporter.java:929253-936843
+/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertImporter.java:929253-940795
 /harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertImporter.java:702140-925933
 /harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertImporter.java:810871-929252
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertImporter.java:467609-476394

Propchange: harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertReader.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May  5 20:20:59 2010
@@ -1,4 +1,4 @@
-/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertReader.java:929253-936843
+/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertReader.java:929253-940795
 /harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertReader.java:702140-925933
 /harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertReader.java:810871-929252
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertReader.java:467609-476394

Propchange: harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/Command.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May  5 20:20:59 2010
@@ -1,4 +1,4 @@
-/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/Command.java:929253-936843
+/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/Command.java:929253-940795
 /harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/Command.java:702140-925933
 /harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/Command.java:810871-929252
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/Command.java:467609-476394

Propchange: harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/EntryManager.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May  5 20:20:59 2010
@@ -1,4 +1,4 @@
-/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/EntryManager.java:929253-936843
+/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/EntryManager.java:929253-940795
 /harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/EntryManager.java:702140-925933
 /harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/EntryManager.java:810871-929252
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/EntryManager.java:467609-476394

Propchange: harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/HelpPrinter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May  5 20:20:59 2010
@@ -1,4 +1,4 @@
-/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/HelpPrinter.java:929253-936843
+/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/HelpPrinter.java:929253-940795
 /harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/HelpPrinter.java:702140-925933
 /harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/HelpPrinter.java:810871-929252
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/HelpPrinter.java:467609-476394

Propchange: harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyCertGenerator.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May  5 20:20:59 2010
@@ -1,4 +1,4 @@
-/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyCertGenerator.java:929253-936843
+/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyCertGenerator.java:929253-940795
 /harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyCertGenerator.java:702140-925933
 /harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyCertGenerator.java:810871-929252
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyCertGenerator.java:467609-476394

Propchange: harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyStoreCertPrinter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May  5 20:20:59 2010
@@ -1,4 +1,4 @@
-/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyStoreCertPrinter.java:929253-936843
+/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyStoreCertPrinter.java:929253-940795
 /harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyStoreCertPrinter.java:702140-925933
 /harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyStoreCertPrinter.java:810871-929252
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyStoreCertPrinter.java:467609-476394

Propchange: harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyStoreConverter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May  5 20:20:59 2010
@@ -1,4 +1,4 @@
-/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyStoreConverter.java:929253-936843
+/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyStoreConverter.java:929253-940795
 /harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyStoreConverter.java:702140-925933
 /harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyStoreConverter.java:810871-929252
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyStoreConverter.java:467609-476394

Propchange: harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolException.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May  5 20:20:59 2010
@@ -1,4 +1,4 @@
-/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolException.java:929253-936843
+/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolException.java:929253-940795
 /harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolException.java:702140-925933
 /harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolException.java:810871-929252
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolException.java:467609-476394

Propchange: harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolKSLoaderSaver.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May  5 20:20:59 2010
@@ -1,4 +1,4 @@
-/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolKSLoaderSaver.java:929253-936843
+/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolKSLoaderSaver.java:929253-940795
 /harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolKSLoaderSaver.java:702140-925933
 /harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolKSLoaderSaver.java:810871-929252
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolKSLoaderSaver.java:467609-476394

Propchange: harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolParameters.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May  5 20:20:59 2010
@@ -1,4 +1,4 @@
-/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolParameters.java:929253-936843
+/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolParameters.java:929253-940795
 /harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolParameters.java:702140-925933
 /harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolParameters.java:810871-929252
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolParameters.java:467609-476394

Propchange: harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/Main.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May  5 20:20:59 2010
@@ -1,4 +1,4 @@
-/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/Main.java:929253-936843
+/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/Main.java:929253-940795
 /harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/Main.java:702140-925933
 /harmony/enhanced/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/Main.java:810871-929252
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/Main.java:467609-476394

Propchange: harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/Consts.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May  5 20:20:59 2010
@@ -1,2 +1,2 @@
-/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/Consts.java:929253-936843
+/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/Consts.java:929253-940795
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/Consts.java:467609-476394

Propchange: harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/Main.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May  5 20:20:59 2010
@@ -1,2 +1,2 @@
-/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/Main.java:929253-936843
+/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/Main.java:929253-940795
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/Main.java:467609-476394

Propchange: harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/control/Controller.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May  5 20:20:59 2010
@@ -1,2 +1,2 @@
-/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/control/Controller.java:929253-936843
+/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/control/Controller.java:929253-940795
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/control/Controller.java:467609-476394

Propchange: harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/control/InvalidPolicyTextException.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May  5 20:20:59 2010
@@ -1,2 +1,2 @@
-/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/control/InvalidPolicyTextException.java:929253-936843
+/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/control/InvalidPolicyTextException.java:929253-940795
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/control/InvalidPolicyTextException.java:467609-476394

Propchange: harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/control/PolicyFileHandler.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May  5 20:20:59 2010
@@ -1,2 +1,2 @@
-/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/control/PolicyFileHandler.java:929253-936843
+/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/control/PolicyFileHandler.java:929253-940795
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/control/PolicyFileHandler.java:467609-476394

Propchange: harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/control/PolicyTextParser.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May  5 20:20:59 2010
@@ -1,2 +1,2 @@
-/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/control/PolicyTextParser.java:929253-936843
+/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/control/PolicyTextParser.java:929253-940795
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/control/PolicyTextParser.java:467609-476394

Propchange: harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/model/CommentEntry.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May  5 20:20:59 2010
@@ -1,2 +1,2 @@
-/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/model/CommentEntry.java:929253-936843
+/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/model/CommentEntry.java:929253-940795
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/model/CommentEntry.java:467609-476394

Propchange: harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/model/GrantEntry.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May  5 20:20:59 2010
@@ -1,2 +1,2 @@
-/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/model/GrantEntry.java:929253-936843
+/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/model/GrantEntry.java:929253-940795
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/model/GrantEntry.java:467609-476394

Propchange: harmony/enhanced/java/branches/java6/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/model/KeystoreEntry.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May  5 20:20:59 2010
@@ -1,2 +1,2 @@
-/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/model/KeystoreEntry.java:929253-936843
+/harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/model/KeystoreEntry.java:929253-940795
 /incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/model/KeystoreEntry.java:467609-476394



Mime
View raw message