harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r926361 [1/2] - in /harmony/enhanced/classlib/branches/java6: ./ depends/libs/ make/ modules/accessibility/ modules/annotation/ modules/applet/ modules/archive/ modules/auth/ modules/awt/ modules/awt/src/main/java/common/java/awt/ modules/a...
Date Mon, 22 Mar 2010 21:46:11 GMT
Author: hindessm
Date: Mon Mar 22 21:46:10 2010
New Revision: 926361

URL: http://svn.apache.org/viewvc?rev=926361&view=rev
Log:
Merge updates from classlib trunk@926091.

Modified:
    harmony/enhanced/classlib/branches/java6/   (props changed)
    harmony/enhanced/classlib/branches/java6/depends/libs/   (props changed)
    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/src/main/java/common/java/awt/Toolkit.java
    harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/datatransfer/DTK.java
    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/instrument/build.xml
    harmony/enhanced/classlib/branches/java6/modules/jmx/META-INF/   (props changed)
    harmony/enhanced/classlib/branches/java6/modules/jndi/build.xml
    harmony/enhanced/classlib/branches/java6/modules/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/src/main/java/java/lang/Runtime.java
    harmony/enhanced/classlib/branches/java6/modules/luni-kernel/src/main/java/java/lang/System.java
    harmony/enhanced/classlib/branches/java6/modules/luni-kernel/src/main/java/java/lang/ThreadGroup.java
    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/main/native/luni/unix/OSNetworkSystemLinux.c
    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/misc/build.xml
    harmony/enhanced/classlib/branches/java6/modules/misc/src/main/java/org/apache/harmony/misc/SystemUtils.java
    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/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/portlib/src/main/native/port/shared/hystr.c
    harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/port/unix/hyshmem.c
    harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/port/unix/hysock.c
    harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/port/windows/hysock.c
    harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/thread/shared/hythread.c
    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/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/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

Propchange: harmony/enhanced/classlib/branches/java6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Mar 22 21:46:10 2010
@@ -1,4 +1,4 @@
-/harmony/enhanced/classlib/trunk:713674-735919,765923-925192
+/harmony/enhanced/classlib/trunk:713674-735919,765923-926091
 /harmony/enhanced/classlib/trunk/working_classlib:884014-884286
 /harmony/enhanced/trunk/working_classlib:476396-920147
 /incubator/harmony/enhanced/trunk/working_classlib:423974-476394

Propchange: harmony/enhanced/classlib/branches/java6/depends/libs/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Mar 22 21:46:10 2010
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/depends/libs:544451-925192
+/harmony/enhanced/classlib/trunk/depends/libs:544451-926091

Propchange: harmony/enhanced/classlib/branches/java6/make/depends-common.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Mar 22 21:46:10 2010
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/make/depends-common.xml:768152-925192
+/harmony/enhanced/classlib/trunk/make/depends-common.xml:768152-926091

Modified: harmony/enhanced/classlib/branches/java6/make/properties.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/make/properties.xml?rev=926361&r1=926360&r2=926361&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/make/properties.xml (original)
+++ harmony/enhanced/classlib/branches/java6/make/properties.xml Mon Mar 22 21:46:10 2010
@@ -37,6 +37,7 @@
 
     <!-- Debug or release version -->
     <property name="hy.cfg" value="debug" />
+    <property name="hy.specification.version" value="1.5" />
 
     <!-- Javac properties -->
     <!-- Explicitly set to ECJ as the default compiler. -->
@@ -654,8 +655,13 @@ Alternatively, you can switch to another
     </macrodef>
    
     <presetdef name="hy.javac">
-        <javac target="${hy.javac.target}" source="${hy.javac.source}" 
-                compiler="${hy.javac.compiler}" debug="${hy.javac.debug}">
+        <javac compiler="${hy.javac.compiler}"
+               memoryMaximumSize="${hy.javac.maxmem}"
+               source="${hy.javac.source}"
+               target="${hy.javac.target}"
+               debug="${hy.javac.debug}"
+               debuglevel="${hy.javac.debuglevel}"
+               includeantruntime="false">
             <compilerarg line="${build.compilerarg}" />
         </javac>
     </presetdef>
@@ -704,13 +710,14 @@ Alternatively, you can switch to another
             <echo message="Compiling @{description}" />
             
             <mkdir dir="@{destdir}" />
+
+            <mkdir dir="${hy.hdk}/build/test" />
+            <copy file="${junit.jar}"
+                  tofile="${hy.hdk}/build/test/junit.jar" />
+            <copy file="${hamcrest-library.jar}"
+                  tofile="${hy.hdk}/build/test/hamcrest-library.jar" />
             
-            <javac destdir="@{destdir}"
-               compiler="${hy.javac.compiler}"
-               memoryMaximumSize="${hy.javac.maxmem}"
-               source="${hy.javac.source}" 
-               target="${hy.javac.target}"
-               debug="${hy.javac.debug}">
+            <hy.javac destdir="@{destdir}">
 
                 <javac-elements />
 
@@ -722,9 +729,12 @@ Alternatively, you can switch to another
                     </fileset>
                 </bootclasspath>
 
-                <classpath location="${hy.hdk}/build/test/support.jar" />
                 <classpath location="../../build/classes" />
-            </javac>
+                <classpath location="${hy.hdk}/build/test/junit.jar" />
+                <classpath
+                     location="${hy.hdk}/build/test/hamcrest-library.jar" />
+                <classpath location="${hy.hdk}/build/test/support.jar" />
+            </hy.javac>
         </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=926361&r1=926360&r2=926361&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/accessibility/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/accessibility/build.xml Mon Mar 22 21:46:10 2010
@@ -21,6 +21,7 @@
 
     <property name="hy.module" value="accessibility" />
     <property name="hy.hdk" location="${basedir}/../../deploy" />
+    <property name="depends.dir" location="${basedir}/../../depends" />
     <import file="${hy.hdk}/build/ant/properties.xml" />
 
     <property file="../../make/depends.properties" />
@@ -62,14 +63,9 @@
 
         <mkdir dir="../../build/classes" />
 
-        <javac sourcepath=""
-               srcdir="src/main/java" 
-               destdir="../../build/classes"
-               compiler="${hy.javac.compiler}"
-               memoryMaximumSize="${hy.javac.maxmem}"
-               source="${hy.javac.source}" 
-               target="${hy.javac.target}"
-               debug="${hy.javac.debug}">
+        <hy.javac sourcepath=""
+                  srcdir="src/main/java" 
+                  destdir="../../build/classes">
 
             <compilerarg line="${build.compilerarg}" />
 
@@ -78,7 +74,7 @@
                     <include name="**/*.jar" />
                 </fileset>
             </bootclasspath>
-        </javac>
+        </hy.javac>
     </target>
 
     <target name="findbugs" depends="build-jar">
@@ -121,8 +117,6 @@
             </filterchain>
         </copy>
 
-        <copy file="../../${junit.jar}"
-              tofile="${hy.hdk}/build/test/junit.jar" />
     </target>
 
     <target name="compile-tests">

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=926361&r1=926360&r2=926361&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/annotation/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/annotation/build.xml Mon Mar 22 21:46:10 2010
@@ -21,6 +21,7 @@
 
     <property name="hy.module" value="annotation" />
     <property name="hy.hdk" location="${basedir}/../../deploy" />
+    <property name="depends.dir" location="${basedir}/../../depends" />
     <import file="${hy.hdk}/build/ant/properties.xml" />
 
     <property file="../../make/depends.properties" />
@@ -62,14 +63,9 @@
 
         <mkdir dir="../../build/classes" />
 
-        <javac sourcepath=""
+        <hy.javac sourcepath=""
                srcdir="src/main/java"
-               destdir="../../build/classes"
-               compiler="${hy.javac.compiler}"
-               memoryMaximumSize="${hy.javac.maxmem}"
-               source="${hy.javac.source}" 
-               target="${hy.javac.target}"
-               debug="${hy.javac.debug}">
+               destdir="../../build/classes">
 
             <compilerarg line="${build.compilerarg}" />
 
@@ -78,7 +74,7 @@
                     <include name="**/*.jar" />
                 </fileset>
             </bootclasspath>
