harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r951681 [1/2] - in /harmony/enhanced/java/branches/mrh: ./ classlib/ classlib/depends/build/ classlib/depends/build/platform/ classlib/make/ classlib/modules/archive/make/ classlib/modules/archive/src/main/native/archive/unix/ classlib/modu...
Date Sat, 05 Jun 2010 08:54:09 GMT
Author: hindessm
Date: Sat Jun  5 08:54:06 2010
New Revision: 951681

URL: http://svn.apache.org/viewvc?rev=951681&view=rev
Log:
Merge changes from trunk@951343.

Added:
    harmony/enhanced/java/branches/mrh/classlib/modules/instrument/src/test/resources/jars/org/apache/harmony/tests/instrument/BCP.jar
      - copied unchanged from r951343, harmony/enhanced/java/trunk/classlib/modules/instrument/src/test/resources/jars/org/apache/harmony/tests/instrument/BCP.jar
    harmony/enhanced/java/branches/mrh/classlib/modules/instrument/src/test/resources/jars/org/apache/harmony/tests/instrument/BCPTest.jar
      - copied unchanged from r951343, harmony/enhanced/java/trunk/classlib/modules/instrument/src/test/resources/jars/org/apache/harmony/tests/instrument/BCPTest.jar
    harmony/enhanced/java/branches/mrh/drlvm/make/build.properties
      - copied unchanged from r951343, harmony/enhanced/java/trunk/drlvm/make/build.properties
    harmony/enhanced/java/branches/mrh/ibm-v4/make/build.properties
      - copied unchanged from r951343, harmony/enhanced/java/trunk/ibm-v4/make/build.properties
    harmony/enhanced/java/branches/mrh/jdktools/modules/jdktools/depends/bcel/
      - copied from r951343, harmony/enhanced/java/trunk/jdktools/modules/jdktools/depends/bcel/
    harmony/enhanced/java/branches/mrh/jdktools/modules/jdktools/depends/bcel/META-INF/
      - copied from r951343, harmony/enhanced/java/trunk/jdktools/modules/jdktools/depends/bcel/META-INF/
    harmony/enhanced/java/branches/mrh/jdktools/modules/jdktools/depends/bcel/META-INF/MANIFEST.MF
      - copied unchanged from r951343, harmony/enhanced/java/trunk/jdktools/modules/jdktools/depends/bcel/META-INF/MANIFEST.MF
Removed:
    harmony/enhanced/java/branches/mrh/classlib/modules/nio/src/main/java/common/java/nio/BaseByteBuffer.java
    harmony/enhanced/java/branches/mrh/classlib/modules/nio/src/main/java/common/java/nio/MappedByteBufferAdapter.java
    harmony/enhanced/java/branches/mrh/jdktools/modules/jdktools/depends/manifests/
Modified:
    harmony/enhanced/java/branches/mrh/   (props changed)
    harmony/enhanced/java/branches/mrh/build.xml
    harmony/enhanced/java/branches/mrh/classlib/   (props changed)
    harmony/enhanced/java/branches/mrh/classlib/build.xml
    harmony/enhanced/java/branches/mrh/classlib/depends/build/defines.mak
    harmony/enhanced/java/branches/mrh/classlib/depends/build/defines.mk
    harmony/enhanced/java/branches/mrh/classlib/depends/build/platform/aix.ppc32.mk
    harmony/enhanced/java/branches/mrh/classlib/depends/build/platform/aix.ppc64.mk
    harmony/enhanced/java/branches/mrh/classlib/depends/build/platform/freebsd.x86.mk
    harmony/enhanced/java/branches/mrh/classlib/depends/build/platform/freebsd.x86_64.mk
    harmony/enhanced/java/branches/mrh/classlib/depends/build/platform/macosx.x86.mk
    harmony/enhanced/java/branches/mrh/classlib/depends/build/platform/macosx.x86_64.mk
    harmony/enhanced/java/branches/mrh/classlib/depends/build/rules.mk
    harmony/enhanced/java/branches/mrh/classlib/make/depends-common.xml
    harmony/enhanced/java/branches/mrh/classlib/make/properties.xml
    harmony/enhanced/java/branches/mrh/classlib/modules/archive/make/exclude.linux.x86.drl.interm
    harmony/enhanced/java/branches/mrh/classlib/modules/archive/src/main/native/archive/unix/makefile
    harmony/enhanced/java/branches/mrh/classlib/modules/archive/src/main/native/archive/windows/makefile
    harmony/enhanced/java/branches/mrh/classlib/modules/archive/src/main/native/zip/unix/makefile
    harmony/enhanced/java/branches/mrh/classlib/modules/archive/src/main/native/zip/windows/makefile
    harmony/enhanced/java/branches/mrh/classlib/modules/auth/src/main/native/auth/unix/makefile
    harmony/enhanced/java/branches/mrh/classlib/modules/auth/src/main/native/auth/windows/makefile
    harmony/enhanced/java/branches/mrh/classlib/modules/awt/make/exclude.linux.x86_64.drl
    harmony/enhanced/java/branches/mrh/classlib/modules/awt/make/exclude.windows.x86_64.drl
    harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/native/fontlib/unix/makefile
    harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/native/fontlib/windows/makefile
    harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/native/gl/unix/makefile
    harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/native/gl/windows/makefile
    harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/native/jpegdecoder/unix/makefile
    harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/native/jpegdecoder/windows/makefile
    harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/native/lcmm/unix/makefile
    harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/native/lcmm/windows/makefile
    harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/native/linuxfont/unix/makefile
    harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/native/oglwrapper/unix/makefile
    harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/native/oglwrapper/windows/makefile
    harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/native/win32wrapper/windows/makefile
    harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/native/winfont/windows/makefile
    harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/native/x11wrapper/unix/makefile
    harmony/enhanced/java/branches/mrh/classlib/modules/imageio/make/exclude.linux.x86.ibm.interm
    harmony/enhanced/java/branches/mrh/classlib/modules/imageio/make/exclude.linux.x86_64.drl
    harmony/enhanced/java/branches/mrh/classlib/modules/imageio/src/main/native/jpegencoder/unix/makefile
    harmony/enhanced/java/branches/mrh/classlib/modules/imageio/src/main/native/jpegencoder/windows/makefile
    harmony/enhanced/java/branches/mrh/classlib/modules/imageio/src/main/native/pngencoder/unix/makefile
    harmony/enhanced/java/branches/mrh/classlib/modules/imageio/src/main/native/pngencoder/windows/makefile
    harmony/enhanced/java/branches/mrh/classlib/modules/instrument/src/main/native/instrument/shared/inst_agt.c
    harmony/enhanced/java/branches/mrh/classlib/modules/instrument/src/main/native/instrument/unix/makefile
    harmony/enhanced/java/branches/mrh/classlib/modules/instrument/src/main/native/instrument/windows/makefile
    harmony/enhanced/java/branches/mrh/classlib/modules/instrument/src/test/java/org/apache/harmony/tests/java/lang/instrument/InstrumentTest.java
    harmony/enhanced/java/branches/mrh/classlib/modules/lang-management/make/exclude.linux.x86.ibm
    harmony/enhanced/java/branches/mrh/classlib/modules/lang-management/make/exclude.linux.x86_64.ibm
    harmony/enhanced/java/branches/mrh/classlib/modules/lang-management/make/exclude.windows.x86.ibm
    harmony/enhanced/java/branches/mrh/classlib/modules/lang-management/make/exclude.zos.s390.ibm
    harmony/enhanced/java/branches/mrh/classlib/modules/lang-management/make/exclude.zos.s390x.ibm
    harmony/enhanced/java/branches/mrh/classlib/modules/luni/make/exclude.linux.x86.drl
    harmony/enhanced/java/branches/mrh/classlib/modules/luni/make/exclude.linux.x86.ibm
    harmony/enhanced/java/branches/mrh/classlib/modules/luni/make/exclude.linux.x86_64.drl
    harmony/enhanced/java/branches/mrh/classlib/modules/luni/make/exclude.linux.x86_64.ibm
    harmony/enhanced/java/branches/mrh/classlib/modules/luni/make/exclude.windows.x86.drl
    harmony/enhanced/java/branches/mrh/classlib/modules/luni/make/exclude.windows.x86.ibm
    harmony/enhanced/java/branches/mrh/classlib/modules/luni/make/exclude.windows.x86_64.drl
    harmony/enhanced/java/branches/mrh/classlib/modules/luni/src/main/java/java/lang/reflect/Proxy.java
    harmony/enhanced/java/branches/mrh/classlib/modules/luni/src/main/native/hyzip/unix/makefile
    harmony/enhanced/java/branches/mrh/classlib/modules/luni/src/main/native/hyzip/windows/makefile
    harmony/enhanced/java/branches/mrh/classlib/modules/luni/src/main/native/luni/unix/makefile
    harmony/enhanced/java/branches/mrh/classlib/modules/luni/src/main/native/luni/windows/OSFileSystemWin32.c
    harmony/enhanced/java/branches/mrh/classlib/modules/luni/src/main/native/luni/windows/makefile
    harmony/enhanced/java/branches/mrh/classlib/modules/luni/src/main/native/vmi/unix/makefile
    harmony/enhanced/java/branches/mrh/classlib/modules/misc/build.xml
    harmony/enhanced/java/branches/mrh/classlib/modules/misc/src/main/native/accessors/unix/makefile
    harmony/enhanced/java/branches/mrh/classlib/modules/misc/src/main/native/accessors/windows/makefile
    harmony/enhanced/java/branches/mrh/classlib/modules/nio/src/main/java/common/java/nio/DirectByteBuffer.java
    harmony/enhanced/java/branches/mrh/classlib/modules/nio/src/main/java/common/java/nio/HeapByteBuffer.java
    harmony/enhanced/java/branches/mrh/classlib/modules/nio/src/main/java/common/java/nio/MappedByteBuffer.java
    harmony/enhanced/java/branches/mrh/classlib/modules/nio/src/main/java/common/java/nio/ReadOnlyDirectByteBuffer.java
    harmony/enhanced/java/branches/mrh/classlib/modules/nio/src/main/java/common/java/nio/ReadWriteDirectByteBuffer.java
    harmony/enhanced/java/branches/mrh/classlib/modules/nio/src/main/java/common/org/apache/harmony/nio/internal/MappedByteBufferFactory.java
    harmony/enhanced/java/branches/mrh/classlib/modules/nio/src/main/native/nio/unix/makefile
    harmony/enhanced/java/branches/mrh/classlib/modules/nio/src/main/native/nio/windows/makefile
    harmony/enhanced/java/branches/mrh/classlib/modules/nio/src/test/java/common/org/apache/harmony/nio/tests/java/nio/MappedByteBufferTest.java
    harmony/enhanced/java/branches/mrh/classlib/modules/nio/src/test/java/common/org/apache/harmony/nio/tests/java/nio/channels/SocketChannelTest.java
    harmony/enhanced/java/branches/mrh/classlib/modules/portlib/build.xml
    harmony/enhanced/java/branches/mrh/classlib/modules/prefs/make/exclude.linux.x86.drl
    harmony/enhanced/java/branches/mrh/classlib/modules/prefs/make/exclude.linux.x86_64.drl
    harmony/enhanced/java/branches/mrh/classlib/modules/prefs/make/exclude.windows.x86.drl
    harmony/enhanced/java/branches/mrh/classlib/modules/prefs/make/exclude.windows.x86_64.drl
    harmony/enhanced/java/branches/mrh/classlib/modules/prefs/src/main/native/prefs/windows/makefile
    harmony/enhanced/java/branches/mrh/classlib/modules/security/src/main/native/security/windows/makefile
    harmony/enhanced/java/branches/mrh/classlib/modules/text/make/exclude.common
    harmony/enhanced/java/branches/mrh/classlib/modules/text/make/exclude.linux.x86_64.drl
    harmony/enhanced/java/branches/mrh/common_resources/   (props changed)
    harmony/enhanced/java/branches/mrh/common_resources/make/depends.properties
    harmony/enhanced/java/branches/mrh/common_resources/make/properties.xml
    harmony/enhanced/java/branches/mrh/common_resources/make/svn.xml
    harmony/enhanced/java/branches/mrh/debian/changelog
    harmony/enhanced/java/branches/mrh/debian/control
    harmony/enhanced/java/branches/mrh/drlvm/   (props changed)
    harmony/enhanced/java/branches/mrh/drlvm/make/vm/em.xml
    harmony/enhanced/java/branches/mrh/drlvm/make/vm/vmcore.xml
    harmony/enhanced/java/branches/mrh/jdktools/modules/jdktools/build.xml
    harmony/enhanced/java/branches/mrh/jdktools/modules/jpda/build.xml
    harmony/enhanced/java/branches/mrh/jdktools/modules/jpda/src/main/native/jdwp/unix/transport/dt_socket/SocketTransport_pd.h
    harmony/enhanced/java/branches/mrh/jdktools/modules/jretools/build.xml
    harmony/enhanced/java/branches/mrh/jdktools/modules/samsa/build.xml
    harmony/enhanced/java/branches/mrh/jdktools/modules/samsa/src/main/native/samsa/samsa.c

