harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r805197 [1/2] - in /harmony/enhanced/classlib/branches/java6: ./ make/ modules/accessibility/ modules/annotation/ modules/applet/ modules/archive/ modules/auth/ modules/awt/ modules/awt/make/ modules/awt/src/main/native/gl/windows/ modules/...
Date Mon, 17 Aug 2009 22:53:03 GMT
Author: hindessm
Date: Mon Aug 17 22:53:00 2009
New Revision: 805197

URL: http://svn.apache.org/viewvc?rev=805197&view=rev
Log:
Merge updates from classlib trunk@804992 since rr803295.

Modified:
    harmony/enhanced/classlib/branches/java6/   (props changed)
    harmony/enhanced/classlib/branches/java6/build.xml
    harmony/enhanced/classlib/branches/java6/make/build-java.xml
    harmony/enhanced/classlib/branches/java6/make/build-native.xml
    harmony/enhanced/classlib/branches/java6/make/build-test.xml
    harmony/enhanced/classlib/branches/java6/make/depends-common.xml   (props changed)
    harmony/enhanced/classlib/branches/java6/make/properties.xml
    harmony/enhanced/classlib/branches/java6/modules/accessibility/build.xml
    harmony/enhanced/classlib/branches/java6/modules/annotation/build.xml
    harmony/enhanced/classlib/branches/java6/modules/applet/build.xml
    harmony/enhanced/classlib/branches/java6/modules/archive/build.xml
    harmony/enhanced/classlib/branches/java6/modules/auth/build.xml
    harmony/enhanced/classlib/branches/java6/modules/awt/build.xml
    harmony/enhanced/classlib/branches/java6/modules/awt/make/depends.properties
    harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/gl/windows/makefile
    harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/jpegdecoder/windows/makefile
    harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/lcmm/windows/makefile
    harmony/enhanced/classlib/branches/java6/modules/beans/build.xml
    harmony/enhanced/classlib/branches/java6/modules/concurrent/build.xml
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/atomic/   (props changed)
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/locks/   (props changed)
    harmony/enhanced/classlib/branches/java6/modules/crypto/build.xml
    harmony/enhanced/classlib/branches/java6/modules/imageio/build.xml
    harmony/enhanced/classlib/branches/java6/modules/imageio/make/depends.properties
    harmony/enhanced/classlib/branches/java6/modules/imageio/src/main/native/jpegencoder/windows/makefile
    harmony/enhanced/classlib/branches/java6/modules/imageio/src/main/native/pngencoder/windows/makefile
    harmony/enhanced/classlib/branches/java6/modules/instrument/build.xml
    harmony/enhanced/classlib/branches/java6/modules/jmx/META-INF/   (props changed)
    harmony/enhanced/classlib/branches/java6/modules/jmx/build.xml
    harmony/enhanced/classlib/branches/java6/modules/jndi/build.xml
    harmony/enhanced/classlib/branches/java6/modules/lang-management/build.xml
    harmony/enhanced/classlib/branches/java6/modules/lang-management/src/test/api/java/org/apache/harmony/lang/management/tests/java/util/logging/   (props changed)
    harmony/enhanced/classlib/branches/java6/modules/logging/build.xml
    harmony/enhanced/classlib/branches/java6/modules/luni-kernel/build.xml
    harmony/enhanced/classlib/branches/java6/modules/luni/build.xml
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/fdlibm.h   (props changed)
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/gp.h   (props changed)
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/hymagic.h   (props changed)
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/hysocket.h   (props changed)
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/hyvmls.h   (props changed)
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/jni.h   (props changed)
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/jni_types.h   (props changed)
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/jvmpi.h   (props changed)
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/jvmri.h   (props changed)
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/jvmti.h   (props changed)
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/jvmti_types.h   (props changed)
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/vmi.h   (props changed)
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/vmizip.h   (props changed)
    harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/lang/ClassLoaderTest.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/URLConnectionTest.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/test/resources/net.resources/   (props changed)
    harmony/enhanced/classlib/branches/java6/modules/math/build.xml
    harmony/enhanced/classlib/branches/java6/modules/nio/build.xml
    harmony/enhanced/classlib/branches/java6/modules/nio_char/build.xml
    harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/java/org/apache/harmony/niochar/charset/additional/IBM037.java
    harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/native/niochar/shared/additional/IBM037.c
    harmony/enhanced/classlib/branches/java6/modules/nio_char/src/test/java/tests/api/java/nio/charset/CharsetProviderTest.java
    harmony/enhanced/classlib/branches/java6/modules/orb/build.xml
    harmony/enhanced/classlib/branches/java6/modules/pack200/build.xml
    harmony/enhanced/classlib/branches/java6/modules/pack200/depends/manifests/asm-3.1/   (props changed)
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java5/org/apache/harmony/pack200/Pack200Adapter.java   (props changed)
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java5/org/apache/harmony/pack200/Pack200PackerAdapter.java   (props changed)
    harmony/enhanced/classlib/branches/java6/modules/portlib/build.xml
    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/build.xml
    harmony/enhanced/classlib/branches/java6/modules/rmi/build.xml
    harmony/enhanced/classlib/branches/java6/modules/security-kernel/build.xml
    harmony/enhanced/classlib/branches/java6/modules/security/build.xml
    harmony/enhanced/classlib/branches/java6/modules/sound/build.xml
    harmony/enhanced/classlib/branches/java6/modules/sql/build.xml
    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/test/java/org/apache/harmony/sql/tests/internal/rowset/CachedRowSetStreamTest.java
    harmony/enhanced/classlib/branches/java6/modules/suncompat/build.xml
    harmony/enhanced/classlib/branches/java6/modules/swing/build.xml
    harmony/enhanced/classlib/branches/java6/modules/swing/src/test/api/java.injected/javax/swing/BasicSwingTestCase.java   (props changed)
    harmony/enhanced/classlib/branches/java6/modules/swing/src/test/api/java.injected/javax/swing/SwingTestCase.java   (props changed)
    harmony/enhanced/classlib/branches/java6/modules/swing/src/test/api/java.injected/javax/swing/text/parser/   (props changed)
    harmony/enhanced/classlib/branches/java6/modules/text/build.xml
    harmony/enhanced/classlib/branches/java6/modules/x-net/build.xml
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/CertificateMessageTest.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/CertificateRequestTest.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/TrustManagerImplTest.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/impl/java/org/apache/harmony/xnet/tests/provider/jsse/DigitalSignatureTest.java

Propchange: harmony/enhanced/classlib/branches/java6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug 17 22:53:00 2009
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk:713674-735919,765923-803295
+/harmony/enhanced/classlib/trunk:713674-735919,765923-804992

Modified: harmony/enhanced/classlib/branches/java6/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/build.xml?rev=805197&r1=805196&r2=805197&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/build.xml Mon Aug 17 22:53:00 2009
@@ -320,6 +320,7 @@
 
     <target name="-clean-hdk">
         <delete dir="${hy.hdk}/build/ant" />
+	<delete dir="${hy.hdk}/build/make" />
     </target>
     
     <macrodef name="chksum">
@@ -358,6 +359,14 @@
                   tofile="${hy.hdk}/build/ant/depends.properties"
                   outputencoding="UTF-8" >
             </copy>
+
+	    <mkdir dir="${hy.hdk}/build/make" />
+	    <copy todir="${hy.hdk}/build/make" overwrite="yes">
+                <fileset dir="depends/build">
+                    <include name="**" />
+                </fileset>
+            </copy>
+
         </sequential>
     </macrodef>
 

Modified: harmony/enhanced/classlib/branches/java6/make/build-java.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/make/build-java.xml?rev=805197&r1=805196&r2=805197&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/make/build-java.xml (original)
+++ harmony/enhanced/classlib/branches/java6/make/build-java.xml Mon Aug 17 22:53:00 2009
@@ -66,7 +66,7 @@
                      -clean-bin-catch-all"/>
 
     <target name="-modules-clean-bin">
-        <poll-modules target="clean" />
+        <poll-modules target="clean-java" />
     </target>
 
     <target name="-clean-bin-catch-all-test">

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=805197&r1=805196&r2=805197&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/make/build-native.xml (original)
+++ harmony/enhanced/classlib/branches/java6/make/build-native.xml Mon Aug 17 22:53:00 2009
@@ -31,7 +31,6 @@
     <import file="${basedir}/make/properties.xml" />
     <import file="${basedir}/make/depends.xml" />
 
-    <property name="depends.build" location="depends/build" />
     <property name="depends.oss" location="depends/oss" />
     <property name="depends.libs" location="depends/libs/${hy.platform}" />
     <property name="depends.files" location="depends/files" />
@@ -55,18 +54,17 @@
           target: build
          ================================= -->
     <target name="build"
-        depends="overlay-oss, copy-includes, layout, make-all" />
+            depends="overlay-oss,copy-includes,layout,build-modules" />
 
 
     <!-- ================================= 
           target: clean              
          ================================= -->
-    <target name="clean"
-        depends="make-clean, clean-includes, clean-overlay-oss, clean-layout" />
+    <target name="clean" depends="clean-modules,clean-includes,clean-layout" />
 
 
     <!-- This target invokes make on the all target to compile all natives -->