-        </javac>
+        </hy.javac>
     </target>
 
     <target name="findbugs" depends="build-jar">
@@ -118,9 +114,6 @@
                 </tokenfilter>
             </filterchain>
         </copy>
-
-        <copy file="../../${junit.jar}"
-              tofile="${hy.hdk}/build/test/junit.jar" />
     </target>
 
     <target name="compile-tests">

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=926361&r1=926360&r2=926361&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/applet/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/applet/build.xml Mon Mar 22 21:46:10 2010
@@ -21,6 +21,7 @@
 
     <property name="hy.module" value="applet" />
     <property name="hy.hdk" location="${basedir}/../../deploy" />
+    <property name="depends.dir" location="${basedir}/../../depends" />
     <import file="${hy.hdk}/build/ant/properties.xml" />
 
     <property file="../../make/depends.properties" />
@@ -62,14 +63,9 @@
 
         <mkdir dir="../../build/classes" />
 
-        <javac sourcepath=""
-               srcdir="src/main/java"
-               destdir="../../build/classes"
-               compiler="${hy.javac.compiler}"
-               memoryMaximumSize="${hy.javac.maxmem}"
-               source="${hy.javac.source}" 
-               target="${hy.javac.target}"
-               debug="${hy.javac.debug}">
+        <hy.javac sourcepath=""
+                  srcdir="src/main/java"
+                  destdir="../../build/classes">
 
             <compilerarg line="${build.compilerarg}" />
 
@@ -78,7 +74,7 @@
                     <include name="**/*.jar" />
                 </fileset>
             </bootclasspath>
-        </javac>
+        </hy.javac>
     </target>
 
     <target name="findbugs" depends="build-jar">
@@ -119,9 +115,6 @@
                 </tokenfilter>
             </filterchain>
         </copy>
- 
-        <copy file="../../${junit.jar}"
-              tofile="${hy.hdk}/build/test/junit.jar" />
      </target>
 
     <target name="compile-tests">

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=926361&r1=926360&r2=926361&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/archive/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/archive/build.xml Mon Mar 22 21:46:10 2010
@@ -21,6 +21,7 @@
 
     <property name="hy.module" value="archive" />
     <property name="hy.hdk" location="${basedir}/../../deploy" />
+    <property name="depends.dir" location="${basedir}/../../depends" />
     <import file="${hy.hdk}/build/ant/properties.xml" />
 
     <property file="../../make/depends.properties" />
@@ -159,14 +160,9 @@
 
         <mkdir dir="../../build/classes" />
 
-        <javac sourcepath=""
+        <hy.javac sourcepath=""
                srcdir="src/main/java"
-               destdir="../../build/classes"
-               compiler="${hy.javac.compiler}"
-               memoryMaximumSize="${hy.javac.maxmem}"
-               source="${hy.javac.source}" 
-               target="${hy.javac.target}"
-               debug="${hy.javac.debug}">
+               destdir="../../build/classes">
 
             <compilerarg line="${build.compilerarg}" />
 
@@ -175,7 +171,7 @@
                     <include name="**/*.jar" />
                 </fileset>
             </bootclasspath>
-        </javac>
+        </hy.javac>
     </target>
 
     <target name="findbugs" depends="build-jar">
@@ -224,8 +220,6 @@
             <fileset dir="src/test/resources" />
         </copy>
 
-        <copy file="../../${junit.jar}"
-              tofile="${hy.hdk}/build/test/junit.jar" />
     </target>
 
     <target name="compile-tests">

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=926361&r1=926360&r2=926361&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/auth/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/auth/build.xml Mon Mar 22 21:46:10 2010
@@ -22,6 +22,7 @@
 
     <property name="hy.module" value="auth" />
     <property name="hy.hdk" location="${basedir}/../../deploy" />
+    <property name="depends.dir" location="${basedir}/../../depends" />
     <import file="${hy.hdk}/build/ant/properties.xml" />
 
     <property file="../../make/depends.properties" />
@@ -73,13 +74,8 @@
 
         <mkdir dir="../../build/classes" />
 
-        <javac sourcepath=""
-               destdir="../../build/classes"
-               compiler="${hy.javac.compiler}"
-               memoryMaximumSize="${hy.javac.maxmem}"
-               source="${hy.javac.source}" 
-               target="${hy.javac.target}"
-               debug="${hy.javac.debug}">
+        <hy.javac sourcepath=""
+                  destdir="../../build/classes">
 
             <compilerarg line="${build.compilerarg}" />
 
@@ -93,7 +89,7 @@
                     <include name="**/*.jar" />
                 </fileset>
             </bootclasspath>
-        </javac>
+        </hy.javac>
     </target>
 
     <target name="findbugs" depends="build-jar">
@@ -138,9 +134,6 @@
                 </tokenfilter>
             </filterchain>
         </copy>
-
-        <copy file="../../${junit.jar}"
-              tofile="${hy.hdk}/build/test/junit.jar" />
     </target>
 
     <target name="compile-tests">

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=926361&r1=926360&r2=926361&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/build.xml Mon Mar 22 21:46:10 2010
@@ -169,13 +169,8 @@ ${line.separator}For Fedora try: yum ins
 
         <mkdir dir="../../build/classes" />
 
-        <javac sourcepath=""
-               destdir="../../build/classes"
-               compiler="${hy.javac.compiler}"
-               memoryMaximumSize="${hy.javac.maxmem}"
-               source="${hy.javac.source}" 
-               target="${hy.javac.target}"
-               debug="${hy.javac.debug}">
+        <hy.javac sourcepath=""
+                  destdir="../../build/classes">
 
             <compilerarg line="${build.compilerarg}" />
 
@@ -189,7 +184,7 @@ ${line.separator}For Fedora try: yum ins
                     <include name="**/*.jar" />
                 </fileset>
             </bootclasspath>
-        </javac>
+        </hy.javac>
     </target>
 
     <target name="copy-resources" depends="-copy-win-resources">
@@ -334,8 +329,6 @@ ${line.separator}For Fedora try: yum ins
         <copy todir="${tests.resources.hdk.dir}" includeemptydirs="false">
             <fileset dir="src/test/api/resources" />
         </copy>