Propchange: harmony/enhanced/java/branches/mrh/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jun  5 08:54:06 2010
@@ -1,2 +1,2 @@
 /harmony/enhanced/java/branches/mrh:935751
-/harmony/enhanced/java/trunk:935751-946978
+/harmony/enhanced/java/trunk:935751-951343

Modified: harmony/enhanced/java/branches/mrh/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/build.xml?rev=951681&r1=951680&r2=951681&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/build.xml Sat Jun  5 08:54:06 2010
@@ -50,7 +50,10 @@ Thanks.
     <property name="vm.dir" value="drlvm" />
     <property name="vm.dir.loc" location="${vm.dir}" />
 
-    <property name="hy.local.zlib" value="false" />
+    <!-- import some vm-specific properties -->
+    <property file="${vm.dir.loc}/make/build.properties" />
+
+    <import file="common_resources/make/properties.xml" />
 
     <description>
         Apache Harmony project federation script
@@ -119,8 +122,7 @@ Usage:
     
     <target name="bundle-src" 
         description="assemble source snapshot"
-        depends="clean,
-                 setup,
+        depends="setup,
                  copy-src,
                  bundle-src-tgz,
                  bundle-src-zip" />
@@ -454,6 +456,8 @@ Usage:
         <propertyref name="use.libstdc++5" />
         <propertyref name="harmony.java.version" />
         <propertyref name="is.federated.build" />
+        <propertyref name="hy.no.thr" />
+        <propertyref name="hy.zip.api" />
     </propertyset>
     
     <target name="build-classlib"
@@ -670,99 +674,51 @@ Usage:
     <!-- ============================================================== -->
     <!-- sets up a platform                                             -->
     <!-- ============================================================== -->
-    <target name="init" depends="-svn-prop">
-        <!-- Determine our operating system -->
-        <condition property="is.windows">
-            <os family="windows" />
-        </condition>
-
-        <condition property="is.unix">
-            <os family="unix" />
-        </condition>
+    <target name="init" depends="-svn-info">
 
-        <condition property="is.linux">
-            <os name="linux" />
-        </condition>
-
-        <!-- this special case makes sense -->
-        <condition property="harmony.os" value="windows">
-            <isset property="is.windows"/>
-        </condition>
-        <condition property="harmony.os" value="linux">
-            <os name="linux" />
-        </condition>
-
-        <property name="harmony.os" value="${os.name}" />
+        <property name="harmony.version" value="${svn.revision}" />
+        <property name="harmony.long.version" value="${svn.info}" />
 
-        <!-- Conditions for different architectures -->
-        <condition property="is.x86_64">
-            <os arch="x86_64"/>
-        </condition>
-        <condition property="is.x86">
-            <or>
-                <os arch="x86"/>
-                <os arch="i386"/>
-            </or>
-        </condition>
-        <condition property="is.ia64">
-            <os arch="ia64" />
-        </condition>
-        <condition property="is.64bit">
-            <or>
-                <os arch="ia64" />
-                <os arch="x86_64"/>
-            </or>
-        </condition>
-        <condition property="is.32bit">
-            <or>
-                <os arch="x86"/>
-                <os arch="i386"/>
-            </or>
+        <condition property="version.prefix" value="select-">
+            <istrue value="${hy.select}" />
         </condition>
+        <property name="version.prefix" value="" />
 
-        <!-- Normalized architecture name -->
-        <condition property="harmony.arch" value="x86">
-            <isset property="is.x86" />
-        </condition>
-        <condition property="harmony.arch" value="x86_64">
-            <or>
-                <os arch="x86_64"/>
-                <os arch="amd64"/>
-                <os arch="em64t"/>
-            </or>
+        <condition property="vm.prefix" value="">
+            <equals arg1="drlvm" arg2="${vm.dir}" />
         </condition>
-        <property name="harmony.arch" value="${os.arch}" />
+        <property name="vm.prefix" value="${vm.dir}-" />
 
         <property name="harmony.deploy.suffix" value="-snapshot" />
 
         <property name="harmony.java.version" value="5.0" />
 
         <property name="deploy.file.prefix"
-                  value="apache-harmony-${harmony.java.version}-" />
+            value="apache-harmony-${version.prefix}${harmony.java.version}-${vm.prefix}" />
 
         <property name="archive.dir.prefix"
-                  value="harmony-${harmony.java.version}-" />
+            value="harmony-${version.prefix}${harmony.java.version}-${vm.prefix}" />
 
         <property name="deploy.hdk.file.prefix"
                  value="${deploy.file.prefix}hdk-r${harmony.version}" />
         <property name="deploy.hdk.tar"
-                 value="${deploy.hdk.file.prefix}-${harmony.os}-${harmony.arch}${harmony.deploy.suffix}.tar.gz" />
+                 value="${deploy.hdk.file.prefix}-${hy.os}-${hy.arch}${harmony.deploy.suffix}.tar.gz" />
         <property name="deploy.hdk.zip"
-                 value="${deploy.hdk.file.prefix}-${harmony.os}-${harmony.arch}${harmony.deploy.suffix}.zip" />
+                 value="${deploy.hdk.file.prefix}-${hy.os}-${hy.arch}${harmony.deploy.suffix}.zip" />
 
         <property name="deploy.jdk.file.prefix"
                  value="${deploy.file.prefix}jdk-r${harmony.version}" />
         <property name="deploy.jdk.tar"
-                 value="${deploy.jdk.file.prefix}-${harmony.os}-${harmony.arch}${harmony.deploy.suffix}.tar.gz" />
+                 value="${deploy.jdk.file.prefix}-${hy.os}-${hy.arch}${harmony.deploy.suffix}.tar.gz" />
         <property name="deploy.jdk.zip"
-                 value="${deploy.jdk.file.prefix}-${harmony.os}-${harmony.arch}${harmony.deploy.suffix}.zip" />
+                 value="${deploy.jdk.file.prefix}-${hy.os}-${hy.arch}${harmony.deploy.suffix}.zip" />
 
         <property name="deploy.jre.file.prefix"
                  value="${deploy.file.prefix}jre-r${harmony.version}" />
         <property name="deploy.jre.tar"
-                 value="${deploy.jre.file.prefix}-${harmony.os}-${harmony.arch}${harmony.deploy.suffix}.tar.gz" />
+                 value="${deploy.jre.file.prefix}-${hy.os}-${hy.arch}${harmony.deploy.suffix}.tar.gz" />
         <property name="deploy.jre.zip"
-                 value="${deploy.jre.file.prefix}-${harmony.os}-${harmony.arch}${harmony.deploy.suffix}.zip" />
+                 value="${deploy.jre.file.prefix}-${hy.os}-${hy.arch}${harmony.deploy.suffix}.zip" />
 
         <property name="deploy.src.file.prefix"
                  value="${deploy.file.prefix}src-r${harmony.version}" />
@@ -789,56 +745,18 @@ Usage:
                    Apache Harmony Federated Build
             ==========================================
             svn rev          :  ${harmony.version}
-            operating system :  ${harmony.os}
-            CPU architecture :  ${harmony.arch}
+            operating system :  ${hy.os}
+            CPU architecture :  ${hy.arch}
             ant os name/arch :  ${os.name}/${os.arch}
             hosting Java     :  ${java.version} (${java.vendor})
             build mode       :  ${hy.cfg}
             output location  :  ${target.dir}
             SVN root         :  ${svn.root}
+            archive.dir      :  ${archive.dir.prefix}
+            archive.name     :  ${deploy.file.prefix}
         </echo>
     </target>
 
-    <!-- ============================================================== -->
-    <!-- svn-prop: gets svn revision number of the build.xml file       -->
-    <!-- ============================================================== -->
-    <target name="-svn-prop">
-        
-        <tempfile suffix=".xml" property="svn.tmp"/>
-        <exec executable="svn" output="${svn.tmp}" resultproperty="svn.rc">
-            <arg line="info ${basedir} --non-interactive --xml" />
-        </exec>
-        <condition property="svn.info.file" value="${svn.tmp}">
-            <equals arg1="0" arg2="${svn.rc}"/>
-        </condition>
-        <xmlproperty file="${svn.info.file}" prefix="federated" 
-            keeproot="no" collapseAttributes="yes"/>
-        <delete file="${svn.tmp}" quiet="true"/>
-
-        <condition property="is.svn">
-            <isset property="federated.entry.revision"/>
-        </condition>
-
-        <condition property="svn.revision" value="${federated.entry.revision}" else="unknown">
-            <isset property="is.svn"/>
-        </condition>
-            <condition property="svn.root" 
-                value="${federated.entry.repository.root}"
-                else="http://svn.apache.org/repos/asf">
-                <isset property="is.svn"/>
-            </condition>
-
-        <condition property="svn.info" value="${svn.root} ${svn.revision}">
-            <isset property="is.svn"/>
-        </condition>
-        <tstamp>
-            <format property="svn.info" pattern="'Unknown revision at' dd-MMM-yyyy hh:mm aa"/>
-        </tstamp>
-
-        <property name="harmony.version" value="${svn.revision}" />
-        <property name="harmony.long.version" value="${svn.info}" />
-
-    </target>
 
     <target name="bundle-src-tgz" depends="init" if="is.unix">
 