-    <target name="make-all" depends="copy-makefile-includes">
+    <target name="build-modules">
     	
     	<!-- These module targets take care of building and copying
              their shared libs -->
@@ -84,10 +82,7 @@
     <!-- ================================= 
           target: make-clean              
          ================================= -->
-    <target name="make-clean"
-        depends="copy-makefile-includes,-make-clean,clean-makefile-includes" />
-
-    <target name="-make-clean">
+    <target name="clean-modules">
         <poll-modules target="clean-native" />
     	<delete dir="${native.lib.target}" />
     </target>
@@ -172,43 +167,8 @@
           target: clean-includes              
          ================================= -->
     <target name="clean-includes" >
-	<!-- Call clean.native.includes targets to delete global
-   	     includes under deploy/includes/harmony -->
-        
-        <poll-modules target="clean-native-includes" />
-
-        <!-- delete the deploy/include and deploy/jdk/include directories -->
         <delete dir="${hy.hdk}/include" />
         <delete dir="${hy.hdk}/jdk/include" />
     </target>
 
-    <!-- ================================= 
-          target: copy-makefile-includes              
-         ================================= -->
-    <target name="copy-makefile-includes">
-	<!-- copy generic defines and rules for each platform into a shared
-	     place -->
-	<mkdir dir="${hy.hdk}/build/make" />
-	<copy todir="${hy.hdk}/build/make" overwrite="yes">
-            <fileset dir="${depends.build}">
-                <include name="**" />
-            </fileset>
-        </copy>
-    </target>
-	
-    <!-- ================================= 
-          target: clean-makefile-includes              
-         ================================= -->
-    <target name="clean-makefile-includes">
-	<!-- delete generic defines and rules -->
-	<delete dir="${hy.hdk}/build/make" />
-    </target>
-
-    <!-- ================================= 
-          target: clean-overlay-oss              
-         ================================= -->
-    <target name="clean-overlay-oss">
-        <poll-modules target="clean-overlay-oss" />
-    </target>
-
 </project>

Modified: harmony/enhanced/classlib/branches/java6/make/build-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/make/build-test.xml?rev=805197&r1=805196&r2=805197&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/make/build-test.xml (original)
+++ harmony/enhanced/classlib/branches/java6/make/build-test.xml Mon Aug 17 22:53:00 2009
@@ -40,6 +40,7 @@
             depends="process-empty, gen-report, check-test-result" />
 
     <target name="clean">
+        <poll-modules target="clean-test" />
         <delete dir="${tests.output}" />
         <delete dir="${tests.support.output}" />
         <delete dir="${hy.hdk}/build/test" />

Propchange: harmony/enhanced/classlib/branches/java6/make/depends-common.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug 17 22:53:00 2009
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/make/depends-common.xml:768152-803295
+/harmony/enhanced/classlib/trunk/make/depends-common.xml:768152-804992

Modified: harmony/enhanced/classlib/branches/java6/make/properties.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/make/properties.xml?rev=805197&r1=805196&r2=805197&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/make/properties.xml (original)
+++ harmony/enhanced/classlib/branches/java6/make/properties.xml Mon Aug 17 22:53:00 2009
@@ -574,6 +574,7 @@
     <macrodef name="make">
         <attribute name="dir" />
         <attribute name="target" default="" />
+        <element name="make-elements" optional="true" />
         <sequential>
             <echo>Making "@{target}" in @{dir}</echo>
             <exec failonerror="true"
@@ -592,6 +593,7 @@
                 <env key="HY_LINKLIB_SUFFIX" value="${linklib.suffix}" />
                 <arg line="${make.arg}" />
                 <arg line="@{target}" />
+                <make-elements />
             </exec>
         </sequential>
     </macrodef>

Modified: harmony/enhanced/classlib/branches/java6/modules/accessibility/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/accessibility/build.xml?rev=805197&r1=805196&r2=805197&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/accessibility/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/accessibility/build.xml Mon Aug 17 22:53:00 2009
@@ -41,13 +41,18 @@
     <!-- internal target for local and global test run sequence -->
     <target name="-test-module" depends="build, run-tests" />
 
-    <target name="clean">
+    <target name="clean" depends="clean-java,clean-test" />
+    
+    <target name="clean-java">
         <delete file="${hy.jdk}/jre/lib/boot/accessibility.jar" />
         <delete file="${hy.jdk}/jre/lib/boot/accessibility-src.jar" />
-        <delete dir="${tests.hdk.dir}" failonerror="false" />
         <delete failonerror="false">
             <fileset refid="classes" />
         </delete>
+    </target>
+
+    <target name="clean-test">
+        <delete dir="${tests.hdk.dir}" failonerror="false" />
         <delete failonerror="false" dir="bin"/>
     </target>
 

Modified: harmony/enhanced/classlib/branches/java6/modules/annotation/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/annotation/build.xml?rev=805197&r1=805196&r2=805197&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/annotation/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/annotation/build.xml Mon Aug 17 22:53:00 2009
@@ -41,13 +41,18 @@
     <!-- internal target for local and global test run sequence -->
     <target name="-test-module" depends="build, run-tests" />
 
-    <target name="clean">
+    <target name="clean" depends="clean-java,clean-test" />
+    
+    <target name="clean-java">
         <delete file="${hy.jdk}/jre/lib/boot/annotation.jar" />
         <delete file="${hy.jdk}/jre/lib/boot/annotation-src.jar" />
-        <delete dir="${tests.hdk.dir}" failonerror="false" />
         <delete failonerror="false">
             <fileset refid="classes" />
         </delete>
+    </target>
+
+    <target name="clean-test">
+        <delete dir="${tests.hdk.dir}" failonerror="false" />
         <delete failonerror="false" dir="bin"/>
     </target>
 

Modified: harmony/enhanced/classlib/branches/java6/modules/applet/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/applet/build.xml?rev=805197&r1=805196&r2=805197&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/applet/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/applet/build.xml Mon Aug 17 22:53:00 2009
@@ -41,13 +41,18 @@
     <!-- internal target for local and global test run sequence -->
     <target name="-test-module" depends="build, run-tests" />
 
-    <target name="clean">
+    <target name="clean" depends="clean-java,clean-test" />
+    
+    <target name="clean-java">
         <delete file="${hy.jdk}/jre/lib/boot/applet.jar" />
         <delete file="${hy.jdk}/jre/lib/boot/applet-src.jar" />
-        <delete dir="${tests.hdk.dir}" failonerror="false" />
         <delete failonerror="false">
             <fileset refid="classes" />
         </delete>
+    </target>
+
+    <target name="clean-test">
+        <delete dir="${tests.hdk.dir}" failonerror="false" />
         <delete failonerror="false" dir="bin"/>
     </target>
 

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=805197&r1=805196&r2=805197&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/archive/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/archive/build.xml Mon Aug 17 22:53:00 2009
@@ -29,6 +29,8 @@
 
     <target name="build" depends="compile-java, copy-resources, build-jar" />
     
+    <target name="clean" depends="clean-java,clean-native,clean-test" />
+
     <target name="copy-native-includes"
             depends="overlay-oss, copy-zipsup-include, copy-zlib-include" />
 
@@ -75,10 +77,6 @@
         <delete dir="src/main/native/zlib_dist_ascii" />
     </target>
     
-    <target name="clean-overlay-oss" unless="hy.skip.zlib" >
-        <delete dir="src/main/native/zlib_dist" quiet="true" />
-    </target>
-    
     <!-- Build native code -->
     <target name="build-native"
             depends="-build-native-zip,-build-native-zlib,-build-native-archive" />
@@ -121,25 +119,31 @@
         </copy>
     </target>
     
-    <!-- Clean natives -->
     <target name="clean-native"
-            depends="-clean-native-zip,-clean-native-zlib,-clean-native-archive"/>
+            depends="-clean-native-zip,-clean-native-zlib,clean-native-includes,clean-overlay-oss">
+        <make dir="src/main/native/archive/${hy.os.family}" target="clean" />
+    </target>
 
     <target name="-clean-native-zip" if="hy.skip.zip.api">
-        <make dir="src/main/native/zip/${hy.os.family}"
-              target="clean" />
+        <make dir="src/main/native/zip/${hy.os.family}" target="clean" />
     </target>
 
     <target name="-clean-native-zlib" unless="hy.skip.zlib">
-        <make dir="src/main/native/zlib/${hy.os.family}"
-              target="clean" />
+        <make dir="src/main/native/zlib/${hy.os.family}" target="clean" />
     </target>
 
-    <target name="-clean-native-archive">
-        <make dir="src/main/native/archive/${hy.os.family}"
-              target="clean" />
+    <target name="clean-native-includes">
+        <delete failonerror="false">
+            <fileset dir="${hy.hdk}/include">
+                <include name="zipsup.h" />
+            </fileset>
+        </delete>
     </target>
 
+    <target name="clean-overlay-oss" unless="hy.skip.zlib" >
+        <delete dir="src/main/native/zlib_dist" quiet="true" />
+    </target>
+    
     <target name="test" depends="-test-module">
         <fail message="Some tests failed">
             <condition>
@@ -154,22 +158,17 @@
     <!-- internal target for local and global test run sequence -->
     <target name="-test-module" depends="build, run-tests" />
 