-
-        <copy file="${junit.jar}" todir="${hy.hdk}/build/test" />
     </target>
 
     <target name="compile-tests">

Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/Toolkit.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/Toolkit.java?rev=926361&r1=926360&r2=926361&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/Toolkit.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/Toolkit.java Mon Mar 22 21:46:10 2010
@@ -495,7 +495,7 @@ public abstract class Toolkit {
     private static String getWTKClassName() {
         String osName = System.getProperty("os.name").toLowerCase(); //$NON-NLS-1$
         String packageBase = "org.apache.harmony.awt.wtk", win = "windows", lin = "linux"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-        if (osName.startsWith(lin)) {
+        if (osName.startsWith(lin) || osName.startsWith("freebsd")) {
             return packageBase + "." + lin + ".LinuxWTK"; //$NON-NLS-1$ //$NON-NLS-2$
         }
         if (osName.startsWith(win)) {

Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/datatransfer/DTK.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/datatransfer/DTK.java?rev=926361&r1=926360&r2=926361&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/datatransfer/DTK.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/datatransfer/DTK.java Mon Mar 22 21:46:10 2010
@@ -133,6 +133,7 @@ public abstract class DTK {
             name = "org.apache.harmony.awt.datatransfer.windows.WinDTK"; //$NON-NLS-1$
             break;
         case SystemUtils.OS_LINUX:
+        case SystemUtils.OS_FREEBSD:
             name = "org.apache.harmony.awt.datatransfer.linux.LinuxDTK"; //$NON-NLS-1$
             break;
         default:

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=926361&r1=926360&r2=926361&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/beans/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/beans/build.xml Mon Mar 22 21:46:10 2010
@@ -21,6 +21,7 @@
 
     <property name="hy.module" value="beans" />
     <property name="hy.hdk" location="${basedir}/../../deploy" />
+    <property name="depends.dir" location="${basedir}/../../depends" />
     <import file="${hy.hdk}/build/ant/properties.xml" />
 
     <property file="../../make/depends.properties" />
@@ -62,14 +63,9 @@
 
         <mkdir dir="../../build/classes" />
 
-        <javac sourcepath=""
+        <hy.javac sourcepath=""
                srcdir="src/main/java"
-               destdir="../../build/classes"
-               compiler="${hy.javac.compiler}"
-               memoryMaximumSize="${hy.javac.maxmem}"
-               source="${hy.javac.source}" 
-               target="${hy.javac.target}"
-               debug="${hy.javac.debug}">
+               destdir="../../build/classes">
 
             <compilerarg line="${build.compilerarg}" />
 
@@ -78,7 +74,7 @@
                     <include name="**/*.jar" />
                 </fileset>
             </bootclasspath>
-        </javac>
+        </hy.javac>
     </target>
 
     <target name="findbugs" depends="build-jar">
@@ -135,9 +131,6 @@
                 <exclude name="**/*.java" />
             </fileset>
         </copy>
-
-        <copy file="../../${junit.jar}"
-              tofile="${hy.hdk}/build/test/junit.jar" />
     </target>
 
     <target name="compile-tests"> 

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=926361&r1=926360&r2=926361&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/concurrent/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/concurrent/build.xml Mon Mar 22 21:46:10 2010
@@ -21,6 +21,7 @@
 
     <property name="hy.module" value="concurrent" />
     <property name="hy.hdk" location="${basedir}/../../deploy" />
+    <property name="depends.dir" location="${basedir}/../../depends" />
     <import file="${hy.hdk}/build/ant/properties.xml" />
 
     <property file="../../make/depends.properties" />
@@ -62,14 +63,9 @@
 
         <mkdir dir="../../build/classes" />
 
-        <javac sourcepath=""
+        <hy.javac sourcepath=""
                srcdir="src/main/java"
-               destdir="../../build/classes"
-               compiler="${hy.javac.compiler}"
-               memoryMaximumSize="${hy.javac.maxmem}"
-               source="${hy.javac.source}" 
-               target="${hy.javac.target}"
-               debug="${hy.javac.debug}">
+               destdir="../../build/classes">
 
             <compilerarg line="${build.compilerarg}" />
 
@@ -78,7 +74,7 @@
                     <include name="**/*.jar" />
                 </fileset>
             </bootclasspath>
-        </javac>
+        </hy.javac>
     </target>
 
     <target name="findbugs" depends="build-jar">
@@ -117,9 +113,6 @@
                 </tokenfilter>
             </filterchain>
         </copy>
- 
-        <copy file="../../${junit.jar}"
-              tofile="${hy.hdk}/build/test/junit.jar" />
       </target>
 
     <target name="compile-tests">

Propchange: harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/atomic/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Mar 22 21:46:10 2010
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/atomic:765923-925192
+/harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/atomic:765923-926091

Propchange: harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/locks/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Mar 22 21:46:10 2010
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/locks:765923-925192
+/harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/locks:765923-926091

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=926361&r1=926360&r2=926361&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/crypto/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/crypto/build.xml Mon Mar 22 21:46:10 2010
@@ -21,6 +21,7 @@
 
     <property name="hy.module" value="crypto" />
     <property name="hy.hdk" location="${basedir}/../../deploy" />
+    <property name="depends.dir" location="${basedir}/../../depends" />
     <import file="${hy.hdk}/build/ant/properties.xml" />
 
     <property file="../../make/depends.properties" />
@@ -62,14 +63,9 @@
 
         <mkdir dir="../../build/classes" />
 
-        <javac sourcepath=""
+        <hy.javac sourcepath=""
                srcdir="src/main/java"
-               destdir="../../build/classes"
-               compiler="${hy.javac.compiler}"
-               memoryMaximumSize="${hy.javac.maxmem}"
-               source="${hy.javac.source}" 
-               target="${hy.javac.target}"
-               debug="${hy.javac.debug}">
+               destdir="../../build/classes">
 
             <compilerarg line="${build.compilerarg}" />
 
@@ -78,7 +74,7 @@
                     <include name="**/*.jar" />
                 </fileset>
             </bootclasspath>
-        </javac>
+        </hy.javac>
     </target>
 
     <target name="findbugs" depends="build-jar">
@@ -136,9 +132,6 @@
         <copy todir="${tests.resources.hdk.dir}">
             <fileset dir="src/test/resources" />
         </copy>
-
-        <copy file="../../${junit.jar}"
-              tofile="${hy.hdk}/build/test/junit.jar" />
     </target>
 
     <target name="compile-tests">

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=926361&r1=926360&r2=926361&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/imageio/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/imageio/build.xml Mon Mar 22 21:46:10 2010
@@ -128,14 +128,9 @@ ${line.separator}For Fedora try: yum ins
 
         <mkdir dir="../../build/classes" />
 
-        <javac sourcepath=""
+        <hy.javac sourcepath=""
                srcdir="src/main/java"
-               destdir="../../build/classes"
-               compiler="${hy.javac.compiler}"
-               memoryMaximumSize="${hy.javac.maxmem}"
-               source="${hy.javac.source}" 
-               target="${hy.javac.target}"
-               debug="${hy.javac.debug}">
+               destdir="../../build/classes">
 
             <compilerarg line="${build.compilerarg}" />
 
@@ -144,7 +139,7 @@ ${line.separator}For Fedora try: yum ins
                     <include name="**/*.jar" />
                 </fileset>
             </bootclasspath>
-        </javac>
+        </hy.javac>
     </target>
     
     <target name="build-native" depends="build-native-all" />
@@ -203,8 +198,6 @@ ${line.separator}For Fedora try: yum ins
         <copy todir="${tests.resources.hdk.dir}">
             <fileset dir="src/test/resources" />
         </copy>
-
-        <copy file="${junit.jar}" tofile="${hy.hdk}/build/test/junit.jar" />
     </target>
 
     <target name="compile-tests">

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=926361&r1=926360&r2=926361&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/instrument/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/instrument/build.xml Mon Mar 22 21:46:10 2010
@@ -21,6 +21,7 @@
 
     <property name="hy.module" value="instrument" />
     <property name="hy.hdk" location="${basedir}/../../deploy" />
+    <property name="depends.dir" location="${basedir}/../../depends" />
     <import file="${hy.hdk}/build/ant/properties.xml" />
 
     <property file="../../make/depends.properties" />
@@ -72,15 +73,9 @@
 
         <mkdir dir="../../build/classes" />
 
-        <javac sourcepath=""
-            srcdir="src/main/java"
-            destdir="../../build/classes"
-               compiler="${hy.javac.compiler}"
-               memoryMaximumSize="${hy.javac.maxmem}"
-               source="${hy.javac.source}" 
-               target="${hy.javac.target}"
-               debug="${hy.javac.debug}">
-               
+        <hy.javac sourcepath=""
+                  srcdir="src/main/java"
+                  destdir="../../build/classes">               
             <compilerarg line="${build.compilerarg}" />
 
             <bootclasspath>
@@ -88,7 +83,7 @@
                     <include name="**/*.jar" />
                 </fileset>
             </bootclasspath>
-        </javac>
+        </hy.javac>
     </target>
 
     <target name="findbugs" depends="build-jar">
@@ -134,9 +129,6 @@
                 <exclude name="**/*.java" />
             </fileset>
         </copy>
-        
-        <copy file="../../${junit.jar}"
-              tofile="${hy.hdk}/build/test/junit.jar" />
     </target>
 
     <target name="compile-tests">

Propchange: harmony/enhanced/classlib/branches/java6/modules/jmx/META-INF/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Mar 22 21:46:10 2010
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/jmx/META-INF:768152-925192
+/harmony/enhanced/classlib/trunk/modules/jmx/META-INF:768152-926091

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=926361&r1=926360&r2=926361&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/jndi/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/jndi/build.xml Mon Mar 22 21:46:10 2010
@@ -21,6 +21,7 @@
 
     <property name="hy.module" value="jndi" />
     <property name="hy.hdk" location="${basedir}/../../deploy" />
+    <property name="depends.dir" location="${basedir}/../../depends" />
     <import file="${hy.hdk}/build/ant/properties.xml" />
 
     <property file="../../make/depends.properties" />
@@ -62,14 +63,9 @@
 
         <mkdir dir="../../build/classes" />
 
-        <javac sourcepath=""
+        <hy.javac sourcepath=""
                srcdir="src/main/java"
-               destdir="../../build/classes"
-               compiler="${hy.javac.compiler}"
-               memoryMaximumSize="${hy.javac.maxmem}"
-               source="${hy.javac.source}" 
-               target="${hy.javac.target}"
-               debug="${hy.javac.debug}">
+               destdir="../../build/classes">
 
             <compilerarg line="${build.compilerarg}" />
             
@@ -78,7 +74,7 @@
                     <include name="**/*.jar" />
                 </fileset>
             </bootclasspath>
-        </javac>
+        </hy.javac>
     </target>
 
     <target name="findbugs" depends="build-jar">
@@ -124,9 +120,6 @@
                 <exclude name="**/*.java" />
             </fileset>
         </copy>
-        
-        <copy file="../../${junit.jar}"
-              tofile="${hy.hdk}/build/test/junit.jar" />
     </target>
 
     <target name="compile-tests">

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=926361&r1=926360&r2=926361&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/lang-management/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/lang-management/build.xml Mon Mar 22 21:46:10 2010
@@ -21,6 +21,7 @@
 
     <property name="hy.module" value="lang-management" />
     <property name="hy.hdk" location="${basedir}/../../deploy" />
+    <property name="depends.dir" location="${basedir}/../../depends" />
     <import file="${hy.hdk}/build/ant/properties.xml" />
 
     <property file="../../make/depends.properties" />
@@ -62,14 +63,9 @@
 
         <mkdir dir="../../build/classes" />
 
-        <javac sourcepath=""
-               srcdir="src/main/java"
-               destdir="../../build/classes"
-               compiler="${hy.javac.compiler}"
-               memoryMaximumSize="${hy.javac.maxmem}"
-               source="${hy.javac.source}"
-               target="${hy.javac.target}"
-               debug="${hy.javac.debug}">
+        <hy.javac sourcepath=""
+                  srcdir="src/main/java"
+                  destdir="../../build/classes">
 
             <compilerarg line="${build.compilerarg}" />
 
@@ -78,7 +74,7 @@
                     <include name="**/*.jar" />
                 </fileset>
             </bootclasspath>
-        </javac>
+        </hy.javac>
     </target>
 
     <target name="findbugs" depends="build-jar">
@@ -121,9 +117,6 @@
                 </tokenfilter>
             </filterchain>
         </copy>
-
-        <copy file="../../${junit.jar}"
-              tofile="${hy.hdk}/build/test/junit.jar" />
     </target>
 
     <target name="compile-tests">

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 Mar 22 21:46:10 2010
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/lang-management/src/test/api/java/org/apache/harmony/lang/management/tests/java/util/logging:768152-925192
+/harmony/enhanced/classlib/trunk/modules/lang-management/src/test/api/java/org/apache/harmony/lang/management/tests/java/util/logging:768152-926091

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=926361&r1=926360&r2=926361&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/logging/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/logging/build.xml Mon Mar 22 21:46:10 2010
@@ -21,6 +21,7 @@
 
     <property name="hy.module" value="logging" />
     <property name="hy.hdk" location="${basedir}/../../deploy" />
+    <property name="depends.dir" location="${basedir}/../../depends" />
     <import file="${hy.hdk}/build/ant/properties.xml" />
 
     <property file="../../make/depends.properties" />
@@ -62,14 +63,9 @@
 
         <mkdir dir="../../build/classes" />
 
-        <javac sourcepath=""
+        <hy.javac sourcepath=""
                srcdir="src/main/java"
-               destdir="../../build/classes"
-               compiler="${hy.javac.compiler}"
-               memoryMaximumSize="${hy.javac.maxmem}"
-               source="${hy.javac.source}" 
-               target="${hy.javac.target}"
-               debug="${hy.javac.debug}">
+               destdir="../../build/classes">
 
             <compilerarg line="${build.compilerarg}" />
 
@@ -78,7 +74,7 @@
                     <include name="**/*.jar" />
                 </fileset>
             </bootclasspath>
-        </javac>
+        </hy.javac>
     </target>
 
     <target name="findbugs" depends="build-jar">
@@ -139,9 +135,6 @@
         <copy todir="${tests.resources.hdk.dir}">
             <fileset dir="src/test/resources" />
         </copy>
-
-        <copy file="../../${junit.jar}"
-              tofile="${hy.hdk}/build/test/junit.jar" />
     </target>
 
     <target name="compile-tests">

Modified: harmony/enhanced/classlib/branches/java6/modules/luni-kernel/src/main/java/java/lang/Runtime.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/luni-kernel/src/main/java/java/lang/Runtime.java?rev=926361&r1=926360&r2=926361&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni-kernel/src/main/java/java/lang/Runtime.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni-kernel/src/main/java/java/lang/Runtime.java Mon Mar 22 21:46:10 2010
@@ -190,7 +190,7 @@ public class Runtime {
     /**
      * Causes the virtual machine to stop running and the program to exit. If
      * {@link #runFinalizersOnExit(boolean)} has been previously invoked with a
-     * {@code true} argument, then all all objects will be properly
+     * {@code true} argument, then all objects will be properly
      * garbage-collected and finalized first.
      *
      * @param code

Modified: harmony/enhanced/classlib/branches/java6/modules/luni-kernel/src/main/java/java/lang/System.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/luni-kernel/src/main/java/java/lang/System.java?rev=926361&r1=926360&r2=926361&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni-kernel/src/main/java/java/lang/System.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni-kernel/src/main/java/java/lang/System.java Mon Mar 22 21:46:10 2010
@@ -551,7 +551,7 @@ public final class System {
     /**
      * Causes the virtual machine to stop running and the program to exit. If
      * {@link #runFinalizersOnExit(boolean)} has been previously invoked with a
-     * {@code true} argument, then all all objects will be properly
+     * {@code true} argument, then all objects will be properly
      * garbage-collected and finalized first.
      *
      * @param code

Modified: harmony/enhanced/classlib/branches/java6/modules/luni-kernel/src/main/java/java/lang/ThreadGroup.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/luni-kernel/src/main/java/java/lang/ThreadGroup.java?rev=926361&r1=926360&r2=926361&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni-kernel/src/main/java/java/lang/ThreadGroup.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni-kernel/src/main/java/java/lang/ThreadGroup.java Mon Mar 22 21:46:10 2010
@@ -363,7 +363,7 @@ public class ThreadGroup implements Thre
 
     /**
      * Iterates over all thread groups in this group (and, optionally, its
-     * sub-groups) and and stores the groups in the given array. Returns when
+     * sub-groups) and stores the groups in the given array. Returns when
      * the array is full or no more groups remain, whichever happens first.
      * 
      * @param groups the array into which the ThreadGroups will be copied

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=926361&r1=926360&r2=926361&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni/build.xml Mon Mar 22 21:46:10 2010
@@ -232,14 +232,9 @@
 
         <mkdir dir="../../build/classes" />
 
-        <javac sourcepath=""
+        <hy.javac sourcepath=""
                srcdir="src/main/java"
-               destdir="../../build/classes"
-               compiler="${hy.javac.compiler}"
-               memoryMaximumSize="${hy.javac.maxmem}"
-               source="${hy.javac.source}" 
-               target="${hy.javac.target}"
-               debug="${hy.javac.debug}">
+               destdir="../../build/classes">
 
             <compilerarg line="${build.compilerarg}" />
 
@@ -248,7 +243,7 @@
                     <include name="**/*.jar" />
                 </fileset>
             </bootclasspath>
-        </javac>
+        </hy.javac>
     </target>
 
     <target name="findbugs" depends="build-jar">
@@ -312,8 +307,6 @@
                 </tokenfilter>
             </filterchain>
         </copy>
-        <copy file="${junit.jar}"
-              tofile="${hy.hdk}/build/test/junit.jar" />
         <copy file="${jetty.jar}" todir="${hy.hdk}/build/test" />
     </target>
 

Propchange: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/fdlibm.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Mar 22 21:46:10 2010
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/fdlibm.h:803062-925192
+/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/fdlibm.h:803062-926091

Propchange: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/gp.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Mar 22 21:46:10 2010
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/gp.h:803062-925192
+/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/gp.h:803062-926091

Propchange: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/hymagic.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Mar 22 21:46:10 2010
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/hymagic.h:803062-925192
+/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/hymagic.h:803062-926091

Propchange: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/hysocket.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Mar 22 21:46:10 2010
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/hysocket.h:803062-925192
+/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/hysocket.h:803062-926091

Propchange: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/hyvmls.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Mar 22 21:46:10 2010
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/hyvmls.h:803062-925192
+/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/hyvmls.h:803062-926091

Propchange: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/jni.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Mar 22 21:46:10 2010
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/jni.h:803062-925192
+/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/jni.h:803062-926091

Propchange: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/jni_types.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Mar 22 21:46:10 2010
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/jni_types.h:803062-925192
+/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/jni_types.h:803062-926091

Propchange: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/jvmpi.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Mar 22 21:46:10 2010
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/jvmpi.h:803062-925192
+/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/jvmpi.h:803062-926091

Propchange: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/jvmri.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Mar 22 21:46:10 2010
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/jvmri.h:803062-925192
+/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/jvmri.h:803062-926091

Propchange: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/jvmti.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Mar 22 21:46:10 2010
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/jvmti.h:803062-925192
+/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/jvmti.h:803062-926091

Propchange: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/jvmti_types.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Mar 22 21:46:10 2010
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/jvmti_types.h:803062-925192
+/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/jvmti_types.h:803062-926091

Propchange: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/vmi.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Mar 22 21:46:10 2010
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/vmi.h:803062-925192
+/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/vmi.h:803062-926091

Propchange: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/vmizip.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Mar 22 21:46:10 2010
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/vmizip.h:803062-925192
+/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/vmizip.h:803062-926091

Modified: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/unix/OSNetworkSystemLinux.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/unix/OSNetworkSystemLinux.c?rev=926361&r1=926360&r2=926361&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/unix/OSNetworkSystemLinux.c (original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/unix/OSNetworkSystemLinux.c Mon Mar 22 21:46:10 2010
@@ -109,6 +109,11 @@ Java_org_apache_harmony_luni_platform_OS
 
   createSocket(env, thisObjFD, HYSOCK_STREAM, preferIPv4Stack);
 
+  /* Check if any exception occurred creating the socket */
+  if ((*env)->ExceptionCheck(env)) {
+    return;
+  }
+
   /* Also sets HY_SO_REUSEADDR = TRUE on Linux only */
   socketP =
     (hysocket_t) getJavaIoFileDescriptorContentsAsAPointer(env, thisObjFD);

Propchange: harmony/enhanced/classlib/branches/java6/modules/luni/src/test/resources/net.resources/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Mar 22 21:46:10 2010
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/luni/src/test/resources/net.resources:790472-925192
+/harmony/enhanced/classlib/trunk/modules/luni/src/test/resources/net.resources:790472-926091

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=926361&r1=926360&r2=926361&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/math/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/math/build.xml Mon Mar 22 21:46:10 2010
@@ -21,6 +21,7 @@
 
     <property name="hy.module" value="math" />
     <property name="hy.hdk" location="${basedir}/../../deploy" />
+    <property name="depends.dir" location="${basedir}/../../depends" />
     <import file="${hy.hdk}/build/ant/properties.xml" />
 
     <property file="../../make/depends.properties" />
@@ -62,14 +63,9 @@
 
         <mkdir dir="../../build/classes" />
 
-        <javac sourcepath=""
-               srcdir="src/main/java"
-               destdir="../../build/classes"
-               compiler="${hy.javac.compiler}"
-               memoryMaximumSize="${hy.javac.maxmem}"
-               source="${hy.javac.source}" 
-               target="${hy.javac.target}"
-               debug="${hy.javac.debug}">
+        <hy.javac sourcepath=""
+                  srcdir="src/main/java"
+                  destdir="../../build/classes">
                
             <compilerarg line="${build.compilerarg}" />
 
@@ -78,7 +74,7 @@
                     <include name="**/*.jar" />
                 </fileset>
             </bootclasspath>
-        </javac>
+        </hy.javac>
     </target>
 
     <target name="findbugs" depends="build-jar">
@@ -118,9 +114,6 @@
                 </tokenfilter>
             </filterchain>
         </copy>
-        
-        <copy file="../../${junit.jar}"
-              tofile="${hy.hdk}/build/test/junit.jar" />
     </target>
 
     <target name="compile-tests">

Modified: harmony/enhanced/classlib/branches/java6/modules/misc/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/misc/build.xml?rev=926361&r1=926360&r2=926361&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/misc/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/misc/build.xml Mon Mar 22 21:46:10 2010
@@ -21,6 +21,7 @@
 
     <property name="hy.module" value="misc" />
     <property name="hy.hdk" location="${basedir}/../../deploy" />
+    <property name="depends.dir" location="${basedir}/../../depends" />
     <import file="${hy.hdk}/build/ant/properties.xml" />
 
     <property file="../../make/depends.properties" />
@@ -65,14 +66,9 @@
 
         <mkdir dir="../../build/classes" />
 
-        <javac sourcepath=""
+        <hy.javac sourcepath=""
                srcdir="src/main/java"
-               destdir="../../build/classes"
-               compiler="${hy.javac.compiler}"
-               memoryMaximumSize="${hy.javac.maxmem}"
-               source="${hy.javac.source}" 
-               target="${hy.javac.target}"
-               debug="${hy.javac.debug}">
+               destdir="../../build/classes">
 
             <compilerarg line="${build.compilerarg}" />
 
@@ -81,7 +77,7 @@
                     <include name="**/*.jar" />
                 </fileset>
             </bootclasspath>
-        </javac>
+        </hy.javac>
     </target>
 
     <target name="findbugs" depends="build-jar">
@@ -126,9 +122,6 @@
                 </tokenfilter>
             </filterchain>
         </copy>
-
-        <copy file="../../${junit.jar}"
-              tofile="${hy.hdk}/build/test/junit.jar" />
     </target>
 
     <target name="compile-tests">

Modified: harmony/enhanced/classlib/branches/java6/modules/misc/src/main/java/org/apache/harmony/misc/SystemUtils.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/misc/src/main/java/org/apache/harmony/misc/SystemUtils.java?rev=926361&r1=926360&r2=926361&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/misc/src/main/java/org/apache/harmony/misc/SystemUtils.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/misc/src/main/java/org/apache/harmony/misc/SystemUtils.java Mon Mar 22 21:46:10 2010
@@ -25,6 +25,7 @@ public class SystemUtils {
     // OSes
     public static final int OS_WINDOWS = 1;
     public static final int OS_LINUX = 2;
+    public static final int OS_FREEBSD = 3;
     public static final int OS_UNKNOWN = -1;
 
     // Architectures
@@ -38,7 +39,7 @@ public class SystemUtils {
 
     /**
      * getOS method returns on of the operating system codes:
-     * OS_WINDOWS, OS_LINUX or OS_UNKNOWN
+     * OS_WINDOWS, OS_LINUX, OS_FREEBSD or OS_UNKNOWN
      * @return Operating system code
      */
     public static int getOS() {
@@ -49,8 +50,13 @@ public class SystemUtils {
             } else {
                 if (osname.compareToIgnoreCase("lin") == 0) { //$NON-NLS-1$
                     os = OS_LINUX;
-                } else
-                    os = OS_UNKNOWN;
+                } else {
+                    if (osname.compareToIgnoreCase("fre") == 0) { //$NON-NLS-1$
+                        os = OS_FREEBSD;
+                    } else {
+                        os = OS_UNKNOWN;
+                    }
+                }
             }
         }
         return os;

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=926361&r1=926360&r2=926361&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/nio/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/nio/build.xml Mon Mar 22 21:46:10 2010
@@ -21,6 +21,7 @@
 
     <property name="hy.module" value="nio" />
     <property name="hy.hdk" location="${basedir}/../../deploy" />
+    <property name="depends.dir" location="${basedir}/../../depends" />
     <import file="${hy.hdk}/build/ant/properties.xml" />
 
     <property file="../../make/depends.properties" />
@@ -72,13 +73,8 @@
 
         <mkdir dir="../../build/classes" />
 
-        <javac sourcepath=""
-               destdir="../../build/classes"
-               compiler="${hy.javac.compiler}"
-               memoryMaximumSize="${hy.javac.maxmem}"
-               source="${hy.javac.source}"
-               target="${hy.javac.target}"
-               debug="${hy.javac.debug}">
+        <hy.javac sourcepath=""
+                  destdir="../../build/classes">
 
             <compilerarg line="${build.compilerarg}" />
 
@@ -92,7 +88,7 @@
                     <include name="**/*.jar" />
                 </fileset>
             </bootclasspath>
-        </javac>
+        </hy.javac>
     </target>
 
     <target name="findbugs" depends="build-jar">
@@ -136,9 +132,6 @@
         <copy todir="${tests.resources.hdk.dir}">
             <fileset dir="src/test/resources" />
         </copy>
-
-        <copy file="../../${junit.jar}"
-              tofile="${hy.hdk}/build/test/junit.jar" />
     </target>
 
     <target name="compile-tests">

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=926361&r1=926360&r2=926361&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/nio_char/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/nio_char/build.xml Mon Mar 22 21:46:10 2010
@@ -21,6 +21,7 @@
 
     <property name="hy.module" value="nio_char" />
     <property name="hy.hdk" location="${basedir}/../../deploy" />
+    <property name="depends.dir" location="${basedir}/../../depends" />
     <import file="${hy.hdk}/build/ant/properties.xml" />
 
     <property file="../../make/depends.properties" />
@@ -72,14 +73,9 @@
 
         <mkdir dir="../../build/classes" />
 
-        <javac sourcepath=""
+        <hy.javac sourcepath=""
                srcdir="src/main/java"
-               destdir="../../build/classes"
-               compiler="${hy.javac.compiler}"
-               memoryMaximumSize="${hy.javac.maxmem}"
-               source="${hy.javac.source}" 
-               target="${hy.javac.target}"
-               debug="${hy.javac.debug}">
+               destdir="../../build/classes">
 
             <compilerarg line="${build.compilerarg}" />
 
@@ -91,7 +87,7 @@
                     <include name="**/*.jar" />
                 </fileset>
             </bootclasspath>
-        </javac>
+        </hy.javac>
     </target>
 
     <target name="findbugs" depends="build-jar">
@@ -142,9 +138,6 @@
             <fileset dir="src/test/resources" />
             <fileset dir="META-INF" />
         </copy>
-
-        <copy file="../../${junit.jar}"
-              tofile="${hy.hdk}/build/test/junit.jar" />
     </target>
 
     <target name="compile-tests">

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=926361&r1=926360&r2=926361&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/pack200/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/pack200/build.xml Mon Mar 22 21:46:10 2010
@@ -82,14 +82,11 @@
         <mkdir dir="../../build/classes" />
 
     	<!-- Ordinary classes -->
-        <javac sourcepath=""
-               srcdir="src/main/java"
-               destdir="../../build/classes"
-               compiler="${hy.javac.compiler}"
-               memoryMaximumSize="${hy.javac.maxmem}"
-               source="1.4"
-               target="1.4"
-               debug="${hy.javac.debug}">
+        <hy.javac sourcepath=""
+                  srcdir="src/main/java"
+                  destdir="../../build/classes"
+                  source="1.4"
+                  target="1.4">
 
             <compilerarg line="${build.compilerarg}" />
 
@@ -98,16 +95,11 @@
                     <include name="**/*.jar" />
                 </fileset>
             </bootclasspath>
-        </javac>
+        </hy.javac>
     	<!-- Java5 classes, with generics -->
-        <javac sourcepath=""
-               srcdir="src/main/java5"
-               destdir="../../build/classes"
-               compiler="${hy.javac.compiler}"
-               memoryMaximumSize="${hy.javac.maxmem}"
-               source="${hy.javac.source}"
-               target="${hy.javac.target}"
-               debug="${hy.javac.debug}">
+        <hy.javac sourcepath=""
+                  srcdir="src/main/java5"
+                  destdir="../../build/classes">
 
             <compilerarg line="${build.compilerarg}" />
 
@@ -116,7 +108,7 @@
                     <include name="**/*.jar" />
                 </fileset>
             </bootclasspath>
-        </javac>
+        </hy.javac>
     </target>
 
     <target name="findbugs" depends="build-jar">
@@ -167,22 +159,23 @@
         <copy todir="${tests.resources.hdk.dir}">
             <fileset dir="src/test/resources" />
         </copy>
-
-        <copy file="${junit.jar}" todir="${hy.hdk}/build/test" />
     </target>
 
     <target name="compile-tests"> 
         <mkdir dir="bin/test" />
 
+        <mkdir dir="${hy.hdk}/build/test" />
+        <copy file="${junit.jar}"
+              tofile="${hy.hdk}/build/test/junit.jar" />
+        <copy file="${hamcrest-library.jar}"
+              tofile="${hy.hdk}/build/test/hamcrest-library.jar" />
+
         <echo message="Compiling ${hy.module} tests" />
-        <javac srcdir="src/test/java"
-               destdir="bin/test"
-               sourcepath=""
-               compiler="${hy.javac.compiler}"
-               memoryMaximumSize="${hy.javac.maxmem}"
-               source="1.4" 
-               target="1.4"
-               debug="${hy.javac.debug}">
+        <hy.javac srcdir="src/test/java"
+                  destdir="bin/test"
+                  sourcepath=""
+                  source="1.4" 
+                  target="1.4">
 
             <compilerarg line="${build.compilerarg}" />
 
@@ -191,7 +184,9 @@
                     <include name="**/*.jar" />
                 </fileset>
             </bootclasspath>
-        </javac>
+            <classpath location="${hy.hdk}/build/test/junit.jar" />
+            <classpath location="${hy.hdk}/build/test/hamcrest-library.jar" />
+        </hy.javac>
     </target>
 
     <target name="run-tests" depends="test-jar">

Propchange: harmony/enhanced/classlib/branches/java6/modules/pack200/depends/manifests/asm-3.1/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Mar 22 21:46:10 2010
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/pack200/depends/manifests/asm-3.1:785554-925192
+/harmony/enhanced/classlib/trunk/modules/pack200/depends/manifests/asm-3.1:785554-926091

Propchange: harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java5/org/apache/harmony/pack200/Pack200Adapter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Mar 22 21:46:10 2010
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java5/org/apache/harmony/pack200/Pack200Adapter.java:782694-925192
+/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java5/org/apache/harmony/pack200/Pack200Adapter.java:782694-926091

Propchange: harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java5/org/apache/harmony/pack200/Pack200PackerAdapter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Mar 22 21:46:10 2010
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java5/org/apache/harmony/pack200/Pack200PackerAdapter.java:782694-925192
+/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java5/org/apache/harmony/pack200/Pack200PackerAdapter.java:782694-926091

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=926361&r1=926360&r2=926361&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/portlib/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/portlib/build.xml Mon Mar 22 21:46:10 2010
@@ -21,10 +21,11 @@
 
     <property name="hy.module" value="portlib" />
     <property name="hy.hdk" location="${basedir}/../../deploy" />
+    <property name="depends.dir" location="${basedir}/../../depends" />
     <import file="${hy.hdk}/build/ant/properties.xml" />
 
     <property file="../../make/depends.properties" />
-    <property name="fdlibm.zip" location="${depends.oss}/fdlibm_5.2.zip" />
+
     <available property="hythr.available"
         file="${hy.jdk}/jre/bin/default/${shlib.prefix}hythr${shlib.suffix}" />
     <condition property="test.portlib">
@@ -112,11 +113,11 @@
                 <include name="time.h" />
                 <include name="utime.h" />
                 <include name="unistd.h" />
-                <include name="arpa\inet.h" />
-                <include name="sys\ipc.h" />
-                <include name="sys\stat.h" />
-                <include name="sys\time.h" />
-                <include name="sys\utsname.h" />
+                <include name="arpa/inet.h" />
+                <include name="sys/ipc.h" />
+                <include name="sys/stat.h" />
+                <include name="sys/time.h" />
+                <include name="sys/utsname.h" />
             </fileset>
         </copy>
     </target>
@@ -226,11 +227,11 @@
                 <include name="time.h" />
                 <include name="utime.h" />
                 <include name="unistd.h" />
-                <include name="arpa\inet.h" />
-                <include name="sys\ipc.h" />
-                <include name="sys\stat.h" />
-                <include name="sys\time.h" />
-                <include name="sys\utsname.h" />
+                <include name="arpa/inet.h" />
+                <include name="sys/ipc.h" />
+                <include name="sys/stat.h" />
+                <include name="sys/time.h" />
+                <include name="sys/utsname.h" />
             </fileset>
         </delete>
     </target>

Modified: harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/port/shared/hystr.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/port/shared/hystr.c?rev=926361&r1=926360&r2=926361&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/port/shared/hystr.c (original)
+++ harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/port/shared/hystr.c Mon Mar 22 21:46:10 2010
@@ -689,7 +689,7 @@ writeIntToBuffer (char *buf, U_32 bufLen
     }
   while (temp);
 
-  /* zero extend to the left according the the requested precision */
+  /* zero extend to the left according the requested precision */
   while (length > 0)
     {
       length -= 1;

Modified: harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/port/unix/hyshmem.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/port/unix/hyshmem.c?rev=926361&r1=926360&r2=926361&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/port/unix/hyshmem.c (original)
+++ harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/port/unix/hyshmem.c Mon Mar 22 21:46:10 2010
@@ -688,7 +688,7 @@ createSharedMemory (HyPortLibrary * port
               Trc_PRT_shmem_createSharedMemory_Exit3 ();
               return RETRY;
             }
-          /* any other error code is is bad */
+          /* any other error code is bad */
           Trc_PRT_shmem_createSharedMemory_Exit4 ();
           return FAILED;
         }

Modified: harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/port/unix/hysock.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/port/unix/hysock.c?rev=926361&r1=926360&r2=926361&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/port/unix/hysock.c (original)
+++ harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/port/unix/hysock.c Mon Mar 22 21:46:10 2010
@@ -574,7 +574,7 @@ hysock_accept (struct HyPortLibrary * po
  * of the socket by assigning a local name to an unnamed socket.
  *
  * @param[in] portLibrary The port library.
- * @param[in] sock hysocket_t which will be be associated with the specified name.
+ * @param[in] sock hysocket_t which will be associated with the specified name.
  * @param[in] addr Address to bind to socket.
  *
  * @return
@@ -945,7 +945,7 @@ hysock_getaddrinfo (struct HyPortLibrary
  *
  * @return	
  * \arg 0, if no errors occurred, otherwise the (negative) error code
- * \arg HYPORT_ERROR_SOCKET_VALUE_NULL when we have have the old IPv4 gethostbyname call and the address indexed is out
+ * \arg HYPORT_ERROR_SOCKET_VALUE_NULL when we have the old IPv4 gethostbyname call and the address indexed is out
  * of range.  This is because the address list and the host alias list are not the same length.  Just skip this entry.
  *
  * @note Added for IPv6 support.
@@ -1161,7 +1161,7 @@ hysock_getaddrinfo_length (struct HyPort
  *
  * @return
  * \arg 0, if no errors occurred, otherwise the (negative) error code.
- * \arg HYPORT_ERROR_SOCKET_VALUE_NULL when we have have the old IPv4 gethostbyname call and the name indexed is out
+ * \arg HYPORT_ERROR_SOCKET_VALUE_NULL when we have the old IPv4 gethostbyname call and the name indexed is out
  * of range.  This is because the address list and the host alias list are not the same length.  Just skip this entry.
  *
  * @note Added for IPv6 support.
@@ -4988,6 +4988,8 @@ getNextNetlinkMsg (struct HyPortLibrary 
                 struct sockaddr_nl nladdr;
                 struct msghdr msg;
                 struct iovec iov;
+                int reallocLoop = 1;
+
                 iov.iov_base = netlinkContext->buffer;
                 iov.iov_len = netlinkContext->bufferSize;
                 msg.msg_name = (void *)&(nladdr);
@@ -4995,8 +4997,6 @@ getNextNetlinkMsg (struct HyPortLibrary 
                 msg.msg_iov = &iov;
                 msg.msg_iovlen = 1;
                 
-                int reallocLoop = 1;
-
                 while (reallocLoop) {
                     (void)recvmsg(netlinkContext->netlinkSocketHandle, &msg, MSG_PEEK);
 

Modified: harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/port/windows/hysock.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/port/windows/hysock.c?rev=926361&r1=926360&r2=926361&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/port/windows/hysock.c (original)
+++ harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/port/windows/hysock.c Mon Mar 22 21:46:10 2010
@@ -579,7 +579,7 @@ hysock_accept (struct HyPortLibrary * po
  * of the socket by assigning a local name to an unnamed socket.
  *
  * @param[in] portLibrary The port library.
- * @param[in] sock hysocket_t which will be be associated with the specified name.
+ * @param[in] sock hysocket_t which will be associated with the specified name.
  * @param[in] addr Address to bind to socket.
  *
  * @return
@@ -1160,7 +1160,7 @@ hysock_getaddrinfo (struct HyPortLibrary
  *
  * @return	
  * \arg 0, if no errors occurred, otherwise the (negative) error code
- * \arg HYPORT_ERROR_SOCKET_VALUE_NULL when we have have the old IPv4 gethostbyname call and the address indexed is out
+ * \arg HYPORT_ERROR_SOCKET_VALUE_NULL when we have the old IPv4 gethostbyname call and the address indexed is out
  * of range.  This is because the address list and the host alias list are not the same length.  Just skip this entry.
  *
  * @note Added for IPv6 support.
@@ -1381,7 +1381,7 @@ hysock_getaddrinfo_length (struct HyPort
  *
  * @return
  * \arg 0, if no errors occurred, otherwise the (negative) error code.
- * \arg HYPORT_ERROR_SOCKET_VALUE_NULL when we have have the old IPv4 gethostbyname call and the name indexed is out
+ * \arg HYPORT_ERROR_SOCKET_VALUE_NULL when we have the old IPv4 gethostbyname call and the name indexed is out
  * of range.  This is because the address list and the host alias list are not the same length.  Just skip this entry.
  *
  * @note Added for IPv6 support.

Modified: harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/thread/shared/hythread.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/thread/shared/hythread.c?rev=926361&r1=926360&r2=926361&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/thread/shared/hythread.c (original)
+++ harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/thread/shared/hythread.c Mon Mar 22 21:46:10 2010
@@ -1447,7 +1447,7 @@ hythread_cancel (hythread_t thread)
  * Detaches the current thread from the threading library.
  * 
  * Detach must only be called by an attached thread.  The actual parameter
- * must be the the current thread's hythread_t, or NULL (in which case this
+ * must be the current thread's hythread_t, or NULL (in which case this
  * function retrieves and uses the current thread's hythread_t).  This
  * function cannot be used to detach an arbitrary thread.
  *

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=926361&r1=926360&r2=926361&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/prefs/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/prefs/build.xml Mon Mar 22 21:46:10 2010
@@ -23,6 +23,7 @@
 
     <property name="hy.module" value="prefs" />
     <property name="hy.hdk" location="${basedir}/../../deploy" />
+    <property name="depends.dir" location="${basedir}/../../depends" />
     <import file="${hy.hdk}/build/ant/properties.xml" />
 
     <property file="../../make/depends.properties" />
@@ -77,14 +78,9 @@
 
         <mkdir dir="../../build/classes" />
 
-        <javac sourcepath=""
+        <hy.javac sourcepath=""
                srcdir="src/main/java"
-               destdir="../../build/classes"
-               compiler="${hy.javac.compiler}"
-               memoryMaximumSize="${hy.javac.maxmem}"
-               source="${hy.javac.source}" 
-               target="${hy.javac.target}"
-               debug="${hy.javac.debug}">
+               destdir="../../build/classes">
 
             <compilerarg line="${build.compilerarg}" />
 
@@ -93,7 +89,7 @@
                     <include name="**/*.jar" />
                 </fileset>
             </bootclasspath>
-        </javac>
+        </hy.javac>
     </target>
 
     <target name="findbugs" depends="build-jar">
@@ -137,9 +133,6 @@
         <copy todir="${tests.resources.hdk.dir}">
             <fileset dir="src/test/resources" />
         </copy>
-
-        <copy file="../../${junit.jar}"
-              tofile="${hy.hdk}/build/test/junit.jar" />
     </target>
 
     <target name="compile-tests">

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=926361&r1=926360&r2=926361&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/print/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/print/build.xml Mon Mar 22 21:46:10 2010
@@ -21,6 +21,7 @@
 
     <property name="hy.module" value="print" />
     <property name="hy.hdk" location="${basedir}/../../deploy" />
+    <property name="depends.dir" location="${basedir}/../../depends" />
     <import file="${hy.hdk}/build/ant/properties.xml" />
 
     <property file="../../make/depends.properties" />
@@ -66,14 +67,9 @@
 
         <mkdir dir="../../build/classes" />
 
-        <javac sourcepath=""
-               srcdir="src/main/java/common"
-               destdir="../../build/classes"
-               compiler="${hy.javac.compiler}"
-               memoryMaximumSize="${hy.javac.maxmem}"
-               source="${hy.javac.source}" 
-               target="${hy.javac.target}"
-               debug="${hy.javac.debug}">
+        <hy.javac sourcepath=""
+                  srcdir="src/main/java/common"
+                  destdir="../../build/classes">
 
             <compilerarg line="${build.compilerarg}" />
 
@@ -82,7 +78,7 @@
                     <include name="**/*.jar" />
                 </fileset>
             </bootclasspath>
-        </javac>
+        </hy.javac>
     </target>
     
     <target name="build-native" depends="build-native-all" />
@@ -144,9 +140,6 @@
                 </tokenfilter>
             </filterchain>
         </copy>
-
-        <copy file="../../${junit.jar}"
-              tofile="${hy.hdk}/build/test/junit.jar" />
     </target>
 
     <target name="compile-tests">

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=926361&r1=926360&r2=926361&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/regex/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/regex/build.xml Mon Mar 22 21:46:10 2010
@@ -21,6 +21,7 @@
 
     <property name="hy.module" value="regex" />
     <property name="hy.hdk" location="${basedir}/../../deploy" />
+    <property name="depends.dir" location="${basedir}/../../depends" />
     <import file="${hy.hdk}/build/ant/properties.xml" />
 
     <property file="../../make/depends.properties" />
@@ -62,14 +63,9 @@
 
         <mkdir dir="../../build/classes" />
 
-        <javac sourcepath=""
+        <hy.javac sourcepath=""
                srcdir="src/main/java"
-               destdir="../../build/classes"
-               compiler="${hy.javac.compiler}"
-               memoryMaximumSize="${hy.javac.maxmem}"
-               source="${hy.javac.source}" 
-               target="${hy.javac.target}"
-               debug="${hy.javac.debug}">
+               destdir="../../build/classes">
 
             <compilerarg line="${build.compilerarg}" />
 
@@ -78,7 +74,7 @@
                     <include name="**/*.jar" />
                 </fileset>
             </bootclasspath>
-        </javac>
+        </hy.javac>
     </target>
 
     <target name="findbugs" depends="build-jar">
@@ -122,9 +118,6 @@
         <copy todir="${tests.resources.hdk.dir}">
             <fileset dir="src/test/resources" />
         </copy>
-
-        <copy file="../../${junit.jar}"
-              tofile="${hy.hdk}/build/test/junit.jar" />
     </target>
 
     <target name="compile-tests">

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=926361&r1=926360&r2=926361&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/rmi/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/rmi/build.xml Mon Mar 22 21:46:10 2010
@@ -21,6 +21,7 @@
 
     <property name="hy.module" value="rmi" />
     <property name="hy.hdk" location="${basedir}/../../deploy" />
+    <property name="depends.dir" location="${basedir}/../../depends" />
     <import file="${hy.hdk}/build/ant/properties.xml" />
 
     <property file="../../make/depends.properties" />
@@ -62,14 +63,9 @@
 
         <mkdir dir="../../build/classes" />
 
-        <javac sourcepath=""
+        <hy.javac sourcepath=""
                srcdir="src/main/java"
-               destdir="../../build/classes"
-               compiler="${hy.javac.compiler}"
-               memoryMaximumSize="${hy.javac.maxmem}"
-               source="${hy.javac.source}" 
-               target="${hy.javac.target}"
-               debug="${hy.javac.debug}">
+               destdir="../../build/classes">
 
             <compilerarg line="${build.compilerarg}" />
 
@@ -78,7 +74,7 @@
                     <include name="**/*.jar" />
                 </fileset>
             </bootclasspath>
-        </javac>
+        </hy.javac>
     </target>
 
     <target name="findbugs" depends="build-jar">
@@ -123,9 +119,6 @@
             <fileset dir="src/test/resources" />
         </copy>
         <copy file="make/all.policy" todir="${tests.resources.hdk.dir}" />
-
-        <copy file="../../${junit.jar}"
-              tofile="${hy.hdk}/build/test/junit.jar" />
     </target>
 
     <target name="compile-tests">

Modified: harmony/enhanced/classlib/branches/java6/modules/security/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/security/build.xml?rev=926361&r1=926360&r2=926361&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/security/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/security/build.xml Mon Mar 22 21:46:10 2010
@@ -21,6 +21,7 @@
 
     <property name="hy.module" value="security" />
     <property name="hy.hdk" location="${basedir}/../../deploy" />
+    <property name="depends.dir" location="${basedir}/../../depends" />
     <import file="${hy.hdk}/build/ant/properties.xml" />
 
     <property file="../../make/depends.properties" />
@@ -75,13 +76,8 @@
 
         <mkdir dir="../../build/classes" />
 
-        <javac sourcepath=""
-               destdir="../../build/classes"
-               compiler="${hy.javac.compiler}"
-               memoryMaximumSize="${hy.javac.maxmem}"
-               source="${hy.javac.source}" 
-               target="${hy.javac.target}"
-               debug="${hy.javac.debug}">
+        <hy.javac sourcepath=""
+                  destdir="../../build/classes">
 
             <compilerarg line="${build.compilerarg}" />
 
@@ -95,7 +91,7 @@
                     <include name="**/*.jar" />
                 </fileset>
             </bootclasspath>
-        </javac>
+        </hy.javac>
     </target>
 
     <target name="findbugs" depends="build-jar">
@@ -152,9 +148,6 @@
                 </tokenfilter>
             </filterchain>
         </copy>
-
-        <copy file="../../${junit.jar}"
-              tofile="${hy.hdk}/build/test/junit.jar" />
     </target>
 
     <target name="compile-tests">

Modified: harmony/enhanced/classlib/branches/java6/modules/sound/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/sound/build.xml?rev=926361&r1=926360&r2=926361&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/sound/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/sound/build.xml Mon Mar 22 21:46:10 2010
@@ -21,6 +21,7 @@
 
     <property name="hy.module" value="sound" />
     <property name="hy.hdk" location="${basedir}/../../deploy" />
+    <property name="depends.dir" location="${basedir}/../../depends" />
     <import file="${hy.hdk}/build/ant/properties.xml" />
 
     <property file="../../make/depends.properties" />
@@ -62,14 +63,9 @@
 
         <mkdir dir="../../build/classes" />
 
-        <javac sourcepath=""
+        <hy.javac sourcepath=""
                srcdir="src/main/java"
-               destdir="../../build/classes"
-               compiler="${hy.javac.compiler}"
-               memoryMaximumSize="${hy.javac.maxmem}"
-               source="${hy.javac.source}" 
-               target="${hy.javac.target}"
-               debug="${hy.javac.debug}">
+               destdir="../../build/classes">
 
             <compilerarg line="${build.compilerarg}" />
 
@@ -78,7 +74,7 @@
                     <include name="**/*.jar" />
                 </fileset>
             </bootclasspath>
-        </javac>
+        </hy.javac>
     </target>
 
     <target name="findbugs" depends="build-jar">
@@ -118,9 +114,6 @@
                 </tokenfilter>
             </filterchain>
         </copy>
-
-        <copy file="../../${junit.jar}"
-              tofile="${hy.hdk}/build/test/junit.jar" />
     </target>
 
     <target name="copy-test-resources">



Mime
View raw message