Propchange: harmony/enhanced/java/branches/mrh/classlib/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jun  5 08:54:06 2010
@@ -1,4 +1,4 @@
 /harmony/enhanced/classlib/trunk:926318-926838
 /harmony/enhanced/java/branches/mrh/classlib:935751
-/harmony/enhanced/java/trunk/classlib:935751-946978
+/harmony/enhanced/java/trunk/classlib:935751-951343
 /harmony/enhanced/trunk/classlib:476395-926317

Modified: harmony/enhanced/java/branches/mrh/classlib/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/build.xml?rev=951681&r1=951680&r2=951681&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/build.xml Sat Jun  5 08:54:06 2010
@@ -78,11 +78,11 @@ module:
     <property name="tests.output" location="build/test_report" />
     <property name="tests.support.output" location="build/test_support" />
     <property name="tests.report.dir" value="${tests.output}/html"/>
-    <property file="make/depends.properties" />
 
     <!-- import properties for snapshot targets -->
     <import file="make/properties.xml" />
     <import file="make/depends.xml" />
+    <property file="make/depends.properties" />
 
     <condition property="needs.vme.v3.hack" value="true">
         <or>

Modified: harmony/enhanced/java/branches/mrh/classlib/depends/build/defines.mak
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/depends/build/defines.mak?rev=951681&r1=951680&r2=951681&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/depends/build/defines.mak (original)
+++ harmony/enhanced/java/branches/mrh/classlib/depends/build/defines.mak Sat Jun  5 08:54:06 2010
@@ -13,6 +13,8 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
+!include <$(HY_HDK)/build/make/properties.mak>
+
 !ifndef APPVER
 APPVER=4.0 #Default Windows version
 !endif

Modified: harmony/enhanced/java/branches/mrh/classlib/depends/build/defines.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/depends/build/defines.mk?rev=951681&r1=951680&r2=951681&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/depends/build/defines.mk (original)
+++ harmony/enhanced/java/branches/mrh/classlib/depends/build/defines.mk Sat Jun  5 08:54:06 2010
@@ -17,17 +17,21 @@
 # Configuration Makefile
 #
 
+include $(HY_HDK)/build/make/properties.mk
+
 CXX = $(CC)
 CPP = $(CC) -E
 AS = as
 AR = ar
 RANLIB=echo
-ARFLAGS = rcv
+ARFLAGS =
+ARCREATE = rcv
+AREXTRACT = xo
 DLL_LD = $(CC)
 DLL_LDFLAGS = -shared -Wl,-soname=$(@F) -Wl,--version-script,$(EXPFILE)
 CXX_DLL_LD = $(CXX)
 STDCLIBS = -lstdc++
-OSLIBS = -lc -lm
+OSLIBS = -lc
 XLIBS = -L/usr/X11R6/lib -lX11 -lXft -lXext -lXtst
 MDLLIBPREFIX = -Xlinker --start-group
 MDLLIBSUFFIX = -Xlinker --end-group
@@ -77,11 +81,3 @@ endif
 ifeq ($(HY_ZIP_API),true)
 DEFINES += -DHY_ZIP_API
 endif
-
-ifeq ($(HY_LOCAL_ZLIB),true)
-DEFINES += -DHY_LOCAL_ZLIB
-OSLIBS += -lz
-MDLLIBZLIB =
-else
-MDLLIBZLIB += $(DLLPATH)libhyzlib$(HY_LINKLIB_SUFFIX)
-endif

Modified: harmony/enhanced/java/branches/mrh/classlib/depends/build/platform/aix.ppc32.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/depends/build/platform/aix.ppc32.mk?rev=951681&r1=951680&r2=951681&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/depends/build/platform/aix.ppc32.mk (original)
+++ harmony/enhanced/java/branches/mrh/classlib/depends/build/platform/aix.ppc32.mk Sat Jun  5 08:54:06 2010
@@ -18,14 +18,14 @@ DEFINES += -DAIX -DAIX_PPC32 -DHYPPC32 -
 PLATFORM += -qcpluscmt -q32 -q mbcs -qlanglvl=extended -qarch=ppc -qinfo=pro \
 	    -qalias=noansi -D_XOPEN_SOURCE_EXTENDED=1 -D_ALL_SOURCE \
             -D_LARGE_FILES -qsuppress=1500-010
-OSLIBS = -lc_r -lC_r -lm -lpthread -liconv
+OSLIBS = -lc_r -lC_r -lpthread -liconv
 XLIBS = -L/opt/freeware/lib -lX11 -lXft -lfreetype -lfontconfig -lXext -lXtst
 STDCLIBS = 
 WARNFLAGS =
 HYDEBUGCFLAGS = -g -O0
 HYRELEASEFLAGS = -s -O3 -DNDEBUG
 
-ARFLAGS = -X32 rcv
+ARFLAGS = -X32
 ASFLAGS += -a32 -mppc
 DLL_LD = $(LD)
 DLL_LDFLAGS = -bE:$(EXPFILE)

Modified: harmony/enhanced/java/branches/mrh/classlib/depends/build/platform/aix.ppc64.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/depends/build/platform/aix.ppc64.mk?rev=951681&r1=951680&r2=951681&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/depends/build/platform/aix.ppc64.mk (original)
+++ harmony/enhanced/java/branches/mrh/classlib/depends/build/platform/aix.ppc64.mk Sat Jun  5 08:54:06 2010
@@ -18,14 +18,14 @@ DEFINES += -DAIX -DAIX_PPC64 -DHYPPC64 -
 PLATFORM += -qcpluscmt -q64 -DPPC64 -q mbcs -qlanglvl=extended -qarch=ppc \
             -qinfo=pro -qalias=noansi -D_XOPEN_SOURCE_EXTENDED=1 -D_ALL_SOURCE \
             -D_LARGE_FILES -qsuppress=1500-010
-OSLIBS = -lc_r -lC_r -lm -lpthread -liconv
+OSLIBS = -lc_r -lC_r -lpthread -liconv
 XLIBS = -L/opt/freeware/lib -lX11 -lXft -lfreetype -lfontconfig -lXext -lXtst
 STDCLIBS = 
 WARNFLAGS =
 HYDEBUGCFLAGS = -g -O0
 HYRELEASEFLAGS = -s -O3 -DNDEBUG
 
-ARFLAGS = -X64 rcv
+ARFLAGS = -X64
 ASFLAGS += -a64 -many
 DLL_LD = $(LD)
 DLL_LDFLAGS = -bE:$(EXPFILE)

Modified: harmony/enhanced/java/branches/mrh/classlib/depends/build/platform/freebsd.x86.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/depends/build/platform/freebsd.x86.mk?rev=951681&r1=951680&r2=951681&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/depends/build/platform/freebsd.x86.mk (original)
+++ harmony/enhanced/java/branches/mrh/classlib/depends/build/platform/freebsd.x86.mk Sat Jun  5 08:54:06 2010
@@ -16,6 +16,6 @@
 DEFINES += -DFREEBSD -DFREEBSD_X86 -DHYX86 -DNEEDS_SYS_TYPES \
            -DIPv6_FUNCTION_SUPPORT
 PLATFORM += -march=pentium3
-OSLIBS = -L/usr/local/lib -lpthread -lm
+OSLIBS = -L/usr/local/lib -lpthread
 INCLUDES += -I/usr/local/include
 XLIBS = -lX11 -lXft -lXext -lXtst

Modified: harmony/enhanced/java/branches/mrh/classlib/depends/build/platform/freebsd.x86_64.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/depends/build/platform/freebsd.x86_64.mk?rev=951681&r1=951680&r2=951681&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/depends/build/platform/freebsd.x86_64.mk (original)
+++ harmony/enhanced/java/branches/mrh/classlib/depends/build/platform/freebsd.x86_64.mk Sat Jun  5 08:54:06 2010
@@ -15,6 +15,6 @@
 
 DEFINES += -DFREEBSD -DFREEBSD_X86_64 -DHYX86_64 -DNEEDS_SYS_TYPES \
            -DIPv6_FUNCTION_SUPPORT
-OSLIBS = -L/usr/local/lib -lpthread -lm
+OSLIBS = -L/usr/local/lib -lpthread
 INCLUDES += -I/usr/local/include
 XLIBS = -lX11 -lXft -lXext -lXtst

Modified: harmony/enhanced/java/branches/mrh/classlib/depends/build/platform/macosx.x86.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/depends/build/platform/macosx.x86.mk?rev=951681&r1=951680&r2=951681&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/depends/build/platform/macosx.x86.mk (original)
+++ harmony/enhanced/java/branches/mrh/classlib/depends/build/platform/macosx.x86.mk Sat Jun  5 08:54:06 2010
@@ -22,7 +22,7 @@ DEFINES += -DMACOSX -DMACOSX_X86 -DHYX86
 INCLUDES += -I/opt/local/include
 PLATFORM = -fPIC -fno-common -arch i386 -mmacosx-version-min=10.5
 ASFLAGS += -arch i386
-OSLIBS = -L/opt/local/lib -lc -lm -ldl -liconv
+OSLIBS = -L/opt/local/lib -lc -ldl -liconv
 XLIBS = -L/usr/X11R6/lib -lX11 -lXft -lXext -lXtst -lXrender -lexpat \
         -lfreetype -lfontconfig
 MDLLIBPREFIX =

Modified: harmony/enhanced/java/branches/mrh/classlib/depends/build/platform/macosx.x86_64.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/depends/build/platform/macosx.x86_64.mk?rev=951681&r1=951680&r2=951681&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/depends/build/platform/macosx.x86_64.mk (original)
+++ harmony/enhanced/java/branches/mrh/classlib/depends/build/platform/macosx.x86_64.mk Sat Jun  5 08:54:06 2010
@@ -20,7 +20,7 @@ INCLUDES += -I/opt/local/include
 PLATFORM = -fPIC -fno-common -arch x86_64 -mmacosx-version-min=10.5
 ASFLAGS += -arch x86_64
 # WARNFLAGS += -Wconversion -Wformat -Wshorten-64-to-32
-OSLIBS = -L/opt/local/lib -lc -lm -ldl -liconv
+OSLIBS = -L/opt/local/lib -lc -ldl -liconv
 XLIBS = -L/usr/X11R6/lib -lX11 -lXft -lXext -lXtst -lXrender -lexpat \
         -lfreetype -lfontconfig
 MDLLIBPREFIX =

Modified: harmony/enhanced/java/branches/mrh/classlib/depends/build/rules.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/depends/build/rules.mk?rev=951681&r1=951680&r2=951681&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/depends/build/rules.mk (original)
+++ harmony/enhanced/java/branches/mrh/classlib/depends/build/rules.mk Sat Jun  5 08:54:06 2010
@@ -37,7 +37,7 @@ endif
 all: $(DLLNAME) $(EXENAME) $(LIBNAME)
 
 $(LIBNAME): $(BUILDFILES)