-    <target name="clean" depends="clean-native-includes" >
+    <target name="clean-java">
         <delete file="${hy.jdk}/jre/lib/boot/archive.jar" />
         <delete file="${hy.jdk}/jre/lib/boot/archive-src.jar" />
-        <delete dir="${tests.hdk.dir}" failonerror="false" />
         <delete failonerror="false">
             <fileset refid="classes" />
         </delete>
-        <delete failonerror="false" dir="bin"/>
     </target>
 
-    <target name="clean-native-includes">
-        <delete failonerror="false">
-            <fileset dir="${hy.hdk}/include">
-                <include name="zipsup.h" />
-            </fileset>
-        </delete>
+    <target name="clean-test">
+        <delete dir="${tests.hdk.dir}" failonerror="false" />
+        <delete failonerror="false" dir="bin"/>
     </target>
 
     <target name="compile-java">

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=805197&r1=805196&r2=805197&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/auth/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/auth/build.xml Mon Aug 17 22:53:00 2009
@@ -28,6 +28,8 @@
 
     <target name="build" depends="compile-java, copy-resources, build-jar" />
 
+    <target name="clean" depends="clean-java,clean-native,clean-test" />
+
     <target name="test" depends="-test-module">
         <fail message="Some tests failed">
             <condition>
@@ -63,18 +65,20 @@
         </copy>
     </target>
     
-    <!-- Clean natives -->
-    <target name="clean-native">
-    <make dir="src/main/native/auth/${hy.os.family}" target="clean" />
-    </target>
-
-    <target name="clean">
+    <target name="clean-java">
         <delete file="${hy.jdk}/jre/lib/boot/auth.jar" />
         <delete file="${hy.jdk}/jre/lib/boot/auth-src.jar" />
-        <delete dir="${tests.hdk.dir}" failonerror="false" />
         <delete failonerror="false">
             <fileset refid="classes" />
         </delete>
+    </target>
+
+    <target name="clean-native">
+        <make dir="src/main/native/auth/${hy.os.family}" target="clean" />
+    </target>
+
+    <target name="clean-test">
+        <delete dir="${tests.hdk.dir}" failonerror="false" />
         <delete failonerror="false" dir="bin"/>
     </target>
 

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=805197&r1=805196&r2=805197&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/build.xml Mon Aug 17 22:53:00 2009
@@ -30,6 +30,8 @@
     <target name="build"
             depends="check-depends,compile-java, copy-resources, build-jar" />
 
+    <target name="clean" depends="clean-java,clean-native,clean-test" />
+
     <target name="check-depends" depends="-check-depends,-extract" />
 
     <target name="-check-depends"
@@ -146,15 +148,18 @@
     <!-- internal target for local and global test run sequence -->
     <target name="-test-module" depends="build, run-tests" />
 
-    <target name="clean">
+    <target name="clean-java">
         <delete file="${hy.jdk}/jre/lib/boot/awt.jar" />
         <delete file="${hy.jdk}/jre/lib/boot/awt-src.jar" />    
-        <delete dir="${tests.hdk.dir}" failonerror="false" />
         <delete dir="${hy.jdk}/jre/lib/cmm" quiet="true" />
         <delete dir="${hy.jdk}/jre/lib/fonts" quiet="true" />
         <delete failonerror="false">
             <fileset refid="classes" />
         </delete>
+    </target>
+
+    <target name="clean-test">
+        <delete dir="${tests.hdk.dir}" failonerror="false" />
         <delete failonerror="false" dir="bin"/>
     </target>
 
@@ -246,7 +251,12 @@
         depends="-build-native-common,-build-native-unix,-build-native-windows" />
         
     <target name="-build-native-common">
-        <make dir="src/main/native/lcmm/${hy.os.family}" />
+        <make dir="src/main/native/lcmm/${hy.os.family}">
+            <make-elements>
+                <env key="HY_LCMS_VER" value="${lcms.ver}" />
+            </make-elements>
+        </make>
+
         <!-- Copy the built shared libs over to the jre/bin dir -->
         <copy todir="${hy.jdk}/jre/bin" overwrite="yes">
             <fileset dir="src/main/native/lcmm">
@@ -262,7 +272,11 @@
             </fileset>
         </copy>
 
-        <make dir="src/main/native/jpegdecoder/${hy.os.family}" />
+        <make dir="src/main/native/jpegdecoder/${hy.os.family}">
+            <make-elements>
+                <env key="HY_JPEG_VER" value="${jpeg.ver}" />
+            </make-elements>
+        </make>
         <!-- Copy the built shared libs over to the jre/bin dir -->
         <copy todir="${hy.jdk}/jre/bin" overwrite="yes">
             <fileset dir="src/main/native/jpegdecoder">
@@ -278,7 +292,12 @@
             </fileset>
         </copy>
 
-        <make dir="src/main/native/gl/${hy.os.family}" />
+        <make dir="src/main/native/gl/${hy.os.family}">
+            <make-elements>
+                <env key="HY_PNG_VER" value="${png.ver}" />
+            </make-elements>
+        </make>
+
         <!-- Copy the built shared libs over to the jre/bin dir -->
         <copy todir="${hy.jdk}/jre/bin" overwrite="yes">
             <fileset dir="src/main/native/gl">