-	$(AR) $(ARFLAGS) $@ $(BUILDFILES)
+	$(AR) $(ARFLAGS) $(ARCREATE) $@ $(BUILDFILES)
 	$(RANLIB) $@
 
 $(EXPFILE): exports.txt

Modified: harmony/enhanced/java/branches/mrh/classlib/make/depends-common.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/make/depends-common.xml?rev=951681&r1=951680&r2=951681&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/make/depends-common.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/make/depends-common.xml Sat Jun  5 08:54:06 2010
@@ -25,9 +25,7 @@
     where possible.
     </description>
 
-    <!-- temporary workaround for Ant bug 47382 - to be removed when that is resolved and released -->
-    <copy file="${basedir}/make/depends.properties" tofile="${basedir}/make/depends.properties.ascii" outputencoding="ISO-8859-1" />
-    <loadproperties srcfile="${basedir}/make/depends.properties.ascii" encoding="ISO-8859-1">
+    <loadproperties srcfile="${basedir}/make/depends.properties">
       <filterchain>
         <filterreader classname="org.apache.tools.ant.filters.ReplaceTokens">
             <param type="token" name="${hy.arch}" value=""/>
@@ -37,7 +35,6 @@
         </filterreader>
       </filterchain>
     </loadproperties>
-    <delete file="${basedir}/make/depends.properties.ascii" />
 
     <macrodef name="download-one-file">
         <attribute name="src" />

Modified: harmony/enhanced/java/branches/mrh/classlib/make/properties.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/make/properties.xml?rev=951681&r1=951680&r2=951681&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/make/properties.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/make/properties.xml Sat Jun  5 08:54:06 2010
@@ -259,6 +259,11 @@
     </condition>
     <property name="make.arg" value="" />
 
+    <condition property="make.suffix" value="mak">
+        <isset property="is.windows"/>
+    </condition>
+    <property name="make.suffix" value="mk" />
+
     <condition property="png.home" value="/usr/local">
         <isset property="is.freebsd"/>
     </condition>
@@ -283,6 +288,13 @@
     </condition>
     <property name="jpeg.home" value="/usr" />
     
+    <condition property="is.select" value="true">
+        <istrue value="${hy.select}" />
+    </condition>
+    <condition property="is.not.select" value="true">
+        <not><istrue value="${hy.select}" /></not>
+    </condition>
+
     <!-- default property for poll-modules macro - i.e. all modules -->
     <property name="build.module" value="*" />
     <condition property="exclude.module"
@@ -306,23 +318,22 @@
     <!-- flags -->
     <property name="hy.no.thr" value="false" />
     <condition property="hy.skip.thr" value="true">
-        <not>
-            <equals arg1="${hy.no.thr}" arg2="false" />
-        </not>
+        <istrue value="${hy.no.thr}" />
+    </condition>
+
+    <property name="hy.thr.no.deploy" value="false" />
+    <condition property="hy.thr.deploy" value="true">
+        <equals arg1="${hy.thr.no.deploy}" arg2="false" />
     </condition>
 
     <property name="hy.local.zlib" value="false" />
     <condition property="hy.skip.zlib" value="true">
-        <not>
-            <equals arg1="${hy.local.zlib}" arg2="false" />
-        </not>
+        <istrue value="${hy.local.zlib}" />
     </condition>
 
     <property name="hy.zip.api" value="false" />
     <condition property="hy.skip.zip.api" value="true">
-        <not>
-            <equals arg1="${hy.zip.api}" arg2="true" />
-        </not>
+        <isfalse value="${hy.zip.api}" />
      </condition>
 
     <condition property="hy.portlib.stubs" value="true">
@@ -561,6 +572,8 @@ properties in preference to these:
                 <property name="hy.hdk" value="${hy.hdk}"/>
                 <property name="svn.revision" value="${svn.revision}"/>
                 <property name="svn.info" value="${svn.info}"/>
+                <property name="hy.no.thr" value="${hy.no.thr}"/>
+                <property name="hy.zip.api" value="${hy.zip.api}"/>
                 <fileset dir="@{dir}" includes="@{includes}" excludes="@{excludes}">
                     <containsregexp expression="&lt;target[^&gt;]*name=&quot;@{target}&quot;"/>
                 </fileset>
@@ -577,21 +590,23 @@ properties in preference to these:
         <element name="make-elements" optional="true" />
         <sequential>
             <echo>Making "@{target}" in @{dir}</echo>
+            <echo file="${hy.hdk}/build/make/properties.${make.suffix}">
+HY_ZIP_API=${hy.zip.api}
+HY_PORTLIB_STUBS=${hy.portlib.stubs}
+HY_CFG=${hy.cfg}
+HY_ARCH=${hy.arch}
+HY_OS=${hy.os}
+HY_PLATFORM=${hy.platform}
+HY_NO_THR=${hy.no.thr}
+HY_THR_NO_DEPLOY=${hy.thr.no.deploy}
+HY_LOCAL_ZLIB=${hy.local.zlib}
+HY_SHLIB_SUFFIX=${shlib.suffix}
+HY_LINKLIB_SUFFIX=${linklib.suffix}
+            </echo>                
             <exec failonerror="true"
                   executable="${make.command}"
                   dir="@{dir}">
-                <env key="HY_ZIP_API" value="${hy.zip.api}" />
-                <env key="HY_PORTLIB_STUBS" value="${hy.portlib.stubs}" />
                 <env key="HY_HDK" value="${hy.hdk}" />
-                <env key="HY_CFG" value="${hy.cfg}" />
-                <env key="HY_ARCH" value="${hy.arch}" />
-                <env key="HY_OS" value="${hy.os}" />
-                <env key="HY_PLATFORM" value="${hy.platform}" />
-                <env key="HY_NO_THR" value="${hy.no.thr}" />
-                <env key="HY_THR_NO_DEPLOY" value="${hy.thr.nodeploy}" />
-                <env key="HY_LOCAL_ZLIB" value="${hy.local.zlib}" />
-                <env key="HY_SHLIB_SUFFIX" value="${shlib.suffix}" />
-                <env key="HY_LINKLIB_SUFFIX" value="${linklib.suffix}" />
                 <arg line="${make.arg}" />
                 <arg line="@{target}" />
                 <make-elements />
@@ -1071,6 +1086,7 @@ Alternatively, you can switch to another
                 </fileset>
             </auxClasspath>
             <sourcePath path="src/main/java" />
+            <sourcePath path="src/main/java5" />
             <sourcePath path="src/main/java/common" />
             <sourcePath path="src/main/java/${hy.os.family}" />
             <class location="@{jarFile}" />

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/archive/make/exclude.linux.x86.drl.interm
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/archive/make/exclude.linux.x86.drl.interm?rev=951681&r1=951680&r2=951681&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/archive/make/exclude.linux.x86.drl.interm (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/archive/make/exclude.linux.x86.drl.interm Sat Jun  5 08:54:06 2010
@@ -1,3 +0,0 @@
-#2921
-org/apache/harmony/archive/tests/java/util/zip/GZIPInputStreamTest.java
-org/apache/harmony/archive/tests/java/util/jar/JarInputStreamTest.java

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/archive/src/main/native/archive/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/archive/src/main/native/archive/unix/makefile?rev=951681&r1=951680&r2=951681&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/archive/src/main/native/archive/unix/makefile (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/archive/src/main/native/archive/unix/makefile Sat Jun  5 08:54:06 2010
@@ -29,9 +29,15 @@ ifneq ($(HY_ZIP_API),true)
 MDLLIBFILES +=	$(LIBPATH)libhyzip.a
 endif
 
+ifeq ($(HY_LOCAL_ZLIB),true)
+DEFINES += -DHY_LOCAL_ZLIB
+OSLIBS += -lz
+else
+MDLLIBZLIB += $(DLLPATH)libhyzlib$(HY_LINKLIB_SUFFIX)
+endif
+
 MDLLIBFILES += \
-	$(MDLLIBZLIB) $(LIBPATH)libhypool.a \
-	$(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX)
+	$(MDLLIBZLIB) $(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX)
 
 DLLNAME=$(DLLPATH)libhyarchive$(HY_SHLIB_SUFFIX)
 EXPNAME=HYARCHIVE_0.1

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/archive/src/main/native/archive/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/archive/src/main/native/archive/windows/makefile?rev=951681&r1=951680&r2=951681&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/archive/src/main/native/archive/windows/makefile (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/archive/src/main/native/archive/windows/makefile Sat Jun  5 08:54:06 2010
@@ -42,7 +42,6 @@ MDLLIBFILES = $(MDLLIBFILES) $(LIBPATH)h
 
 MDLLIBFILES = $(MDLLIBFILES) \
         $(LIBPATH)hyzlib$(HY_LINKLIB_SUFFIX) \
-	$(LIBPATH)hypool$(HY_LINKLIB_SUFFIX) \
 	$(LIBPATH)vmi$(HY_LINKLIB_SUFFIX)
 DLLBASE=0x13100000
 

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/archive/src/main/native/zip/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/archive/src/main/native/zip/unix/makefile?rev=951681&r1=951680&r2=951681&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/archive/src/main/native/zip/unix/makefile (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/archive/src/main/native/zip/unix/makefile Sat Jun  5 08:54:06 2010
@@ -22,7 +22,11 @@ include $(HY_HDK)/build/make/defines.mk
 INCLUDES += -I../../zlib_dist
 
 BUILDFILES = $(SHAREDSUB)zcpool.o $(SHAREDSUB)zipalloc.o \
-	$(SHAREDSUB)zipcache.o $(SHAREDSUB)zipsup.o
+	$(SHAREDSUB)zipcache.o $(SHAREDSUB)zipsup.o pool.o pool_cap.o
+
 LIBNAME = $(LIBPATH)libhyzip.a
 
+%.o: $(LIBPATH)libhypool.a(%.o)
+	ar $(ARFLAGS) xo $(LIBPATH)libhypool.a $@
+
 include $(HY_HDK)/build/make/rules.mk

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/archive/src/main/native/zip/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/archive/src/main/native/zip/windows/makefile?rev=951681&r1=951680&r2=951681&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/archive/src/main/native/zip/windows/makefile (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/archive/src/main/native/zip/windows/makefile Sat Jun  5 08:54:06 2010
@@ -22,7 +22,8 @@
 LIBBASE=hyzip
 LIBNAME=$(LIBPATH)$(LIBBASE).lib
 BUILDFILES = $(SHAREDSUB)zcpool.obj $(SHAREDSUB)zipalloc.obj \
-	$(SHAREDSUB)zipcache.obj $(SHAREDSUB)zipsup.obj
+	$(SHAREDSUB)zipcache.obj $(SHAREDSUB)zipsup.obj \
+        $(LIBPATH)hypool$(HY_LINKLIB_SUFFIX)
 HYCFLAGS = $(HYCFLAGS) /I..\..\zlib_dist
 
 !include <$(HY_HDK)\build\make\rules.mak>

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/auth/src/main/native/auth/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/auth/src/main/native/auth/unix/makefile?rev=951681&r1=951680&r2=951681&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/auth/src/main/native/auth/unix/makefile (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/auth/src/main/native/auth/unix/makefile Sat Jun  5 08:54:06 2010
@@ -21,13 +21,7 @@ include $(HY_HDK)/build/make/defines.mk
 
 BUILDFILES = $(SHAREDSUB)auth_copyright.o authnix.o
 
-ifneq ($(HY_ZIP_API),true)
-MDLLIBFILES += $(LIBPATH)libhyzip.a $(MDLLIBZLIB)
-endif
-
-MDLLIBFILES += \
-        $(LIBPATH)libhypool.a \
-	$(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX)
+MDLLIBFILES += $(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX)
 
 DLLNAME = $(DLLPATH)libhyauth$(HY_SHLIB_SUFFIX)
 EXPNAME = HYAUTH_0.1

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/auth/src/main/native/auth/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/auth/src/main/native/auth/windows/makefile?rev=951681&r1=951680&r2=951681&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/auth/src/main/native/auth/windows/makefile (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/auth/src/main/native/auth/windows/makefile Sat Jun  5 08:54:06 2010
@@ -28,13 +28,7 @@ HYLDFLAGS = $(HYLDFLAGS) -def:$(LIBBASE)
 
 SYSLIBFILES = ws2_32.lib Iphlpapi.lib
 
-!IF "$(HY_ZIP_API)" != "true"
-MDLLIBFILES = $(MDLLIBFILES) \
-	$(LIBPATH)hyzip$(HY_LINKLIB_SUFFIX) $(LIBPATH)hyzlib$(HY_LINKLIB_SUFFIX)
-!ENDIF
-
-MDLLIBFILES = $(MDLLIBFILES) $(LIBPATH)hypool$(HY_LINKLIB_SUFFIX) \
-	$(LIBPATH)vmi$(HY_LINKLIB_SUFFIX)
+MDLLIBFILES = $(MDLLIBFILES) $(LIBPATH)vmi$(HY_LINKLIB_SUFFIX)
 DLLBASE=0x1300000
 
 !include <$(HY_HDK)\build\make\rules.mak>

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/awt/make/exclude.linux.x86_64.drl
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/awt/make/exclude.linux.x86_64.drl?rev=951681&r1=951680&r2=951681&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/awt/make/exclude.linux.x86_64.drl (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/awt/make/exclude.linux.x86_64.drl Sat Jun  5 08:54:06 2010
@@ -13,9 +13,3 @@ java/awt/font/TextMeasurerTest.java
 java/awt/font/LineBreakMeasurerTest.java
 java/awt/ButtonRTest.java
 java/awt/KeyboardFocusManagerRTest.java
-
-#HARMONY-4181
-java/awt/geom/AreaTest.java
-
-#HARMONY-4307
-org/apache/harmony/awt/ListenerListTest.java

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/awt/make/exclude.windows.x86_64.drl
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/awt/make/exclude.windows.x86_64.drl?rev=951681&r1=951680&r2=951681&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/awt/make/exclude.windows.x86_64.drl (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/awt/make/exclude.windows.x86_64.drl Sat Jun  5 08:54:06 2010
@@ -12,9 +12,3 @@ java/awt/image/MultiPixelPackedSampleMod
 java/awt/image/SinglePixelPackedSampleModelTest.java
 org/apache/harmony/awt/gl/MultiRectAreaLineCashTest.java
 org/apache/harmony/awt/tests/nativebridge/PointerPointerTest.java
-
-#HARMONY-4181
-java/awt/geom/AreaTest.java
-
-#HARMONY-4307
-org/apache/harmony/awt/ListenerListTest.java

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/native/fontlib/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/native/fontlib/unix/makefile?rev=951681&r1=951680&r2=951681&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/native/fontlib/unix/makefile (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/native/fontlib/unix/makefile Sat Jun  5 08:54:06 2010
@@ -32,13 +32,6 @@ BUILDFILES = \
   FontLibExports.o \
   $(SHAREDSUB)TypeDefinition.o
 
-ifneq ($(HY_ZIP_API),true)
-MDLLIBFILES += $(LIBPATH)libhyzip.a $(MDLLIBZLIB)
-endif
-
-MDLLIBFILES += \
-	$(LIBPATH)libhypool.a $(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX)
-
 OSLIBS += $(STDCLIBS)
 
 DLLNAME=$(DLLPATH)libFL$(HY_LINKLIB_SUFFIX)

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/native/fontlib/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/native/fontlib/windows/makefile?rev=951681&r1=951680&r2=951681&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/native/fontlib/windows/makefile (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/native/fontlib/windows/makefile Sat Jun  5 08:54:06 2010
@@ -41,9 +41,7 @@ BUILDFILES = \
 VIRTFILES = $(LIBBASE).res
 SYSLIBFILES = ws2_32.lib Iphlpapi.lib
 
-MDLLIBFILES = $(MDLLIBFILES) \
-  $(LIBPATH)hypool.lib $(LIBPATH)vmi.lib \
-  $(LIBPATH)hyzlib.lib 
+MDLLIBFILES = $(MDLLIBFILES) $(LIBPATH)hyzlib.lib 
 
 DLLBASE=0x13300000
 

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/native/gl/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/native/gl/unix/makefile?rev=951681&r1=951680&r2=951681&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/native/gl/unix/makefile (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/native/gl/unix/makefile Sat Jun  5 08:54:06 2010
@@ -34,14 +34,6 @@ BUILDFILES = \
 
 OSLIBS += -lpng
 
-ifneq ($(HY_ZIP_API),true)
-MDLLIBFILES += $(LIBPATH)libhyzip.a
-endif
-
-MDLLIBFILES += $(MDLLIBZLIB) \
-	$(LIBPATH)libhypool.a \
-	$(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX)
-
 OSLIBS += $(STDCLIBS) $(XLIBS)
 
 DLLNAME=$(DLLPATH)libgl$(HY_SHLIB_SUFFIX)

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/native/gl/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/native/gl/windows/makefile?rev=951681&r1=951680&r2=951681&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/native/gl/windows/makefile (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/native/gl/windows/makefile Sat Jun  5 08:54:06 2010
@@ -45,7 +45,6 @@ SYSLIBFILES = ws2_32.lib Iphlpapi.lib \
               Msimg32.lib gdiplus.lib User32.lib uxTheme.lib 
 
 MDLLIBFILES = $(MDLLIBFILES) \
-  $(LIBPATH)hypool$(HY_LINKLIB_SUFFIX) $(LIBPATH)vmi$(HY_LINKLIB_SUFFIX) \
   $(LIBPATH)hyzlib$(HY_LINKLIB_SUFFIX) $(PNG_DIR)libpng$(HY_LINKLIB_SUFFIX)
 
 DLLBASE=0x13300000

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/native/jpegdecoder/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/native/jpegdecoder/unix/makefile?rev=951681&r1=951680&r2=951681&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/native/jpegdecoder/unix/makefile (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/native/jpegdecoder/unix/makefile Sat Jun  5 08:54:06 2010
@@ -21,13 +21,6 @@ BUILDFILES = $(SHAREDSUB)JpegDecoder.o
 
 OSLIBS += -ljpeg
 
-ifneq ($(HY_ZIP_API),true)
-MDLLIBFILES += $(LIBPATH)libhyzip.a $(MDLLIBZLIB)
-endif
-
-MDLLIBFILES += $(LIBPATH)libhypool.a \
-	$(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX)
-
 DLLNAME=$(DLLPATH)libjpegdecoder$(HY_SHLIB_SUFFIX)
 EXPNAME=HYJPEGDECODER_0.1
 

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/native/jpegdecoder/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/native/jpegdecoder/windows/makefile?rev=951681&r1=951680&r2=951681&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/native/jpegdecoder/windows/makefile (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/native/jpegdecoder/windows/makefile Sat Jun  5 08:54:06 2010
@@ -29,8 +29,7 @@ BUILDFILES = $(SHAREDSUB)JpegDecoder.obj
 VIRTFILES = $(LIBBASE).res
 SYSLIBFILES = ws2_32.lib Iphlpapi.lib
 
-MDLLIBFILES = $(MDLLIBFILES) \
-  $(LIBPATH)hypool$(HY_LINKLIB_SUFFIX) $(LIBPATH)vmi$(HY_LINKLIB_SUFFIX) $(JPEG_DIR)libjpeg$(HY_LINKLIB_SUFFIX)
+MDLLIBFILES = $(MDLLIBFILES) $(JPEG_DIR)libjpeg$(HY_LINKLIB_SUFFIX)
 
 DLLBASE=0x13300000
 

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/native/lcmm/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/native/lcmm/unix/makefile?rev=951681&r1=951680&r2=951681&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/native/lcmm/unix/makefile (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/native/lcmm/unix/makefile Sat Jun  5 08:54:06 2010
@@ -26,13 +26,6 @@ BUILDFILES = \
 
 OSLIBS += -llcms
 
-ifneq ($(HY_ZIP_API),true)
-MDLLIBFILES += $(LIBPATH)libhyzip.a $(MDLLIBZLIB)
-endif
-
-MDLLIBFILES += $(LIBPATH)libhypool.a \
-	$(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX)
-
 DLLNAME=$(DLLPATH)liblcmm$(HY_SHLIB_SUFFIX)
 EXPNAME=HYLCMM_0.1
 

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/native/lcmm/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/native/lcmm/windows/makefile?rev=951681&r1=951680&r2=951681&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/native/lcmm/windows/makefile (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/native/lcmm/windows/makefile Sat Jun  5 08:54:06 2010
@@ -34,8 +34,7 @@ BUILDFILES = \
 VIRTFILES = $(LIBBASE).res
 SYSLIBFILES = ws2_32.lib Iphlpapi.lib
 
-MDLLIBFILES = $(MDLLIBFILES) \
-  $(LIBPATH)hypool$(HY_LINKLIB_SUFFIX) $(LIBPATH)vmi$(HY_LINKLIB_SUFFIX) $(LCMS_DIR)Lib/MS/lcms$(HY_LINKLIB_SUFFIX)
+MDLLIBFILES = $(MDLLIBFILES) $(LCMS_DIR)Lib/MS/lcms$(HY_LINKLIB_SUFFIX)
 
 DLLBASE=0x13300000
 

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/native/linuxfont/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/native/linuxfont/unix/makefile?rev=951681&r1=951680&r2=951681&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/native/linuxfont/unix/makefile (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/native/linuxfont/unix/makefile Sat Jun  5 08:54:06 2010
@@ -26,15 +26,9 @@ endif
 
 BUILDFILES = LinuxNativeFont.o
 
-ifneq ($(HY_ZIP_API),true)
-MDLLIBFILES += $(LIBPATH)libhyzip.a $(MDLLIBZLIB)
-endif
+MDLLIBFILES += $(DLLPATH)libFL$(HY_LINKLIB_SUFFIX)
 
-MDLLIBFILES += $(LIBPATH)libhypool.a \
-	$(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX) \
-	$(DLLPATH)libFL$(HY_LINKLIB_SUFFIX)
-
-OSLIBS += $(XLIBS)
+OSLIBS += -lm $(XLIBS)
 
 DLLNAME=$(DLLPATH)liblinuxfont$(HY_SHLIB_SUFFIX)
 EXPNAME=HYLINUXFONT_0.1

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/native/oglwrapper/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/native/oglwrapper/unix/makefile?rev=951681&r1=951680&r2=951681&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/native/oglwrapper/unix/makefile (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/native/oglwrapper/unix/makefile Sat Jun  5 08:54:06 2010
@@ -20,13 +20,6 @@ INCLUDES += -I$(SHARED)common -I$(SHARED
 BUILDFILES = \
   $(SHAREDSUB)/org_apache_harmony_awt_gl_opengl_GL.o
 
-ifneq ($(HY_ZIP_API),true)
-MDLLIBFILES += $(LIBPATH)libhyzip.a $(MDLLIBZLIB)
-endif
-
-MDLLIBFILES += $(LIBPATH)libhypool.a \
-	$(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX)
-
 OSLIBS += $(STDCLIBS)
 
 DLLNAME=$(DLLPATH)liboglwrapper$(HY_SHLIB_SUFFIX)

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/native/oglwrapper/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/native/oglwrapper/windows/makefile?rev=951681&r1=951680&r2=951681&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/native/oglwrapper/windows/makefile (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/native/oglwrapper/windows/makefile Sat Jun  5 08:54:06 2010
@@ -27,8 +27,6 @@ BUILDFILES = $(SHAREDSUB)org_apache_harm
 VIRTFILES = $(LIBBASE).res
 SYSLIBFILES = ws2_32.lib Iphlpapi.lib
 
-MDLLIBFILES = $(MDLLIBFILES) $(LIBPATH)hypool$(HY_LINKLIB_SUFFIX) $(LIBPATH)vmi$(HY_LINKLIB_SUFFIX)
-
 DLLBASE=0x13300000
 
 !include <$(HY_HDK)\build\make\rules.mak>

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/native/win32wrapper/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/native/win32wrapper/windows/makefile?rev=951681&r1=951680&r2=951681&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/native/win32wrapper/windows/makefile (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/native/win32wrapper/windows/makefile Sat Jun  5 08:54:06 2010
@@ -31,7 +31,7 @@ BUILDFILES = \
 VIRTFILES = $(LIBBASE).res
 SYSLIBFILES = ws2_32.lib Iphlpapi.lib
 
-MDLLIBFILES = $(MDLLIBFILES) $(LIBPATH)hypool$(HY_LINKLIB_SUFFIX) $(LIBPATH)vmi$(HY_LINKLIB_SUFFIX) 
+MDLLIBFILES = $(MDLLIBFILES) $(LIBPATH)vmi$(HY_LINKLIB_SUFFIX) 
 
 DLLBASE=0x13300000
 

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/native/winfont/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/native/winfont/windows/makefile?rev=951681&r1=951680&r2=951681&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/native/winfont/windows/makefile (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/native/winfont/windows/makefile Sat Jun  5 08:54:06 2010
@@ -30,7 +30,8 @@ BUILDFILES = winFont.obj
 VIRTFILES = $(LIBBASE).res
 SYSLIBFILES = ws2_32.lib Iphlpapi.lib gdi32.lib GdiPlus.lib advapi32.lib 
 
-MDLLIBFILES = $(MDLLIBFILES) $(LIBPATH)hypool$(HY_LINKLIB_SUFFIX) $(LIBPATH)vmi$(HY_LINKLIB_SUFFIX) $(LIBPATH)FL$(HY_LINKLIB_SUFFIX)
+MDLLIBFILES = $(MDLLIBFILES) \
+  $(LIBPATH)vmi$(HY_LINKLIB_SUFFIX) $(LIBPATH)FL$(HY_LINKLIB_SUFFIX)
 
 DLLBASE=0x13300000
 

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/native/x11wrapper/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/native/x11wrapper/unix/makefile?rev=951681&r1=951680&r2=951681&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/native/x11wrapper/unix/makefile (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/native/x11wrapper/unix/makefile Sat Jun  5 08:54:06 2010
@@ -23,13 +23,6 @@ BUILDFILES = \
   org_apache_harmony_awt_nativebridge_linux_X11.o \
   org_apache_harmony_awt_nativebridge_linux_Xft.o
 
-ifneq ($(HY_ZIP_API),true)
-MDLLIBFILES += $(LIBPATH)libhyzip.a $(MDLLIBZLIB)
-endif
-
-MDLLIBFILES += $(LIBPATH)libhypool.a \
-	$(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX)
-
 OSLIBS += $(STDCLIBS) $(XLIBS)
 
 DLLNAME=$(DLLPATH)libX11Wrapper$(HY_SHLIB_SUFFIX)

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/imageio/make/exclude.linux.x86.ibm.interm
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/imageio/make/exclude.linux.x86.ibm.interm?rev=951681&r1=951680&r2=951681&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/imageio/make/exclude.linux.x86.ibm.interm (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/imageio/make/exclude.linux.x86.ibm.interm Sat Jun  5 08:54:06 2010
@@ -1,2 +0,0 @@
-# HARMONY-3135, fails intermittently due some issues in libpng (probably)
-javax/imageio/ImageIOTest.java
\ No newline at end of file

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/imageio/make/exclude.linux.x86_64.drl
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/imageio/make/exclude.linux.x86_64.drl?rev=951681&r1=951680&r2=951681&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/imageio/make/exclude.linux.x86_64.drl (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/imageio/make/exclude.linux.x86_64.drl Sat Jun  5 08:54:06 2010
@@ -1 +0,0 @@
-javax/imageio/ImageIOTest.java

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/imageio/src/main/native/jpegencoder/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/imageio/src/main/native/jpegencoder/unix/makefile?rev=951681&r1=951680&r2=951681&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/imageio/src/main/native/jpegencoder/unix/makefile (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/imageio/src/main/native/jpegencoder/unix/makefile Sat Jun  5 08:54:06 2010
@@ -25,13 +25,6 @@ else
 MDLLIBFILES += $(LIBPATH)libjpeg.a
 endif
 
-ifneq ($(HY_ZIP_API),true)
-MDLLIBFILES += $(LIBPATH)libhyzip.a $(MDLLIBZLIB)
-endif
-
-MDLLIBFILES += $(LIBPATH)libhypool.a \
-	$(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX)
-
 DLLNAME=$(DLLPATH)libjpegencoder$(HY_SHLIB_SUFFIX)
 EXPNAME=HYJPEGENCODER_0.1
 

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/imageio/src/main/native/jpegencoder/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/imageio/src/main/native/jpegencoder/windows/makefile?rev=951681&r1=951680&r2=951681&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/imageio/src/main/native/jpegencoder/windows/makefile (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/imageio/src/main/native/jpegencoder/windows/makefile Sat Jun  5 08:54:06 2010
@@ -40,8 +40,7 @@ BUILDFILES = $(SHAREDSUB)JpegEncoder.obj
 VIRTFILES = $(LIBBASE).res
 SYSLIBFILES = ws2_32.lib Iphlpapi.lib
 
-MDLLIBFILES = $(MDLLIBFILES) \
-  $(LIBPATH)hypool$(HY_LINKLIB_SUFFIX) $(LIBPATH)vmi$(HY_LINKLIB_SUFFIX) $(JPEG_DIR)libjpeg$(HY_LINKLIB_SUFFIX)
+MDLLIBFILES = $(MDLLIBFILES) $(JPEG_DIR)libjpeg$(HY_LINKLIB_SUFFIX)
 
 DLLBASE=0x13300000
 

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/imageio/src/main/native/pngencoder/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/imageio/src/main/native/pngencoder/unix/makefile?rev=951681&r1=951680&r2=951681&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/imageio/src/main/native/pngencoder/unix/makefile (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/imageio/src/main/native/pngencoder/unix/makefile Sat Jun  5 08:54:06 2010
@@ -26,15 +26,6 @@ MDLLIBFILES += $(LIBPATH)libpng.a
 DEFINES += -DPNGAPI=
 endif
 
-ifneq ($(HY_ZIP_API),true)
-MDLLIBFILES += $(LIBPATH)libhyzip.a $(MDLLIBZLIB)
-endif
-
-MDLLIBFILES += $(LIBPATH)libhypool.a \
-	$(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX)
-
-OSLIBS += $(STDCLIBS)
-
 ifeq ($(HY_OS),zos)
 MDLLIBFILES += $(MDLLIBZLIB)
 endif

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/imageio/src/main/native/pngencoder/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/imageio/src/main/native/pngencoder/windows/makefile?rev=951681&r1=951680&r2=951681&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/imageio/src/main/native/pngencoder/windows/makefile (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/imageio/src/main/native/pngencoder/windows/makefile Sat Jun  5 08:54:06 2010
@@ -31,7 +31,6 @@ VIRTFILES = $(LIBBASE).res
 SYSLIBFILES = ws2_32.lib Iphlpapi.lib
 
 MDLLIBFILES = $(MDLLIBFILES) \
-  $(LIBPATH)hypool$(HY_LINKLIB_SUFFIX) $(LIBPATH)vmi$(HY_LINKLIB_SUFFIX) \
   $(LIBPATH)hyzlib$(HY_LINKLIB_SUFFIX) $(PNG_DIR)libpng$(HY_LINKLIB_SUFFIX)
 
 DLLBASE=0x13300000

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/instrument/src/main/native/instrument/shared/inst_agt.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/instrument/src/main/native/instrument/shared/inst_agt.c?rev=951681&r1=951680&r2=951681&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/instrument/src/main/native/instrument/shared/inst_agt.c (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/instrument/src/main/native/instrument/shared/inst_agt.c Sat Jun  5 08:54:06 2010
@@ -380,10 +380,35 @@ jint Parse_Options(JavaVM *vm, JNIEnv *e
     //add bootclasspath
 
     bootclasspath = read_attribute(vm, manifest, lwrmanifest,"boot-class-path");
-    if(NULL != bootclasspath){
+    if (NULL != bootclasspath){
+        
+#if defined(WIN32) || defined(WIN64)
+        // On Windows the agent jar path can have a mixture of forward and back slashes.
+        // For ease, convert forward slashes to back slashes
+        char *currentSlash = strchr(jar_name, '/');
+        while (currentSlash) {
+            *currentSlash = '\\';
+            currentSlash = strchr(currentSlash, '/');
+        }
+#endif
+
         bootclasspath_item = strtok(bootclasspath, " ");
         while(NULL != bootclasspath_item){
-            check_jvmti_error(env, (*jvmti)->AddToBootstrapClassLoaderSearch(jvmti, bootclasspath_item),"Failed to add bootstrap classpath.");
+            if ((bootclasspath_item[0] != DIR_SEPARATOR) && (strrchr(jar_name, DIR_SEPARATOR))) {
+                // This is not an absolute path, so add this relative path to the path of the agent library
+                int lastSeparatorOff = strrchr(jar_name, DIR_SEPARATOR) - jar_name + 1;
+                int size = lastSeparatorOff + strlen(bootclasspath_item) + 1;
+                char *jarPath = (char *)hymem_allocate_memory(size);
+                
+                memcpy(jarPath, jar_name, lastSeparatorOff);
+                strcpy(jarPath + lastSeparatorOff, bootclasspath_item);
+                check_jvmti_error(env, (*jvmti)->AddToBootstrapClassLoaderSearch(jvmti, jarPath),"Failed to add bootstrap classpath.");
+                hymem_free_memory(jarPath);
+            } else {
+                // This is either an absolute path of jar_name has not path before the filename
+                check_jvmti_error(env, (*jvmti)->AddToBootstrapClassLoaderSearch(jvmti, bootclasspath_item),"Failed to add bootstrap classpath.");
+            }           
+
             bootclasspath_item = strtok(NULL, " ");
         }
         hymem_free_memory(bootclasspath);

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/instrument/src/main/native/instrument/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/instrument/src/main/native/instrument/unix/makefile?rev=951681&r1=951680&r2=951681&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/instrument/src/main/native/instrument/unix/makefile (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/instrument/src/main/native/instrument/unix/makefile Sat Jun  5 08:54:06 2010
@@ -26,9 +26,7 @@ ifneq ($(HY_ZIP_API),true)
 MDLLIBFILES += $(LIBPATH)libhyzip.a 
 endif
 
-MDLLIBFILES += \
-	$(LIBPATH)libhypool.a \
-	$(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX)
+MDLLIBFILES += $(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX)
 
 DLLNAME = $(DLLPATH)libhyinstrument$(HY_SHLIB_SUFFIX)
 EXPNAME = HYINSTRUMENT_0.1

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/instrument/src/main/native/instrument/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/instrument/src/main/native/instrument/windows/makefile?rev=951681&r1=951680&r2=951681&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/instrument/src/main/native/instrument/windows/makefile (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/instrument/src/main/native/instrument/windows/makefile Sat Jun  5 08:54:06 2010
@@ -33,11 +33,11 @@ VIRTFILES = hyinstrument.res
 SYSLIBFILES = ws2_32.lib Iphlpapi.lib
 
 !IF "$(HY_ZIP_API)" != "true"
-MDLLIBFILES = $(MDLLIBFILES) $(LIBPATH)hyzip$(HY_LINKLIB_SUFFIX) $(LIBPATH)hyzlib$(HY_LINKLIB_SUFFIX)
+MDLLIBFILES = $(MDLLIBFILES) $(LIBPATH)hyzip$(HY_LINKLIB_SUFFIX) \
+              $(LIBPATH)hyzlib$(HY_LINKLIB_SUFFIX)
 !ENDIF
 
-MDLLIBFILES = $(MDLLIBFILES) $(LIBPATH)hypool$(HY_LINKLIB_SUFFIX) \
-  $(LIBPATH)vmi$(HY_LINKLIB_SUFFIX)
+MDLLIBFILES = $(MDLLIBFILES) $(LIBPATH)vmi$(HY_LINKLIB_SUFFIX)
 
 DLLBASE=0x13200000
 

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/instrument/src/test/java/org/apache/harmony/tests/java/lang/instrument/InstrumentTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/instrument/src/test/java/org/apache/harmony/tests/java/lang/instrument/InstrumentTest.java?rev=951681&r1=951680&r2=951681&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/instrument/src/test/java/org/apache/harmony/tests/java/lang/instrument/InstrumentTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/instrument/src/test/java/org/apache/harmony/tests/java/lang/instrument/InstrumentTest.java Sat Jun  5 08:54:06 2010
@@ -28,10 +28,10 @@ public class InstrumentTest extends Test
      */
     public void test_addTransformer_null() throws Exception {
         String[] arg = new String[2];
-        arg[0] = "-javaagent:src/test/resources/jars/org/apache/harmony/tests/instrument/Premain_addTransformer_null.jar";
+        arg[0] = "-javaagent:resources/jars/org/apache/harmony/tests/instrument/Premain_addTransformer_null.jar";
         arg[1] = "org/apache/harmony/tests/java/lang/instrument/TestMain";
         String[] path = new String[1];
-        path[0] = "src/test/resources/jars/org/apache/harmony/tests/instrument/Premain_addTransformer_null.jar";
+        path[0] = "resources/jars/org/apache/harmony/tests/instrument/Premain_addTransformer_null.jar";
         String result = Support_Exec.execJava(arg, path, true);
         assertEquals("", result);
     }
@@ -41,10 +41,10 @@ public class InstrumentTest extends Test
      */
     public void test_removeTransformer_null() throws Exception {
         String[] arg = new String[2];
-        arg[0] = "-javaagent:src/test/resources/jars/org/apache/harmony/tests/instrument/Premain_removeTransformer_null.jar";
+        arg[0] = "-javaagent:resources/jars/org/apache/harmony/tests/instrument/Premain_removeTransformer_null.jar";
         arg[1] = "org/apache/harmony/tests/java/lang/instrument/TestMain";
         String[] path = new String[1];
-        path[0] = "src/test/resources/jars/org/apache/harmony/tests/instrument/Premain_removeTransformer_null.jar";
+        path[0] = "resources/jars/org/apache/harmony/tests/instrument/Premain_removeTransformer_null.jar";
         String result = Support_Exec.execJava(arg, path, true);
         assertEquals("", result);
     }
@@ -54,10 +54,10 @@ public class InstrumentTest extends Test
      */
     public void test_removeTransformer_notExists() throws Exception {
         String[] arg = new String[2];
-        arg[0] = "-javaagent:src/test/resources/jars/org/apache/harmony/tests/instrument/Premain_removeTransformer_notExists.jar";
+        arg[0] = "-javaagent:resources/jars/org/apache/harmony/tests/instrument/Premain_removeTransformer_notExists.jar";
         arg[1] = "org/apache/harmony/tests/java/lang/instrument/TestMain";
         String[] path = new String[1];
-        path[0] = "src/test/resources/jars/org/apache/harmony/tests/instrument/Premain_removeTransformer_notExists.jar";
+        path[0] = "resources/jars/org/apache/harmony/tests/instrument/Premain_removeTransformer_notExists.jar";
         String result = Support_Exec.execJava(arg, path, true);
         assertEquals("", result);
     }
@@ -67,10 +67,10 @@ public class InstrumentTest extends Test
      */
     public void test_loadClass_null() throws Exception {
         String[] arg = new String[2];
-        arg[0] = "-javaagent:src/test/resources/jars/org/apache/harmony/tests/instrument/loading_class.jar";
+        arg[0] = "-javaagent:resources/jars/org/apache/harmony/tests/instrument/loading_class.jar";
         arg[1] = "org/apache/harmony/tests/java/lang/instrument/TestMain";
         String[] path = new String[1];
-        path[0] = "src/test/resources/jars/org/apache/harmony/tests/instrument/loading_class.jar";
+        path[0] = "resources/jars/org/apache/harmony/tests/instrument/loading_class.jar";
         try {
             Support_Exec.execJava(arg, path, true);
             fail("Should fail here!");
@@ -85,10 +85,10 @@ public class InstrumentTest extends Test
      */
     public void test_new_classLoader_Exists() throws Exception {
         String[] arg = new String[2];
-        arg[0] = "-javaagent:src/test/resources/jars/org/apache/harmony/tests/instrument/new_classloader.jar";
+        arg[0] = "-javaagent:resources/jars/org/apache/harmony/tests/instrument/new_classloader.jar";
         arg[1] = "org/apache/harmony/tests/java/lang/instrument/TestMain";
         String[] path = new String[1];
-        path[0] = "src/test/resources/jars/org/apache/harmony/tests/instrument/new_classloader.jar";
+        path[0] = "resources/jars/org/apache/harmony/tests/instrument/new_classloader.jar";
         String result = Support_Exec.execJava(arg, path, true);
         assertNotNull(result);
     }
@@ -98,10 +98,10 @@ public class InstrumentTest extends Test
      */
     public void test_Property_Premain_null() throws Exception {
         String[] arg = new String[2];
-        arg[0] = "-javaagent:src/test/resources/jars/org/apache/harmony/tests/instrument/Property_Premain_null.jar";
+        arg[0] = "-javaagent:resources/jars/org/apache/harmony/tests/instrument/Property_Premain_null.jar";
         arg[1] = "org/apache/harmony/tests/java/lang/instrument/TestMain";
         String[] path = new String[1];
-        path[0] = "src/test/resources/jars/org/apache/harmony/tests/instrument/Property_Premain_null.jar";
+        path[0] = "resources/jars/org/apache/harmony/tests/instrument/Property_Premain_null.jar";
         try {
             Support_Exec.execJava(arg, path, true);
             fail("Should fail here!");
@@ -120,10 +120,10 @@ public class InstrumentTest extends Test
      */
     public void test_Property_other_null() throws Exception {
         String[] arg = new String[2];
-        arg[0] = "-javaagent:src/test/resources/jars/org/apache/harmony/tests/instrument/Property_other_null.jar";
+        arg[0] = "-javaagent:resources/jars/org/apache/harmony/tests/instrument/Property_other_null.jar";
         arg[1] = "org/apache/harmony/tests/java/lang/instrument/TestMain";
         String[] path = new String[1];
-        path[0] = "src/test/resources/jars/org/apache/harmony/tests/instrument/Property_other_null.jar";
+        path[0] = "resources/jars/org/apache/harmony/tests/instrument/Property_other_null.jar";
         String result = Support_Exec.execJava(arg, path, true);
         assertNotNull(result);
     }
@@ -133,10 +133,10 @@ public class InstrumentTest extends Test
      */
     public void test_Properity_case_sensitive() throws Exception {
         String[] arg = new String[2];
-        arg[0] = "-javaagent:src/test/resources/jars/org/apache/harmony/tests/instrument/Properity_case_sensitive.jar";
+        arg[0] = "-javaagent:resources/jars/org/apache/harmony/tests/instrument/Properity_case_sensitive.jar";
         arg[1] = "org/apache/harmony/tests/java/lang/instrument/TestMain";
         String[] path = new String[1];
-        path[0] = "src/test/resources/jars/org/apache/harmony/tests/instrument/Properity_case_sensitive.jar";
+        path[0] = "resources/jars/org/apache/harmony/tests/instrument/Properity_case_sensitive.jar";
         String result = Support_Exec.execJava(arg, path, true);
         assertEquals("", result);
     }
@@ -146,10 +146,10 @@ public class InstrumentTest extends Test
      */
     public void test_BadFormatJar() throws Exception {
         String[] arg = new String[2];
-        arg[0] = "-javaagent:src/test/resources/jars/org/apache/harmony/tests/instrument/BadFormatJar.jar";
+        arg[0] = "-javaagent:resources/jars/org/apache/harmony/tests/instrument/BadFormatJar.jar";
         arg[1] = "";
         String[] path = new String[1];
-        path[0] = "src/test/resources/jars/org/apache/harmony/tests/instrument/BadFormatJar.jar";
+        path[0] = "resources/jars/org/apache/harmony/tests/instrument/BadFormatJar.jar";
         try {
             Support_Exec.execJava(arg, path, true);
             fail("Should fail here!");
@@ -167,10 +167,10 @@ public class InstrumentTest extends Test
      */
     public void test_Premain_Class_null() throws Exception {
         String[] arg = new String[2];
-        arg[0] = "-javaagent:src/test/resources/jars/org/apache/harmony/tests/instrument/Premain_Class_null.jar";
+        arg[0] = "-javaagent:resources/jars/org/apache/harmony/tests/instrument/Premain_Class_null.jar";
         arg[1] = "org/apache/harmony/tests/java/lang/instrument/TestMain";
         String[] path = new String[1];
-        path[0] = "src/test/resources/jars/org/apache/harmony/tests/instrument/Premain_Class_null.jar";
+        path[0] = "resources/jars/org/apache/harmony/tests/instrument/Premain_Class_null.jar";
         try {
             Support_Exec.execJava(arg, path, true);
             fail("Should fail here!");
@@ -185,10 +185,10 @@ public class InstrumentTest extends Test
      */
     public void test_zero_byte_transformer() throws Exception {
         String[] arg = new String[2];
-        arg[0] = "-javaagent:src/test/resources/jars/org/apache/harmony/tests/instrument/zero_byte_class.jar";
+        arg[0] = "-javaagent:resources/jars/org/apache/harmony/tests/instrument/zero_byte_class.jar";
         arg[1] = "org/apache/harmony/tests/java/lang/instrument/TestMain";
         String[] path = new String[1];
-        path[0] = "src/test/resources/jars/org/apache/harmony/tests/instrument/zero_byte_class.jar";
+        path[0] = "resources/jars/org/apache/harmony/tests/instrument/zero_byte_class.jar";
         String result = Support_Exec.execJava(arg, path, true);
         assertEquals("", result);
     }
@@ -198,11 +198,23 @@ public class InstrumentTest extends Test
      */
     public void test_old_version() throws Exception {
         String[] arg = new String[2];
-        arg[0] = "-javaagent:src/test/resources/jars/org/apache/harmony/tests/instrument/old_version_class.jar";
+        arg[0] = "-javaagent:resources/jars/org/apache/harmony/tests/instrument/old_version_class.jar";
         arg[1] = "org/apache/harmony/tests/java/lang/instrument/TestMain";
         String[] path = new String[1];
-        path[0] = "src/test/resources/jars/org/apache/harmony/tests/instrument/old_version_class.jar";
+        path[0] = "resources/jars/org/apache/harmony/tests/instrument/old_version_class.jar";
         String result = Support_Exec.execJava(arg, path, true);
         assertEquals("", result);
     }
+
+    /**
+     * @tests test manifest Boot-Class-Path property is treated 
+     *        correctly
+     */
+    public void test_boot_class_path() throws Exception {
+        String[] arg = new String[2];
+        arg[0] = "-javaagent:resources/jars/org/apache/harmony/tests/instrument/BCPTest.jar";
+        arg[1] = "org/apache/harmony/tests/java/lang/instrument/TestMain";
+        String result = Support_Exec.execJava(arg, null, true);
+        assertEquals("Hello World", result.trim());
+    }
 }

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/lang-management/make/exclude.linux.x86.ibm
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/lang-management/make/exclude.linux.x86.ibm?rev=951681&r1=951680&r2=951681&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/lang-management/make/exclude.linux.x86.ibm (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/lang-management/make/exclude.linux.x86.ibm Sat Jun  5 08:54:06 2010
@@ -19,5 +19,3 @@ org/apache/harmony/lang/management/tests
 org/apache/harmony/lang/management/tests/java/lang/management/MemoryPoolMXBeanTest.java
 org/apache/harmony/lang/management/tests/java/lang/management/RuntimeMXBeanTest.java
 org/apache/harmony/lang/management/tests/java/lang/management/ThreadMXBeanTest.java
-
-tests/java/util/logging/LoggingMXBeanTest.java

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/lang-management/make/exclude.linux.x86_64.ibm
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/lang-management/make/exclude.linux.x86_64.ibm?rev=951681&r1=951680&r2=951681&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/lang-management/make/exclude.linux.x86_64.ibm (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/lang-management/make/exclude.linux.x86_64.ibm Sat Jun  5 08:54:06 2010
@@ -19,5 +19,3 @@ org/apache/harmony/lang/management/tests
 org/apache/harmony/lang/management/tests/java/lang/management/MemoryPoolMXBeanTest.java
 org/apache/harmony/lang/management/tests/java/lang/management/RuntimeMXBeanTest.java
 org/apache/harmony/lang/management/tests/java/lang/management/ThreadMXBeanTest.java
-
-tests/java/util/logging/LoggingMXBeanTest.java

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/lang-management/make/exclude.windows.x86.ibm
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/lang-management/make/exclude.windows.x86.ibm?rev=951681&r1=951680&r2=951681&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/lang-management/make/exclude.windows.x86.ibm (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/lang-management/make/exclude.windows.x86.ibm Sat Jun  5 08:54:06 2010
@@ -19,6 +19,3 @@ org/apache/harmony/lang/management/tests
 org/apache/harmony/lang/management/tests/java/lang/management/MemoryPoolMXBeanTest.java
 org/apache/harmony/lang/management/tests/java/lang/management/RuntimeMXBeanTest.java
 org/apache/harmony/lang/management/tests/java/lang/management/ThreadMXBeanTest.java
-
-tests/java/util/logging/LoggingMXBeanTest.java
-

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/lang-management/make/exclude.zos.s390.ibm
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/lang-management/make/exclude.zos.s390.ibm?rev=951681&r1=951680&r2=951681&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/lang-management/make/exclude.zos.s390.ibm (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/lang-management/make/exclude.zos.s390.ibm Sat Jun  5 08:54:06 2010
@@ -19,6 +19,3 @@ org/apache/harmony/lang/management/tests
 org/apache/harmony/lang/management/tests/java/lang/management/MemoryPoolMXBeanTest.java
 org/apache/harmony/lang/management/tests/java/lang/management/RuntimeMXBeanTest.java
 org/apache/harmony/lang/management/tests/java/lang/management/ThreadMXBeanTest.java
-
-tests/java/util/logging/LoggingMXBeanTest.java
-

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/lang-management/make/exclude.zos.s390x.ibm
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/lang-management/make/exclude.zos.s390x.ibm?rev=951681&r1=951680&r2=951681&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/lang-management/make/exclude.zos.s390x.ibm (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/lang-management/make/exclude.zos.s390x.ibm Sat Jun  5 08:54:06 2010
@@ -19,6 +19,3 @@ org/apache/harmony/lang/management/tests
 org/apache/harmony/lang/management/tests/java/lang/management/MemoryPoolMXBeanTest.java
 org/apache/harmony/lang/management/tests/java/lang/management/RuntimeMXBeanTest.java
 org/apache/harmony/lang/management/tests/java/lang/management/ThreadMXBeanTest.java
-
-tests/java/util/logging/LoggingMXBeanTest.java
-

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/luni/make/exclude.linux.x86.drl
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/luni/make/exclude.linux.x86.drl?rev=951681&r1=951680&r2=951681&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/luni/make/exclude.linux.x86.drl (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/luni/make/exclude.linux.x86.drl Sat Jun  5 08:54:06 2010
@@ -1,4 +0,0 @@
-org/apache/harmony/luni/tests/java/lang/ThreadTest.java
-
-# HARMONY-4043 (was duplicate HARMONY-4753)
-org/apache/harmony/luni/tests/java/lang/SecurityManager2Test.java

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/luni/make/exclude.linux.x86.ibm
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/luni/make/exclude.linux.x86.ibm?rev=951681&r1=951680&r2=951681&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/luni/make/exclude.linux.x86.ibm (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/luni/make/exclude.linux.x86.ibm Sat Jun  5 08:54:06 2010
@@ -1,4 +1,2 @@
-org/apache/harmony/luni/tests/java/util/PropertiesTest.java
 org/apache/harmony/luni/tests/java/lang/SecurityManager2Test.java
-org/apache/harmony/luni/tests/java/lang/PackageTest.java
 org/apache/harmony/luni/tests/java/net/InetAddressTest.java

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/luni/make/exclude.linux.x86_64.drl
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/luni/make/exclude.linux.x86_64.drl?rev=951681&r1=951680&r2=951681&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/luni/make/exclude.linux.x86_64.drl (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/luni/make/exclude.linux.x86_64.drl Sat Jun  5 08:54:06 2010
@@ -1,6 +1,2 @@
 org/apache/harmony/luni/tests/java/net/InetAddressTest.java
-org/apache/harmony/luni/tests/java/lang/ThreadTest.java
 org/apache/harmony/luni/tests/java/net/MulticastSocketTest.java
-
-# HARMONY-4043 (was duplicate HARMONY-4753)
-org/apache/harmony/luni/tests/java/lang/SecurityManager2Test.java

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/luni/make/exclude.linux.x86_64.ibm
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/luni/make/exclude.linux.x86_64.ibm?rev=951681&r1=951680&r2=951681&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/luni/make/exclude.linux.x86_64.ibm (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/luni/make/exclude.linux.x86_64.ibm Sat Jun  5 08:54:06 2010
@@ -1,4 +1,2 @@
-org/apache/harmony/luni/tests/java/util/PropertiesTest.java
 org/apache/harmony/luni/tests/java/lang/SecurityManager2Test.java
-org/apache/harmony/luni/tests/java/lang/PackageTest.java
 org/apache/harmony/luni/tests/java/net/InetAddressTest.java

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/luni/make/exclude.windows.x86.drl
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/luni/make/exclude.windows.x86.drl?rev=951681&r1=951680&r2=951681&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/luni/make/exclude.windows.x86.drl (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/luni/make/exclude.windows.x86.drl Sat Jun  5 08:54:06 2010
@@ -1,2 +0,0 @@
-# HARMONY-4043 (was duplicate HARMONY-4753)
-org/apache/harmony/luni/tests/java/lang/SecurityManager2Test.java

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/luni/make/exclude.windows.x86.ibm
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/luni/make/exclude.windows.x86.ibm?rev=951681&r1=951680&r2=951681&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/luni/make/exclude.windows.x86.ibm (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/luni/make/exclude.windows.x86.ibm Sat Jun  5 08:54:06 2010
@@ -1,3 +1 @@
-org/apache/harmony/luni/tests/java/util/PropertiesTest.java
 org/apache/harmony/luni/tests/java/lang/SecurityManager2Test.java
-org/apache/harmony/luni/tests/java/lang/PackageTest.java
\ No newline at end of file



Mime
View raw message