Modified: harmony/enhanced/classlib/branches/java6/modules/awt/make/depends.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/make/depends.properties?rev=805197&r1=805196&r2=805197&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/make/depends.properties (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/make/depends.properties Mon Aug 17 22:53:00 2009
@@ -30,18 +30,20 @@
 jpeg.md5@x86@=610ebc3e6a9f93c9ac9d9261b3fe6611
 jpeg.md5@x86_64@=132fe7221ba3e5c3aa96b851a42ef2a4
 
-lcms.ver=1.15
+lcms.ver@x86@=1.18
+lcms.ver@x86_64@=1.15
 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@=e66de19d497ffe66e6d50f75c95e683e
+lcms.md5@x86@=85cf182f4bf93c9fabe0ddd9fc396a8a
 lcms.md5@x86_64@=e23282246ba9e1cf8b32c52d7fe97c78
 
-png.ver=1.2.12
+png.ver@x86@=1.2.38
+png.ver@x86_64@=1.2.12
 png.dir=${depends.lib.dir}/png-${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@=11df6f62db3ac490ae1cabf753c2773c
+png.md5@x86@=d7cc20b44f12b4e46da29ed6cccbcba5
 png.md5@x86_64@=b562d8042aeb71d877cfd10518d019bc

Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/gl/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/gl/windows/makefile?rev=805197&r1=805196&r2=805197&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/gl/windows/makefile (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/gl/windows/makefile Mon Aug 17 22:53:00 2009
@@ -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-1.2.12\# avoid continuation
+PNG_DIR=$(HY_HDK)\..\depends\libs\$(HY_PLATFORM)\png-$(HY_PNG_VER)\# avoid continuation
 
 LIBBASE=gl
 DLLNAME=..\$(LIBBASE).dll

Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/jpegdecoder/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/jpegdecoder/windows/makefile?rev=805197&r1=805196&r2=805197&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/jpegdecoder/windows/makefile (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/jpegdecoder/windows/makefile Mon Aug 17 22:53:00 2009
@@ -15,7 +15,7 @@
 
 !include <$(HY_HDK)\build\make\defines.mak>
 
-JPEG_DIR=$(HY_HDK)\..\depends\libs\$(HY_PLATFORM)\jpeg-6b\# avoid continuation
+JPEG_DIR=$(HY_HDK)\..\depends\libs\$(HY_PLATFORM)\jpeg-$(HY_JPEG_VER)\# avoid continuation
 
 LIBBASE=jpegdecoder
 DLLNAME=..\$(LIBBASE).dll

Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/lcmm/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/lcmm/windows/makefile?rev=805197&r1=805196&r2=805197&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/lcmm/windows/makefile (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/lcmm/windows/makefile Mon Aug 17 22:53:00 2009
@@ -15,7 +15,7 @@
 
 !include <$(HY_HDK)\build\make\defines.mak>
 
-LCMS_DIR=$(HY_HDK)\..\depends\libs\$(HY_PLATFORM)\lcms-1.15\# avoid continuation
+LCMS_DIR=$(HY_HDK)\..\depends\libs\$(HY_PLATFORM)\lcms-$(HY_LCMS_VER)\# avoid continuation
 
 LIBBASE=lcmm
 DLLNAME=..\$(LIBBASE).dll

Modified: harmony/enhanced/classlib/branches/java6/modules/beans/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/beans/build.xml?rev=805197&r1=805196&r2=805197&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/beans/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/beans/build.xml Mon Aug 17 22:53:00 2009
@@ -41,13 +41,18 @@
     <!-- internal target for local and global test run sequence -->
     <target name="-test-module" depends="build, run-tests" />
 
-    <target name="clean">
+    <target name="clean" depends="clean-java,clean-test" />
+    
+    <target name="clean-java">
         <delete file="${hy.jdk}/jre/lib/boot/beans.jar" />
         <delete file="${hy.jdk}/jre/lib/boot/beans-src.jar" />
-        <delete dir="${tests.hdk.dir}" failonerror="false" />
         <delete failonerror="false">
             <fileset refid="classes" />
         </delete>
+    </target>
+
+    <target name="clean-test">
+        <delete dir="${tests.hdk.dir}" failonerror="false" />
         <delete failonerror="false" dir="bin"/>
     </target>
 

Modified: harmony/enhanced/classlib/branches/java6/modules/concurrent/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/concurrent/build.xml?rev=805197&r1=805196&r2=805197&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/concurrent/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/concurrent/build.xml Mon Aug 17 22:53:00 2009
@@ -41,13 +41,18 @@
     <!-- internal target for local and global test run sequence -->
     <target name="-test-module" depends="build, run-tests" />
 
-    <target name="clean">
+    <target name="clean" depends="clean-java,clean-test" />
+    
+    <target name="clean-java">
         <delete file="${hy.jdk}/jre/lib/boot/concurrent.jar" />
         <delete file="${hy.jdk}/jre/lib/boot/concurrent-src.jar" />
-        <delete dir="${tests.hdk.dir}" failonerror="false" />
         <delete failonerror="false">
             <fileset refid="classes" />
         </delete>
+    </target>
+
+    <target name="clean-test">
+        <delete dir="${tests.hdk.dir}" failonerror="false" />
         <delete failonerror="false" dir="bin"/>
     </target>
 

Propchange: harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/atomic/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug 17 22:53:00 2009
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/atomic:765923-803295
+/harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/atomic:765923-804992

Propchange: harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/locks/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug 17 22:53:00 2009
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/locks:765923-803295
+/harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/locks:765923-804992

Modified: harmony/enhanced/classlib/branches/java6/modules/crypto/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/crypto/build.xml?rev=805197&r1=805196&r2=805197&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/crypto/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/crypto/build.xml Mon Aug 17 22:53:00 2009
@@ -41,13 +41,18 @@
     <!-- internal target for local and global test run sequence -->
     <target name="-test-module" depends="build, run-tests" />
 
-    <target name="clean">
+    <target name="clean" depends="clean-java,clean-test" />
+    
+    <target name="clean-java">
         <delete file="${hy.jdk}/jre/lib/boot/crypto.jar" />
         <delete file="${hy.jdk}/jre/lib/boot/crypto-src.jar" />
-        <delete dir="${tests.hdk.dir}" failonerror="false" />
         <delete failonerror="false">
             <fileset refid="classes" />
         </delete>
+    </target>
+
+    <target name="clean-test">
+        <delete dir="${tests.hdk.dir}" failonerror="false" />
         <delete failonerror="false" dir="bin"/>
     </target>
 

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=805197&r1=805196&r2=805197&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/imageio/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/imageio/build.xml Mon Aug 17 22:53:00 2009
@@ -30,6 +30,8 @@
     <target name="build"
             depends="check-depends,compile-java,copy-resources,build-jar" />
 
+    <target name="clean" depends="clean-java,clean-native,clean-test" />
+
     <target name="check-depends"
             depends="-check-win-depends,-check-unix-depends" />
 
@@ -103,21 +105,22 @@
     <!-- internal target for local and global test run sequence -->
     <target name="-test-module" depends="build, run-tests" />
 
-    <target name="clean">
+    <target name="clean-java">
         <delete file="${hy.jdk}/jre/lib/boot/imageio.jar" />
 	<delete file="${hy.jdk}/jre/lib/boot/imageio-src.jar" />
-        <delete dir="${tests.hdk.dir}" failonerror="false" />
         <delete failonerror="false">
             <fileset refid="classes" />
         </delete>
-        <delete failonerror="false" dir="bin"/>
     </target>
 
     <target name="clean-native">
-        <make dir="src/main/native/jpegencoder/${hy.os.family}"
-              target="clean" />
-        <make dir="src/main/native/pngencoder/${hy.os.family}"
-              target="clean" />
+        <make dir="src/main/native/jpegencoder/${hy.os.family}" target="clean"/>
+        <make dir="src/main/native/pngencoder/${hy.os.family}" target="clean" />
+    </target>
+
+    <target name="clean-test">
+        <delete dir="${tests.hdk.dir}" failonerror="false" />
+        <delete failonerror="false" dir="bin"/>
     </target>
 
     <target name="compile-java">
@@ -146,7 +149,11 @@
     
     <target name="build-native" depends="build-native-all" />
     <target name="build-native-all" >
-        <make dir="src/main/native/jpegencoder/${hy.os.family}" />
+        <make dir="src/main/native/jpegencoder/${hy.os.family}">
+            <make-elements>
+                <env key="HY_JPEG_VER" value="${jpeg.ver}" />
+            </make-elements>
+        </make>
         <!-- Copy the built shared libs over to the jre/bin dir -->
         <copy todir="${hy.jdk}/jre/bin" overwrite="yes">
             <fileset dir="src/main/native/jpegencoder/">
@@ -162,7 +169,11 @@
             </fileset>
         </copy>
 
-        <make dir="src/main/native/pngencoder/${hy.os.family}" />
+        <make dir="src/main/native/pngencoder/${hy.os.family}">
+            <make-elements>
+                <env key="HY_PNG_VER" value="${png.ver}" />
+            </make-elements>
+        </make>
         <!-- Copy the built shared libs over to the jre/bin dir -->
         <copy todir="${hy.jdk}/jre/bin" overwrite="yes">
             <fileset dir="src/main/native/pngencoder/">

Modified: harmony/enhanced/classlib/branches/java6/modules/imageio/make/depends.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/imageio/make/depends.properties?rev=805197&r1=805196&r2=805197&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/imageio/make/depends.properties (original)
+++ harmony/enhanced/classlib/branches/java6/modules/imageio/make/depends.properties Mon Aug 17 22:53:00 2009
@@ -24,10 +24,11 @@
 jpeg.md5@x86@=610ebc3e6a9f93c9ac9d9261b3fe6611
 jpeg.md5@x86_64@=132fe7221ba3e5c3aa96b851a42ef2a4
 
-png.ver=1.2.12
+png.ver@x86@=1.2.38
+png.ver@x86_64@=1.2.12
 png.dir=${depends.lib.dir}/png-${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@=11df6f62db3ac490ae1cabf753c2773c
+png.md5@x86@=d7cc20b44f12b4e46da29ed6cccbcba5
 png.md5@x86_64@=b562d8042aeb71d877cfd10518d019bc

Modified: harmony/enhanced/classlib/branches/java6/modules/imageio/src/main/native/jpegencoder/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/imageio/src/main/native/jpegencoder/windows/makefile?rev=805197&r1=805196&r2=805197&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/imageio/src/main/native/jpegencoder/windows/makefile (original)
+++ harmony/enhanced/classlib/branches/java6/modules/imageio/src/main/native/jpegencoder/windows/makefile Mon Aug 17 22:53:00 2009
@@ -15,7 +15,7 @@
 
 !include <$(HY_HDK)\build\make\defines.mak>
 
-JPEG_DIR=$(HY_HDK)\..\depends\libs\$(HY_PLATFORM)\jpeg-6b\# avoid continuation
+JPEG_DIR=$(HY_HDK)\..\depends\libs\$(HY_PLATFORM)\jpeg-$(HY_JPEG_VER)\# avoid continuation
 
 LIBBASE=jpegencoder
 DLLNAME=..\$(LIBBASE).dll

Modified: harmony/enhanced/classlib/branches/java6/modules/imageio/src/main/native/pngencoder/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/imageio/src/main/native/pngencoder/windows/makefile?rev=805197&r1=805196&r2=805197&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/imageio/src/main/native/pngencoder/windows/makefile (original)
+++ harmony/enhanced/classlib/branches/java6/modules/imageio/src/main/native/pngencoder/windows/makefile Mon Aug 17 22:53:00 2009
@@ -15,7 +15,7 @@
 
 !include <$(HY_HDK)\build\make\defines.mak>
 
-PNG_DIR=$(HY_HDK)\..\depends\libs\$(HY_PLATFORM)\png-1.2.12\# avoid continuation
+PNG_DIR=$(HY_HDK)\..\depends\libs\$(HY_PLATFORM)\png-$(HY_PNG_VER)\# avoid continuation
 
 LIBBASE=pngencoder
 DLLNAME=..\$(LIBBASE).dll

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=805197&r1=805196&r2=805197&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/instrument/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/instrument/build.xml Mon Aug 17 22:53:00 2009
@@ -27,6 +27,8 @@
 
     <target name="build" depends="compile-java, copy-resources, build-jar" />
 
+    <target name="clean" depends="clean-java,clean-native,clean-test" />
+
     <target name="test" depends="-test-module">
         <fail message="Some tests failed">
             <condition>
@@ -62,18 +64,20 @@
         </copy>
     </target>
     
-    <!-- Clean natives -->
-    <target name="clean-native">
-        <make dir="src/main/native/instrument/${hy.os.family}" target="clean" />
-    </target>
-
-    <target name="clean">
+    <target name="clean-java">
         <delete file="${hy.jdk}/jre/lib/boot/instrument.jar" />
         <delete file="${hy.jdk}/jre/lib/boot/instrument-src.jar" />
-        <delete dir="${tests.hdk.dir}" failonerror="false" />
         <delete failonerror="false">
             <fileset refid="classes" />
         </delete>
+    </target>
+
+    <target name="clean-native">
+        <make dir="src/main/native/instrument/${hy.os.family}" target="clean" />
+    </target>
+
+    <target name="clean-test">
+        <delete dir="${tests.hdk.dir}" failonerror="false" />
         <delete failonerror="false" dir="bin"/>
     </target>
 

Propchange: harmony/enhanced/classlib/branches/java6/modules/jmx/META-INF/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug 17 22:53:00 2009
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/jmx/META-INF:768152-803295
+/harmony/enhanced/classlib/trunk/modules/jmx/META-INF:768152-804992

Modified: harmony/enhanced/classlib/branches/java6/modules/jmx/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/jmx/build.xml?rev=805197&r1=805196&r2=805197&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/jmx/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/jmx/build.xml Mon Aug 17 22:53:00 2009
@@ -29,6 +29,8 @@
 
     <target name="build" depends="check-depends" />
 
+    <target name="clean" depends="clean-java" />
+
     <target name="check-depends" depends="-check,-extract,-copy-jars" />
 
     <target name="-check">
@@ -87,7 +89,7 @@
 
     <target name="test" />
 
-    <target name="clean">
+    <target name="clean-java">
         <delete dir="${hy.jdk}/jre/lib/boot/mx4j_${mx4j.version}" />
     </target>
 

Modified: harmony/enhanced/classlib/branches/java6/modules/jndi/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/jndi/build.xml?rev=805197&r1=805196&r2=805197&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/jndi/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/jndi/build.xml Mon Aug 17 22:53:00 2009
@@ -41,13 +41,18 @@
     <!-- internal target for local and global test run sequence -->
     <target name="-test-module" depends="build, run-tests" />
 
-    <target name="clean">
+    <target name="clean" depends="clean-java,clean-test" />
+    
+    <target name="clean-java">
         <delete file="${hy.jdk}/jre/lib/boot/jndi.jar" />
         <delete file="${hy.jdk}/jre/lib/boot/jndi-src.jar" />
-        <delete dir="${tests.hdk.dir}" failonerror="false" />
         <delete failonerror="false">
             <fileset refid="classes" />
         </delete>
+    </target>
+
+    <target name="clean-test">
+        <delete dir="${tests.hdk.dir}" failonerror="false" />
         <delete failonerror="false" dir="bin"/>
     </target>
 

Modified: harmony/enhanced/classlib/branches/java6/modules/lang-management/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/lang-management/build.xml?rev=805197&r1=805196&r2=805197&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/lang-management/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/lang-management/build.xml Mon Aug 17 22:53:00 2009
@@ -41,13 +41,18 @@
     <!-- internal target for local and global test run sequence -->
     <target name="-test-module" depends="build, run-tests" />
 
-    <target name="clean">
+    <target name="clean" depends="clean-java,clean-test" />
+    
+    <target name="clean-java">
         <delete file="${hy.jdk}/jre/lib/boot/lang-management.jar" />
         <delete file="${hy.jdk}/jre/lib/boot/lang-management-src.jar" />
-        <delete dir="${tests.hdk.dir}" failonerror="false" />
         <delete failonerror="false">
             <fileset refid="classes" />
         </delete>
+    </target>
+
+    <target name="clean-test">
+        <delete dir="${tests.hdk.dir}" failonerror="false" />
         <delete failonerror="false" dir="bin"/>
     </target>
 

Propchange: harmony/enhanced/classlib/branches/java6/modules/lang-management/src/test/api/java/org/apache/harmony/lang/management/tests/java/util/logging/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug 17 22:53:00 2009
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/lang-management/src/test/api/java/org/apache/harmony/lang/management/tests/java/util/logging:768152-803295
+/harmony/enhanced/classlib/trunk/modules/lang-management/src/test/api/java/org/apache/harmony/lang/management/tests/java/util/logging:768152-804992

Modified: harmony/enhanced/classlib/branches/java6/modules/logging/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/logging/build.xml?rev=805197&r1=805196&r2=805197&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/logging/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/logging/build.xml Mon Aug 17 22:53:00 2009
@@ -41,13 +41,18 @@
     <!-- internal target for local and global test run sequence -->
     <target name="-test-module" depends="build, run-tests" />
 
-    <target name="clean">
+    <target name="clean" depends="clean-java,clean-test" />
+    
+    <target name="clean-java">
         <delete file="${hy.jdk}/jre/lib/boot/logging.jar" />
         <delete file="${hy.jdk}/jre/lib/boot/logging-src.jar" />
-        <delete dir="${tests.hdk.dir}" failonerror="false" />
         <delete failonerror="false">
             <fileset refid="classes" />
         </delete>
+    </target>
+
+    <target name="clean-test">
+        <delete dir="${tests.hdk.dir}" failonerror="false" />
         <delete failonerror="false" dir="bin"/>
     </target>
 

Modified: harmony/enhanced/classlib/branches/java6/modules/luni-kernel/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/luni-kernel/build.xml?rev=805197&r1=805196&r2=805197&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni-kernel/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni-kernel/build.xml Mon Aug 17 22:53:00 2009
@@ -48,7 +48,9 @@
         </jar>
     </target>
 
-    <target name="clean">
+    <target name="clean" depends="clean-java" />
+
+    <target name="clean-java">
         <delete file="${stub.jar}" />
         <delete failonerror="false">
             <fileset refid="classes" />

Modified: harmony/enhanced/classlib/branches/java6/modules/luni/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/luni/build.xml?rev=805197&r1=805196&r2=805197&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni/build.xml Mon Aug 17 22:53:00 2009
@@ -29,6 +29,8 @@
 
     <target name="build" depends="compile-java, copy-resources, build-jar" />
 
+    <target name="clean" depends="clean-java,clean-native,clean-test" />
+
     <target name="copy-native-includes">
         <copy todir="${hy.hdk}/include" overwrite="yes">
             <fileset dir="src/main/native/include">
@@ -156,23 +158,6 @@
         <delete dir="src/main/native/fdlibm_dist_ascii" />
     </target>
 
-    <!-- Clean overlaid OSS packages -->
-    <target name="clean-overlay-oss" >
-        <delete dir="src/main/native/fdlibm_dist" quiet="true" />
-    </target>
-
-    <!-- Clean natives -->
-    <target name="clean-native">
-        <make dir="src/main/native/fdlibm/${hy.os.family}" target="clean" />
-        <make dir="src/main/native/vmi/${hy.os.family}" target="clean" />
-        <make dir="src/main/native/luni/${hy.os.family}" target="clean" />
-        <make dir="src/main/native/vmls/${hy.os.family}" target="clean" />
-        <make dir="src/main/native/hyzip/${hy.os.family}"
-              target="clean" />
-        <make dir="src/main/native/launcher/${hy.os.family}"
-              target="clean" />
-    </target>
-
     <target name="test" depends="-test-module">
         <fail message="Some tests failed">
             <condition>
@@ -187,14 +172,22 @@
     <!-- internal target for local and global test run sequence -->
     <target name="-test-module" depends="build, test-jar, run-tests" />
 
-    <target name="clean" depends="clean-native-includes" >
+    <target name="clean-java">
         <delete file="${hy.jdk}/jre/lib/boot/luni.jar" />
         <delete file="${hy.jdk}/jre/lib/boot/luni-src.jar" />
-        <delete dir="${tests.hdk.dir}" failonerror="false" />
         <delete failonerror="false">
             <fileset refid="classes" />
         </delete>
-        <delete failonerror="false" dir="bin"/>
+    </target>
+
+    <target name="clean-native"
+            depends="clean-native-includes,clean-overlay-oss">
+        <make dir="src/main/native/fdlibm/${hy.os.family}" target="clean" />
+        <make dir="src/main/native/vmi/${hy.os.family}" target="clean" />
+        <make dir="src/main/native/luni/${hy.os.family}" target="clean" />
+        <make dir="src/main/native/vmls/${hy.os.family}" target="clean" />
+        <make dir="src/main/native/hyzip/${hy.os.family}" target="clean" />
+        <make dir="src/main/native/launcher/${hy.os.family}" target="clean" />
     </target>
 
     <target name="clean-native-includes">
@@ -218,6 +211,16 @@
         </delete>
     </target>
 
+    <!-- Clean overlaid OSS packages -->
+    <target name="clean-overlay-oss" >
+        <delete dir="src/main/native/fdlibm_dist" quiet="true" />
+    </target>
+
+    <target name="clean-test">
+        <delete dir="${tests.hdk.dir}" failonerror="false" />
+        <delete failonerror="false" dir="bin"/>
+    </target>
+
     <target name="compile-java">
         <echo message="Compiling LUNI classes" />
 

Propchange: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/fdlibm.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug 17 22:53:00 2009
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/fdlibm.h:803062-803295
+/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/fdlibm.h:803062-804992

Propchange: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/gp.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug 17 22:53:00 2009
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/gp.h:803062-803295
+/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/gp.h:803062-804992

Propchange: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/hymagic.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug 17 22:53:00 2009
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/hymagic.h:803062-803295
+/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/hymagic.h:803062-804992

Propchange: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/hysocket.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug 17 22:53:00 2009
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/hysocket.h:803062-803295
+/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/hysocket.h:803062-804992

Propchange: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/hyvmls.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug 17 22:53:00 2009
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/hyvmls.h:803062-803295
+/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/hyvmls.h:803062-804992

Propchange: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/jni.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug 17 22:53:00 2009
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/jni.h:803062-803295
+/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/jni.h:803062-804992

Propchange: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/jni_types.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug 17 22:53:00 2009
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/jni_types.h:803062-803295
+/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/jni_types.h:803062-804992

Propchange: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/jvmpi.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug 17 22:53:00 2009
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/jvmpi.h:803062-803295
+/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/jvmpi.h:803062-804992

Propchange: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/jvmri.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug 17 22:53:00 2009
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/jvmri.h:803062-803295
+/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/jvmri.h:803062-804992

Propchange: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/jvmti.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug 17 22:53:00 2009
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/jvmti.h:803062-803295
+/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/jvmti.h:803062-804992

Propchange: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/jvmti_types.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug 17 22:53:00 2009
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/jvmti_types.h:803062-803295
+/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/jvmti_types.h:803062-804992

Propchange: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/vmi.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug 17 22:53:00 2009
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/vmi.h:803062-803295
+/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/vmi.h:803062-804992

Propchange: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/vmizip.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug 17 22:53:00 2009
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/vmizip.h:803062-803295
+/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/vmizip.h:803062-804992

Modified: harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/lang/ClassLoaderTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/lang/ClassLoaderTest.java?rev=805197&r1=805196&r2=805197&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/lang/ClassLoaderTest.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/lang/ClassLoaderTest.java Mon Aug 17 22:53:00 2009
@@ -17,8 +17,6 @@
 
 package org.apache.harmony.luni.tests.java.lang;
 
-import java.io.File;
-import java.io.FileOutputStream;
 import java.io.InputStream;
 import java.security.CodeSource;
 import java.security.Permission;
@@ -26,6 +24,7 @@
 import java.security.Policy;
 import java.security.ProtectionDomain;
 import java.security.SecurityPermission;
+
 import junit.framework.TestCase;
 
 public class ClassLoaderTest extends TestCase {
@@ -92,7 +91,8 @@
             0, 1, 0, 1, 0, 8, 0, 0, 0, 2,
             0, 9 };
 
-        protected Class findClass(String name) throws ClassNotFoundException {
+        @Override
+        protected Class<?> findClass(String name) throws ClassNotFoundException {
             try {
                 while (flag != 2) {
                     synchronized (lock) {
@@ -104,21 +104,21 @@
             if (name.equals("TestClass")) {
                 numFindClassCalled++;
                 return defineClass(null, classData, 0, classData.length);
-            } else {
-                throw new ClassNotFoundException("Class " + name + " not found.");
             }
+            throw new ClassNotFoundException("Class " + name + " not found.");
         }
     }
     
     static class SyncLoadTestThread extends Thread {
         volatile boolean started;
         ClassLoader cl;
-        Class cls;
+        Class<?> cls;
         
         SyncLoadTestThread(ClassLoader cl) {
             this.cl = cl;
         }
         
+        @Override
         public void run() {
             try {
                 started = true;
@@ -259,8 +259,8 @@
     @SuppressWarnings("deprecation")
     public Class<?> define() throws Exception {
         Package p = getClass().getPackage();
-        String path = p == null ? "" : p.getName().replace('.', File.separatorChar)
-                + File.separator;
+        // Class loader paths use '/' character as separator
+        String path = p == null ? "" : p.getName().replace('.', '/') + '/';
         InputStream is = getResourceAsStream(path + "A.class");
         byte[] buf = new byte[512];
         int len = is.read(buf);

Modified: harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/URLConnectionTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/URLConnectionTest.java?rev=805197&r1=805196&r2=805197&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/URLConnectionTest.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/URLConnectionTest.java Mon Aug 17 22:53:00 2009
@@ -44,6 +44,8 @@
 import java.util.Map;
 import java.util.TimeZone;
 
+import org.apache.harmony.luni.util.Util;
+
 import tests.support.Support_Configuration;
 import tests.support.Support_HttpServer;
 import tests.support.Support_HttpServerSocket;
@@ -201,7 +203,7 @@
     public void test_getContent() throws IOException {
         byte[] ba = new byte[600];
         ((InputStream) uc.getContent()).read(ba, 0, 600);
-        String s = new String(ba);
+        String s = Util.toUTF8String(ba);
         assertTrue("Incorrect content returned",
                 s.indexOf("Hello OneHandler") > 0);
     }
@@ -608,7 +610,7 @@
         byte[] ba = new byte[600];
         is.read(ba, 0, 600);
         is.close();
-        String s = new String(ba);
+        String s = Util.toUTF8String(ba);
         assertTrue("Incorrect input stream read",
                 s.indexOf("Hello OneHandler") > 0);
 

Propchange: harmony/enhanced/classlib/branches/java6/modules/luni/src/test/resources/net.resources/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug 17 22:53:00 2009
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/luni/src/test/resources/net.resources:790472-803295
+/harmony/enhanced/classlib/trunk/modules/luni/src/test/resources/net.resources:790472-804992

Modified: harmony/enhanced/classlib/branches/java6/modules/math/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/math/build.xml?rev=805197&r1=805196&r2=805197&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/math/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/math/build.xml Mon Aug 17 22:53:00 2009
@@ -41,13 +41,18 @@
     <!-- internal target for local and global test run sequence -->
     <target name="-test-module" depends="build, run-tests" />
 
-    <target name="clean">
+    <target name="clean" depends="clean-java,clean-test" />
+    
+    <target name="clean-java">
         <delete file="${hy.jdk}/jre/lib/boot/math.jar" />
         <delete file="${hy.jdk}/jre/lib/boot/math-src.jar" />
-        <delete dir="${tests.hdk.dir}" failonerror="false" />
         <delete failonerror="false">
             <fileset refid="classes" />
         </delete>
+    </target>
+
+    <target name="clean-test">
+        <delete dir="${tests.hdk.dir}" failonerror="false" />
         <delete failonerror="false" dir="bin"/>
     </target>
 

Modified: harmony/enhanced/classlib/branches/java6/modules/nio/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/nio/build.xml?rev=805197&r1=805196&r2=805197&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/nio/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/nio/build.xml Mon Aug 17 22:53:00 2009
@@ -27,6 +27,8 @@
 
     <target name="build" depends="compile-java, copy-resources, build-jar" />
 
+    <target name="clean" depends="clean-java,clean-native,clean-test" />
+
     <target name="test" depends="-test-module">
         <fail message="Some tests failed">
             <condition>
@@ -62,20 +64,21 @@
         </copy>
     </target>
 
-    <target name="clean">
+    <target name="clean-java">
         <delete file="${hy.jdk}/jre/lib/boot/nio.jar" />
         <delete file="${hy.jdk}/jre/lib/boot/nio-src.jar" />
-        <delete dir="${tests.hdk.dir}" failonerror="false" />
         <delete includeemptydirs="true" failonerror="false">
             <fileset refid="classes" />
         </delete>
-        <delete failonerror="false" dir="bin" />
     </target>
 
-    <!-- Clean natives. -->
     <target name="clean-native">
-        <make dir="src/main/native/nio/${hy.os.family}"
-              target="clean" />
+        <make dir="src/main/native/nio/${hy.os.family}" target="clean" />
+    </target>
+
+    <target name="clean-test">
+        <delete dir="${tests.hdk.dir}" failonerror="false" />
+        <delete failonerror="false" dir="bin" />
     </target>
 
     <target name="compile-java">

Modified: harmony/enhanced/classlib/branches/java6/modules/nio_char/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/nio_char/build.xml?rev=805197&r1=805196&r2=805197&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/nio_char/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/nio_char/build.xml Mon Aug 17 22:53:00 2009
@@ -27,6 +27,8 @@
 
     <target name="build" depends="compile-java, copy-resources, build-jar" />
 
+    <target name="clean" depends="clean-java,clean-native,clean-test" />
+
     <!-- Build natives.-->
     <target name="build-native" depends="build-native-all" />
     <target name="build-native-all" >
@@ -55,19 +57,20 @@
     <!-- internal target for local and global test run sequence -->
     <target name="-test-module" depends="build, run-tests" />
 
-    <!-- Clean natives. -->
-    <target name="clean-native">
-        <make dir="src/main/native/niochar/${hy.os.family}"
-                      target="clean" />
-    </target>
-
-    <target name="clean">
+    <target name="clean-java">
         <delete file="${hy.jdk}/jre/lib/boot/nio_char.jar" />
         <delete file="${hy.jdk}/jre/lib/boot/nio_char-src.jar" />
-        <delete dir="${tests.hdk.dir}" failonerror="false" />
         <delete failonerror="false">
             <fileset refid="classes" />
         </delete>
+    </target>
+
+    <target name="clean-native">
+        <make dir="src/main/native/niochar/${hy.os.family}" target="clean" />
+    </target>
+
+    <target name="clean-test">
+        <delete dir="${tests.hdk.dir}" failonerror="false" />
         <delete failonerror="false" dir="bin"/>
     </target>
 

Modified: harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/java/org/apache/harmony/niochar/charset/additional/IBM037.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/java/org/apache/harmony/niochar/charset/additional/IBM037.java?rev=805197&r1=805196&r2=805197&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/java/org/apache/harmony/niochar/charset/additional/IBM037.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/java/org/apache/harmony/niochar/charset/additional/IBM037.java Mon Aug 17 22:53:00 2009
@@ -110,9 +110,9 @@
 		final static char[] arr = {
                 0x009C,0x0009,0x0086,0x007F,
                 0x0097,0x008D,0x008E,0x000B,0x000C,0x000D,0x000E,0x000F,
-                0x0010,0x0011,0x0012,0x0013,0x009D,0x0085,0x0008,0x0087,
+                0x0010,0x0011,0x0012,0x0013,0x009D,0x000A,0x0008,0x0087,
                 0x0018,0x0019,0x0092,0x008F,0x001C,0x001D,0x001E,0x001F,
-                0x0080,0x0081,0x0082,0x0083,0x0084,0x000A,0x0017,0x001B,
+                0x0080,0x0081,0x0082,0x0083,0x0084,0x0085,0x0017,0x001B,
                 0x0088,0x0089,0x008A,0x008B,0x008C,0x0005,0x0006,0x0007,
                 0x0090,0x0091,0x0016,0x0093,0x0094,0x0095,0x0096,0x0004,
                 0x0098,0x0099,0x009A,0x009B,0x0014,0x0015,0x009E,0x001A,
@@ -282,7 +282,7 @@
 
                 final static char arr[] = {
                  
-                0x00,0x01,0x02,0x03,0x37,0x2D,0x2E,0x2F,0x16,0x05,0x25,0x0B,0x0C,0x0D,0x0E,0x0F,
+                0x00,0x01,0x02,0x03,0x37,0x2D,0x2E,0x2F,0x16,0x05,0x15,0x0B,0x0C,0x0D,0x0E,0x0F,
                 0x10,0x11,0x12,0x13,0x3C,0x3D,0x32,0x26,0x18,0x19,0x3F,0x27,0x1C,0x1D,0x1E,0x1F,
                 0x40,0x5A,0x7F,0x7B,0x5B,0x6C,0x50,0x7D,0x4D,0x5D,0x5C,0x4E,0x6B,0x60,0x4B,0x61,
                 0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0x7A,0x5E,0x4C,0x7E,0x6E,0x6F,
@@ -290,7 +290,7 @@
                 0xD7,0xD8,0xD9,0xE2,0xE3,0xE4,0xE5,0xE6,0xE7,0xE8,0xE9,0xBA,0xE0,0xBB,0xB0,0x6D,
                 0x79,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x91,0x92,0x93,0x94,0x95,0x96,
                 0x97,0x98,0x99,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,0xA8,0xA9,0xC0,0x4F,0xD0,0xA1,0x07,
-                0x20,0x21,0x22,0x23,0x24,0x15,0x06,0x17,0x28,0x29,0x2A,0x2B,0x2C,0x09,0x0A,0x1B,
+                0x20,0x21,0x22,0x23,0x24,0x25,0x06,0x17,0x28,0x29,0x2A,0x2B,0x2C,0x09,0x0A,0x1B,
                 0x30,0x31,0x1A,0x33,0x34,0x35,0x36,0x08,0x38,0x39,0x3A,0x3B,0x04,0x14,0x3E,0xFF,
                 0x41,0xAA,0x4A,0xB1,0x9F,0xB2,0x6A,0xB5,0xBD,0xB4,0x9A,0x8A,0x5F,0xCA,0xAF,0xBC,
                 0x90,0x8F,0xEA,0xFA,0xBE,0xA0,0xB6,0xB3,0x9D,0xDA,0x9B,0x8B,0xB7,0xB8,0xB9,0xAB,

Modified: harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/native/niochar/shared/additional/IBM037.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/native/niochar/shared/additional/IBM037.c?rev=805197&r1=805196&r2=805197&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/native/niochar/shared/additional/IBM037.c (original)
+++ harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/native/niochar/shared/additional/IBM037.c Mon Aug 17 22:53:00 2009
@@ -24,7 +24,7 @@
 
     static jboolean table[] = {
       
-     0x00,0x01,0x02,0x03,0x37,0x2D,0x2E,0x2F,0x16,0x05,0x25,0x0B,0x0C,0x0D,0x0E,0x0F,
+     0x00,0x01,0x02,0x03,0x37,0x2D,0x2E,0x2F,0x16,0x05,0x15,0x0B,0x0C,0x0D,0x0E,0x0F,
      0x10,0x11,0x12,0x13,0x3C,0x3D,0x32,0x26,0x18,0x19,0x3F,0x27,0x1C,0x1D,0x1E,0x1F,
      0x40,0x5A,0x7F,0x7B,0x5B,0x6C,0x50,0x7D,0x4D,0x5D,0x5C,0x4E,0x6B,0x60,0x4B,0x61,
      0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0x7A,0x5E,0x4C,0x7E,0x6E,0x6F,
@@ -32,7 +32,7 @@
      0xD7,0xD8,0xD9,0xE2,0xE3,0xE4,0xE5,0xE6,0xE7,0xE8,0xE9,0xBA,0xE0,0xBB,0xB0,0x6D,
      0x79,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x91,0x92,0x93,0x94,0x95,0x96,
      0x97,0x98,0x99,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,0xA8,0xA9,0xC0,0x4F,0xD0,0xA1,0x07,
-     0x20,0x21,0x22,0x23,0x24,0x15,0x06,0x17,0x28,0x29,0x2A,0x2B,0x2C,0x09,0x0A,0x1B,
+     0x20,0x21,0x22,0x23,0x24,0x25,0x06,0x17,0x28,0x29,0x2A,0x2B,0x2C,0x09,0x0A,0x1B,
      0x30,0x31,0x1A,0x33,0x34,0x35,0x36,0x08,0x38,0x39,0x3A,0x3B,0x04,0x14,0x3E,0xFF,
      0x41,0xAA,0x4A,0xB1,0x9F,0xB2,0x6A,0xB5,0xBD,0xB4,0x9A,0x8A,0x5F,0xCA,0xAF,0xBC,
      0x90,0x8F,0xEA,0xFA,0xBE,0xA0,0xB6,0xB3,0x9D,0xDA,0x9B,0x8B,0xB7,0xB8,0xB9,0xAB,
@@ -122,9 +122,9 @@
     unsigned int table[] = {
      0x009C,0x0009,0x0086,0x007F,
      0x0097,0x008D,0x008E,0x000B,0x000C,0x000D,0x000E,0x000F,
-     0x0010,0x0011,0x0012,0x0013,0x009D,0x0085,0x0008,0x0087,
+     0x0010,0x0011,0x0012,0x0013,0x009D,0x000A,0x0008,0x0087,
      0x0018,0x0019,0x0092,0x008F,0x001C,0x001D,0x001E,0x001F,
-     0x0080,0x0081,0x0082,0x0083,0x0084,0x000A,0x0017,0x001B,
+     0x0080,0x0081,0x0082,0x0083,0x0084,0x0085,0x0017,0x001B,
      0x0088,0x0089,0x008A,0x008B,0x008C,0x0005,0x0006,0x0007,
      0x0090,0x0091,0x0016,0x0093,0x0094,0x0095,0x0096,0x0004,
      0x0098,0x0099,0x009A,0x009B,0x0014,0x0015,0x009E,0x001A,

Modified: harmony/enhanced/classlib/branches/java6/modules/nio_char/src/test/java/tests/api/java/nio/charset/CharsetProviderTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/nio_char/src/test/java/tests/api/java/nio/charset/CharsetProviderTest.java?rev=805197&r1=805196&r2=805197&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/nio_char/src/test/java/tests/api/java/nio/charset/CharsetProviderTest.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/nio_char/src/test/java/tests/api/java/nio/charset/CharsetProviderTest.java Mon Aug 17 22:53:00 2009
@@ -71,7 +71,7 @@
 		f.mkdirs();
         
 		FileOutputStream fos = new FileOutputStream(path);
-		OutputStreamWriter writer = new OutputStreamWriter(fos);// , "UTF-8");
+		OutputStreamWriter writer = new OutputStreamWriter(fos, "UTF-8");
 		try {
 			writer.write(content);
 		} finally {

Modified: harmony/enhanced/classlib/branches/java6/modules/orb/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/orb/build.xml?rev=805197&r1=805196&r2=805197&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/orb/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/orb/build.xml Mon Aug 17 22:53:00 2009
@@ -29,6 +29,8 @@
 
     <target name="build" depends="check-depends, -copy-jars" />
 
+    <target name="clean" depends="clean-java" />
+
     <target name="check-depends">
         <check-one-file src="${yoko.url}" dest="${yoko.jar}" />
         <check-one-file src="${yoko-core.url}" dest="${yoko-core.jar}" />
@@ -76,7 +78,7 @@
 
     <target name="test" />
 
-    <target name="clean">
+    <target name="clean-java">
         <delete dir="${hy.jdk}/jre/lib/boot/yoko-${yoko.version}" />
         <delete dir="${hy.jdk}/jre/lib/boot/bcel-${bcel.version}" />
     </target>

Modified: harmony/enhanced/classlib/branches/java6/modules/pack200/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/pack200/build.xml?rev=805197&r1=805196&r2=805197&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/pack200/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/pack200/build.xml Mon Aug 17 22:53:00 2009
@@ -61,13 +61,18 @@
     <!-- internal target for local and global test run sequence -->
     <target name="-test-module" depends="build, run-tests" />
 
-    <target name="clean">
+    <target name="clean" depends="clean-java,clean-test" />
+    
+    <target name="clean-java">
         <delete file="${hy.jdk}/jre/lib/boot/pack200.jar" />
         <delete file="${hy.jdk}/jre/lib/boot/pack200-src.jar" />
-        <delete dir="${tests.hdk.dir}" failonerror="false" />
         <delete failonerror="false">
             <fileset refid="classes" />
         </delete>
+    </target>
+
+    <target name="clean-test">
+        <delete dir="${tests.hdk.dir}" failonerror="false" />
         <delete failonerror="false" dir="bin"/>
     </target>
 

Propchange: harmony/enhanced/classlib/branches/java6/modules/pack200/depends/manifests/asm-3.1/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug 17 22:53:00 2009
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/pack200/depends/manifests/asm-3.1:785554-803295
+/harmony/enhanced/classlib/trunk/modules/pack200/depends/manifests/asm-3.1:785554-804992

Propchange: harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java5/org/apache/harmony/pack200/Pack200Adapter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug 17 22:53:00 2009
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java5/org/apache/harmony/pack200/Pack200Adapter.java:782694-803295
+/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java5/org/apache/harmony/pack200/Pack200Adapter.java:782694-804992

Propchange: harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java5/org/apache/harmony/pack200/Pack200PackerAdapter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug 17 22:53:00 2009
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java5/org/apache/harmony/pack200/Pack200PackerAdapter.java:782694-803295
+/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java5/org/apache/harmony/pack200/Pack200PackerAdapter.java:782694-804992

Modified: harmony/enhanced/classlib/branches/java6/modules/portlib/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/portlib/build.xml?rev=805197&r1=805196&r2=805197&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/portlib/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/portlib/build.xml Mon Aug 17 22:53:00 2009
@@ -36,6 +36,8 @@
 
     <target name="build" /> <!-- depends="compile-java, copy-resources, build-jar" -->
 
+    <target name="clean" depends="clean-native,clean-test" />
+
     <target name="test" depends="-test-module">
         <fail message="Some tests failed">
             <condition>
@@ -162,7 +164,7 @@
     </target>
 
     <!-- Clean natives -->
-    <target name="clean-native" depends="-clean-native-tests">
+    <target name="clean-native" depends="clean-native-includes">
         <make dir="src/main/native/thread/${hy.os.family}" target="clean" />
         <make dir="src/main/native/thrstub/${hy.os.family}" target="clean" />
         <make dir="src/main/native/port/${hy.os.family}" target="clean" />
@@ -170,8 +172,6 @@
         <make dir="src/main/native/pool/${hy.os.family}" target="clean" />
     </target>
 
-    <target name="clean" depends="clean-native-includes" />
-
     <target name="clean-native-includes">
         <delete failonerror="false">
             <fileset dir="${hy.hdk}/include">
@@ -244,7 +244,7 @@
         <antcall target="touch-errors-file" />
     </target>
 
-    <target name="-clean-native-tests" >
+    <target name="clean-test" >
         <make dir="src/test/native/init/${hy.os.family}" 
               target="clean" />
         <make dir="src/test/native/hycpu/${hy.os.family}" 

Modified: harmony/enhanced/classlib/branches/java6/modules/prefs/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/prefs/build.xml?rev=805197&r1=805196&r2=805197&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/prefs/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/prefs/build.xml Mon Aug 17 22:53:00 2009
@@ -29,6 +29,8 @@
 
     <target name="build" depends="compile-java, copy-resources, build-jar" />
 
+    <target name="clean" depends="clean-java,clean-native,clean-test" />
+
     <target name="test" depends="-test-module">
         <fail message="Some tests failed">
             <condition>
@@ -63,14 +65,12 @@
         </copy>
     </target>
 
-    <target name="clean">
+    <target name="clean-java">
         <delete file="${hy.jdk}/jre/lib/boot/prefs.jar" />
         <delete file="${hy.jdk}/jre/lib/boot/prefs-src.jar" />
-        <delete dir="${tests.hdk.dir}" failonerror="false" />
         <delete failonerror="false">
             <fileset refid="classes" />
         </delete>
-        <delete failonerror="false" dir="bin"/>
     </target>
 
     <!-- Clean natives. Currently there are only windows natives for
@@ -79,6 +79,11 @@
         <make dir="src/main/native/prefs/${hy.os.family}" target="clean" />
     </target>
 
+    <target name="clean-test">
+        <delete dir="${tests.hdk.dir}" failonerror="false" />
+        <delete failonerror="false" dir="bin"/>
+    </target>
+
     <target name="compile-java">
         <echo message="Compiling PREFS classes" />
 

Modified: harmony/enhanced/classlib/branches/java6/modules/print/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/print/build.xml?rev=805197&r1=805196&r2=805197&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/print/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/print/build.xml Mon Aug 17 22:53:00 2009
@@ -27,6 +27,8 @@
 
     <target name="build" depends="compile-java, copy-resources, build-jar" />
 
+    <target name="clean" depends="clean-java,clean-native,clean-test" />
+
     <target name="test" depends="-test-module">
         <fail message="Some tests failed">
             <condition>
@@ -41,19 +43,21 @@
     <!-- internal target for local and global test run sequence -->
     <target name="-test-module" depends="build, run-tests" />
 
-    <target name="clean">
+    <target name="clean-java">
         <delete file="${hy.jdk}/jre/lib/boot/print.jar" />
         <delete file="${hy.jdk}/jre/lib/boot/print-src.jar" />
-        <delete dir="${tests.hdk.dir}" failonerror="false" />
         <delete failonerror="false">
             <fileset refid="classes" />
         </delete>
-        <delete failonerror="false" dir="bin"/>
     </target>
 
     <target name="clean-native" if="is.windows">
-        <make dir="src/main/native/print/${hy.os.family}"
-              target="clean" />
+        <make dir="src/main/native/print/${hy.os.family}" target="clean" />
+    </target>
+
+    <target name="clean-test">
+        <delete dir="${tests.hdk.dir}" failonerror="false" />
+        <delete failonerror="false" dir="bin"/>
     </target>
 
     <target name="compile-java">

Modified: harmony/enhanced/classlib/branches/java6/modules/regex/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/regex/build.xml?rev=805197&r1=805196&r2=805197&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/regex/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/regex/build.xml Mon Aug 17 22:53:00 2009
@@ -41,13 +41,18 @@
     <!-- internal target for local and global test run sequence -->
     <target name="-test-module" depends="build, run-tests" />
 
-    <target name="clean">
+    <target name="clean" depends="clean-java,clean-test" />
+    
+    <target name="clean-java">
         <delete file="${hy.jdk}/jre/lib/boot/regex.jar" />
         <delete file="${hy.jdk}/jre/lib/boot/regex-src.jar" />
-        <delete dir="${tests.hdk.dir}" failonerror="false" />
         <delete failonerror="false">
             <fileset refid="classes" />
         </delete>
+    </target>
+
+    <target name="clean-test">
+        <delete dir="${tests.hdk.dir}" failonerror="false" />
         <delete failonerror="false" dir="bin"/>
     </target>
 

Modified: harmony/enhanced/classlib/branches/java6/modules/rmi/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/rmi/build.xml?rev=805197&r1=805196&r2=805197&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/rmi/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/rmi/build.xml Mon Aug 17 22:53:00 2009
@@ -41,13 +41,18 @@
     <!-- internal target for local and global test run sequence -->
     <target name="-test-module" depends="build, run-tests" />
 
-    <target name="clean">
+    <target name="clean" depends="clean-java,clean-test" />
+    
+    <target name="clean-java">
         <delete file="${hy.jdk}/jre/lib/boot/rmi.jar" />
         <delete file="${hy.jdk}/jre/lib/boot/rmi-src.jar" />
-        <delete dir="${tests.hdk.dir}" failonerror="false" />
         <delete failonerror="false">
             <fileset refid="classes" />
         </delete>
+    </target>
+
+    <target name="clean-test">
+        <delete dir="${tests.hdk.dir}" failonerror="false" />
         <delete failonerror="false" dir="bin"/>
     </target>
 

Modified: harmony/enhanced/classlib/branches/java6/modules/security-kernel/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/security-kernel/build.xml?rev=805197&r1=805196&r2=805197&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/security-kernel/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/security-kernel/build.xml Mon Aug 17 22:53:00 2009
@@ -48,7 +48,9 @@
         </jar>
     </target>
 
-    <target name="clean">
+    <target name="clean" depends="clean-java" />
+
+    <target name="clean-java">
         <delete file="${stub.jar}" />
         <delete failonerror="false">
             <fileset refid="classes" />



Mime
View raw message