Author: hindessm
Date: Tue Aug 11 13:07:55 2009
New Revision: 803102
URL: http://svn.apache.org/viewvc?rev=803102&view=rev
Log:
Merge updates from classlib trunk@803061 since r798021.
Added:
harmony/enhanced/classlib/branches/java6/modules/awt/make/depends.properties
- copied unchanged from r803061, harmony/enhanced/classlib/trunk/modules/awt/make/depends.properties
harmony/enhanced/classlib/branches/java6/modules/imageio/make/depends.properties
- copied unchanged from r803061, harmony/enhanced/classlib/trunk/modules/imageio/make/depends.properties
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/fdlibm.h
- copied unchanged from r803061, harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/fdlibm.h
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/gp.h
- copied unchanged from r803061, harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/gp.h
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/hymagic.h
- copied unchanged from r803061, harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/hymagic.h
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/hysocket.h
- copied unchanged from r803061, harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/hysocket.h
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/hyvmls.h
- copied unchanged from r803061, harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/hyvmls.h
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/jni.h
- copied unchanged from r803061, harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/jni.h
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/jni_types.h
- copied unchanged from r803061, harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/jni_types.h
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/jvmpi.h
- copied unchanged from r803061, harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/jvmpi.h
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/jvmri.h
- copied unchanged from r803061, harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/jvmri.h
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/jvmti.h
- copied unchanged from r803061, harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/jvmti.h
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/jvmti_types.h
- copied unchanged from r803061, harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/jvmti_types.h
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/vmi.h
- copied unchanged from r803061, harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/vmi.h
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/vmizip.h
- copied unchanged from r803061, harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/vmizip.h
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/windows/charsetmap.h
- copied unchanged from r803061, harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/windows/charsetmap.h
harmony/enhanced/classlib/branches/java6/modules/sql/make/depends.properties
- copied unchanged from r803061, harmony/enhanced/classlib/trunk/modules/sql/make/depends.properties
Removed:
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/shared/
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/unix/
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/windows/
harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/java/org/apache/harmony/niochar/java.nio.charset.spi.CharsetProvider
Modified:
harmony/enhanced/classlib/branches/java6/ (props changed)
harmony/enhanced/classlib/branches/java6/build.xml
harmony/enhanced/classlib/branches/java6/depends/jars/ (props changed)
harmony/enhanced/classlib/branches/java6/make/build-java.xml
harmony/enhanced/classlib/branches/java6/make/build-test.xml
harmony/enhanced/classlib/branches/java6/make/depends-common.xml (props changed)
harmony/enhanced/classlib/branches/java6/make/depends.properties
harmony/enhanced/classlib/branches/java6/make/depends.xml
harmony/enhanced/classlib/branches/java6/make/properties.xml
harmony/enhanced/classlib/branches/java6/make/run-test.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/archive/src/main/native/archive/shared/deflater.c
harmony/enhanced/classlib/branches/java6/modules/archive/src/main/native/archive/shared/jarfile.c
harmony/enhanced/classlib/branches/java6/modules/archive/src/main/native/archive/shared/zip.c
harmony/enhanced/classlib/branches/java6/modules/auth/build.xml
harmony/enhanced/classlib/branches/java6/modules/auth/src/main/java/common/javax/security/auth/kerberos/KeyImpl.java
harmony/enhanced/classlib/branches/java6/modules/auth/src/main/java/common/org/apache/harmony/auth/module/LoginModuleUtils.java
harmony/enhanced/classlib/branches/java6/modules/awt/build.xml
harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/gl/windows/makefile
harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/jpegdecoder/windows/makefile
harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/lcmm/windows/makefile
harmony/enhanced/classlib/branches/java6/modules/awt/src/test/api/java/org/apache/harmony/awt/tests/image/ImageLoadingTest.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/Delayed.java
harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/Executors.java
harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/TimeUnit.java
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/concurrent/src/test/java/TimeUnitTest.java
harmony/enhanced/classlib/branches/java6/modules/crypto/build.xml
harmony/enhanced/classlib/branches/java6/modules/imageio/build.xml
harmony/enhanced/classlib/branches/java6/modules/imageio/src/main/native/jpegencoder/windows/makefile
harmony/enhanced/classlib/branches/java6/modules/imageio/src/main/native/pngencoder/windows/makefile
harmony/enhanced/classlib/branches/java6/modules/instrument/build.xml
harmony/enhanced/classlib/branches/java6/modules/jmx/META-INF/ (props changed)
harmony/enhanced/classlib/branches/java6/modules/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/logging/src/main/java/java/util/logging/LogManager.java
harmony/enhanced/classlib/branches/java6/modules/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/LogManagerTest.java
harmony/enhanced/classlib/branches/java6/modules/luni/build.xml
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/io/BufferedReader.java
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/AbstractList.java
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/shared/OSNetworkSystem.c
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/shared/file.c
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/shared/inetadds.c
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/shared/luniglob.c
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/shared/netif.c
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/shared/socket.c
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/unix/helpers.c
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/unix/helpers.h
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/unix/procimpl.c
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/windows/OSNetworkSystemWin32.c
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/windows/helpers.c
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/windows/helpers.h
harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/BufferedReaderTest.java
harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/SocketTest.java
harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/AbstractListTest.java
harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/TreeMapTest.java
harmony/enhanced/classlib/branches/java6/modules/luni/src/test/resources/net.resources/ (props changed)
harmony/enhanced/classlib/branches/java6/modules/math/build.xml
harmony/enhanced/classlib/branches/java6/modules/math/src/main/java/java/math/BigInteger.java
harmony/enhanced/classlib/branches/java6/modules/math/src/main/java/java/math/BitLevel.java
harmony/enhanced/classlib/branches/java6/modules/math/src/main/java/java/math/Multiplication.java
harmony/enhanced/classlib/branches/java6/modules/math/src/test/java/org/apache/harmony/tests/java/math/BigDecimalArithmeticTest.java
harmony/enhanced/classlib/branches/java6/modules/misc/build.xml
harmony/enhanced/classlib/branches/java6/modules/nio/build.xml
harmony/enhanced/classlib/branches/java6/modules/nio_char/build.xml
harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/java/org/apache/harmony/niochar/charset/additional/IBM1047.java
harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/native/niochar/shared/additional/IBM1047.c
harmony/enhanced/classlib/branches/java6/modules/pack200/depends/manifests/asm-3.1/ (props changed)
harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java5/org/apache/harmony/pack200/Pack200Adapter.java (props changed)
harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java5/org/apache/harmony/pack200/Pack200PackerAdapter.java (props changed)
harmony/enhanced/classlib/branches/java6/modules/portlib/build.xml
harmony/enhanced/classlib/branches/java6/modules/prefs/build.xml
harmony/enhanced/classlib/branches/java6/modules/print/build.xml
harmony/enhanced/classlib/branches/java6/modules/regex/build.xml
harmony/enhanced/classlib/branches/java6/modules/rmi/build.xml
harmony/enhanced/classlib/branches/java6/modules/security/build.xml
harmony/enhanced/classlib/branches/java6/modules/sound/build.xml
harmony/enhanced/classlib/branches/java6/modules/sql/build.xml
harmony/enhanced/classlib/branches/java6/modules/sql/make/run-test.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 Tue Aug 11 13:07:55 2009
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk:713674-735919,765923-798021
+/harmony/enhanced/classlib/trunk:713674-735919,765923-803061
Modified: harmony/enhanced/classlib/branches/java6/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/build.xml?rev=803102&r1=803101&r2=803102&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/build.xml Tue Aug 11 13:07:55 2009
@@ -93,7 +93,8 @@
target="support-jar"/>
</target>
- <target name="clean" depends="clean-java,clean-native,-clean-hdk"
+ <target name="clean"
+ depends="clean-java,clean-native,clean-test,-clean-hdk"
description="Removes all the files generated by a build" />
<!-- ================================
@@ -165,6 +166,11 @@
<ant antfile="make/build-native.xml" inheritall="false" target="clean" />
</target>
+ <target name="clean-test" depends="-init-hdk-for-clean"
+ description="Removes the generated tests" >
+ <ant antfile="make/build-test.xml" inheritall="false" target="clean" />
+ </target>
+
<target name="test" depends="-init-hdk"
description="Runs all tests">
<echo>
Propchange: harmony/enhanced/classlib/branches/java6/depends/jars/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Aug 11 13:07:55 2009
@@ -1,4 +1,5 @@
-junit_4.4
+junit_4.6
+hamcrest-library_1.1
mx4j_3.0.2
xalan-j_2.7.0
bcel-5.2
Modified: harmony/enhanced/classlib/branches/java6/make/build-java.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/make/build-java.xml?rev=803102&r1=803101&r2=803102&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/make/build-java.xml (original)
+++ harmony/enhanced/classlib/branches/java6/make/build-java.xml Tue Aug 11 13:07:55 2009
@@ -247,17 +247,7 @@
<include name="rowset.properties" />
</fileset>
</copy>
-
- <mkdir dir="${hy.jdk}/jre/lib/fonts" />
- <copy todir="${hy.jdk}/jre/lib/fonts">
- <fileset dir="${dejavu-fonts.fonts.dir}">
- <include name="DejaVuSans.ttf" />
- <include name="DejaVuSans-*.ttf" />
- <exclude name="DejaVuSans-ExtraLight.ttf" />
- <include name="DejaVuSerif.ttf" />
- <include name="DejaVuSerif-*.ttf" />
- </fileset>
- </copy>
+
</target>
Modified: harmony/enhanced/classlib/branches/java6/make/build-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/make/build-test.xml?rev=803102&r1=803101&r2=803102&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/make/build-test.xml (original)
+++ harmony/enhanced/classlib/branches/java6/make/build-test.xml Tue Aug 11 13:07:55 2009
@@ -42,7 +42,7 @@
<target name="clean">
<delete dir="${tests.output}" />
<delete dir="${tests.support.output}" />
- <delete file="${hy.hdk}/build/test/support.jar" />
+ <delete dir="${hy.hdk}/build/test" />
</target>
<target name="clean-test-output">
@@ -103,12 +103,9 @@
<metainf refid="hy.required.metainf-files"/>
</jar>
<copy todir="${hy.hdk}/build/test">
- <fileset dir="${jetty.dir}">
- <include name="*.jar" />
- </fileset>
- <fileset dir="${derby.dir}">
- <include name="*.jar" />
- </fileset>
+ <fileset dir="${jetty.dir}">
+ <include name="*.jar" />
+ </fileset>
</copy>
</target>
Propchange: harmony/enhanced/classlib/branches/java6/make/depends-common.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug 11 13:07:55 2009
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/make/depends-common.xml:768152-798021
+/harmony/enhanced/classlib/trunk/make/depends-common.xml:768152-803061
Modified: harmony/enhanced/classlib/branches/java6/make/depends.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/make/depends.properties?rev=803102&r1=803101&r2=803102&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/make/depends.properties (original)
+++ harmony/enhanced/classlib/branches/java6/make/depends.properties Tue Aug 11 13:07:55 2009
@@ -16,7 +16,6 @@
depends.dir=depends
depends.jars=${depends.dir}/jars
maven2.base=http://repo1.maven.org/maven2
-sf.base=http://internap.dl.sourceforge.net/sourceforge
xalan.dir=${depends.jars}/xalan-j_2.7.0
xalan.orig.jar=${xalan.dir}/xalan.orig.jar
@@ -34,10 +33,15 @@
xmlsec.url=http://xml.apache.org/security/dist/java-library/xml-security-bin-1_4_0.zip
xmlsec.md5=79ffece964a40d33fb25f3f7a8e83f6b
-junit.dir=${depends.jars}/junit_4.4
-junit.jar=${junit.dir}/junit.jar
-junit.url=${maven2.base}/junit/junit/4.4/junit-4.4.jar
-junit.md5=f852bbb2bbe0471cef8e5b833cb36078
+junit.dir=${depends.jars}/junit_4.6
+junit.jar=${junit.dir}/junit-4.6.jar
+junit.url=${maven2.base}/junit/junit/4.6/junit-4.6.jar
+junit.md5=37dc57962c1275ebc572726a6f5cdd13
+
+hamcrest-library.dir=${depends.jars}/hamcrest-library_1.1
+hamcrest-library.jar=${hamcrest-library.dir}/hamcrest-library-1.1.jar
+hamcrest-library.url=${maven2.base}/org/hamcrest/hamcrest-library/1.1/hamcrest-library-1.1.jar
+hamcrest-library.md5=271f78edc4333f0f44df617676e0a874
msvcr.dir=${depends.dir}/libs/${hy.platform}
msvcp.dir=${depends.dir}/libs/${hy.platform}
@@ -79,31 +83,6 @@
servlet-api.md5=c27c02fb0a00cc3a7d05ea993a9bf56e
servlet-api.url=${maven2.base}/jetty/servlet-api/2.5-6.0.0/servlet-api-2.5-6.0.0.jar
-awtdeps.extract.dir=${depends.dir}/libs/build
-awtdeps.dir=${depends.dir}/libs/${hy.platform}
-awtdeps.base@x86@=http://people.apache.org/~geirm/harmony/
-awtdeps.tar@x86@=${awtdeps.dir}/swing_awt_deps_winxp_2006-09-28.tgz
-awtdeps.url@x86@=${awtdeps.base@x86@}swing_awt_deps_winxp_2006-09-28.tgz
-awtdeps.md5@x86@=d61a27e4b305d9fcabaaacf34f8f534a
-awtdeps.testfile@x86@=${awtdeps.extract.dir}/winxp_2006-09-28.txt
-
-awtdeps.base@x86_64@=http://people.apache.org/~ayza/harmony/64bit/
-awtdeps.tar@x86_64@=${awtdeps.dir}/swing_awt_deps_win64_2007-02-08.tgz
-awtdeps.url@x86_64@=${awtdeps.base@x86_64@}swing_awt_deps_win64_2007-02-08.tgz
-awtdeps.md5@x86_64@=f2bbb1f4f23100393783fd02a77fcc68
-awtdeps.testfile@x86_64@=${awtdeps.extract.dir}/win64_2007-02-08.txt
-
-dejavu-fonts.dir=${depends.dir}/dejavu-fonts
-dejavu-fonts.fonts.dir=${depends.dir}/dejavu-fonts/dejavu-ttf-2.18
-dejavu-fonts.zip=${dejavu-fonts.dir}/dejavu-ttf-2.18-1.zip
-dejavu-fonts.url=${sf.base}/dejavu/dejavu-ttf-2.18-1.zip
-dejavu-fonts.md5=72e0a87ec1f9c5c26c66eabcf1e2018e
-
-derby.dir=${depends.jars}/derby-10.3.1.4
-derby.jar=${derby.dir}/derby.jar
-derby.url=http://www.ibiblio.org/maven/org.apache.derby/jars/derby-10.3.1.4.jar
-derby.md5=f28d6047ab26445de53c4c96126494df
-
depends.url=http://svn.apache.org/repos/asf/harmony/standard/depends
bcprov.ver=bcprov-jdk15-141
Modified: harmony/enhanced/classlib/branches/java6/make/depends.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/make/depends.xml?rev=803102&r1=803101&r2=803102&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/make/depends.xml (original)
+++ harmony/enhanced/classlib/branches/java6/make/depends.xml Tue Aug 11 13:07:55 2009
@@ -31,44 +31,33 @@
<import file="${basedir}/make/depends-common.xml" />
<target name="check" description="Check whether dependencies are available"
- depends="-check,-check-win,-check-unix,-extract" />
+ depends="-check,-check-win,-extract" />
<target name="-check">
<check-one-file src="${xalan.url}" dest="${xalan.orig.jar}" />
<check-one-file src="${xerces.url}" dest="${xerces.zip}" />
<check-one-file src="${xmlsec.url}" dest="${xmlsec.zip}" />
<check-one-file src="${junit.url}" dest="${junit.jar}" />
+ <check-one-file src="${hamcrest-library.url}" dest="${hamcrest-library.jar}" />
<check-one-file src="${bcprov.url}" dest="${bcprov.jar}" />
<check-one-file src="${jetty.url}" dest="${jetty.jar}" />
<check-one-file src="${jetty-util.url}" dest="${jetty-util.jar}" />
<check-one-file src="${servlet-api.url}" dest="${servlet-api.jar}" />
- <check-one-file src="${dejavu-fonts.url}" dest="${dejavu-fonts.zip}" />
- <check-one-file src="${derby.url}" dest="${derby.jar}" />
<check-one-file src="${icu4j.url}" dest="${icu4j.jar}" />
<check-one-file src="${icu4j-charsets.url}" dest="${icu4j-charsets.jar}" />
</target>
- <target name="-check-win" if="is.windows" depends="-really-check-win" />
-
- <target name="-really-check-win" if="is.windows">
+ <target name="-check-win" if="is.windows">
<property environment="hyenv" />
<check-one-file src="${msvcr.url}" dest="${msvcr.dll}" />
<check-one-file src="${msvcp.url}" dest="${msvcp.dll}" />
- <check-one-file src="${awtdeps.url}" dest="${awtdeps.tar}" />
- <uptodate property="awtdeps.uptodate"
- srcfile="${awtdeps.tar}"
- targetfile="${awtdeps.testfile}" />
- <antcall target="-awt-tar-extract" />
</target>
<target name="-extract"
- depends="-extract-props,-extract-dejavu-fonts,-extract-xerces,-fix-xalan-manifest" />
+ depends="-extract-props,-extract-xerces,-fix-xalan-manifest" />
<target name="-extract-props">
- <uptodate property="dejavu-fonts.uptodate"
- srcfile="${dejavu-fonts.zip}"
- targetfile="${dejavu-fonts.fonts.dir}/DejaVuSerif.ttf" />
<uptodate property="xerces.uptodate"
srcfile="${xerces.zip}"
targetfile="${xerces.dir}/xercesImpl.jar" />
@@ -77,12 +66,6 @@
targetfile="${xalan.jar}" />
</target>
-
- <target name="-extract-dejavu-fonts" unless="dejavu-fonts.uptodate">
- <unzip src="${dejavu-fonts.zip}" dest="${dejavu-fonts.dir}" />
- <touch file="${dejavu-fonts.fonts.dir}/DejaVuSerif.ttf" />
- </target>
-
<target name="-extract-xerces" unless="xerces.uptodate">
<unzip src="${xerces.zip}" dest="${xerces.dir}.tmp" />
<copy todir="${xerces.dir}" flatten="yes">
@@ -107,105 +90,71 @@
<delete dir="${xalan.dir}.tmp" />
</target>
- <target name="-check-unix" if="is.unix">
-
- <property name="lcms.msg"
- value="liblcms development package not installed
-${line.separator}For Debian/Ubuntu try: apt-get install liblcms1-dev
-${line.separator}For Fedora try: yum install lcms-devel" />
- <check-os-file src="${lcms.home}/include/lcms.h"
- message="${lcms.msg}" />
-
- <property name="png.msg"
- value="libpng development package not installed
-${line.separator}For Debian/Ubuntu try: apt-get install libpng12-dev
-${line.separator}For Fedora try: yum install libpng-devel" />
- <check-os-file src="${png.home}/include/png.h"
- message="${png.msg}" />
-
- <property name="jpeg.msg"
- value="libjpeg development package not installed
-${line.separator}For Debian/Ubuntu try: apt-get install libjpeg62-dev
-${line.separator}For Fedora try: yum install libjpeg-devel" />
- <mkdir dir="depends/libs/build/jpeg" />
- <check-os-file src="${jpeg.home}/include/jconfig.h"
- message="${jpeg.msg}" />
-
- </target>
-
<target name="download" description="Download required jars"
depends="-download,-download-win" />
<target name="-download">
- <mkdir dir="${xalan.dir}" />
- <download-one-file src="${xalan.url}" dest="${xalan.orig.jar}"
+ <mkdir dir="${xalan.dir}" />
+ <download-one-file src="${xalan.url}" dest="${xalan.orig.jar}"
md5="${xalan.md5}" />
- <mkdir dir="${xerces.dir}" />
- <download-one-file src="${xerces.url}" dest="${xerces.zip}"
+ <mkdir dir="${xerces.dir}" />
+ <download-one-file src="${xerces.url}" dest="${xerces.zip}"
md5="${xerces.md5}" />
- <mkdir dir="${xmlsec.dir}" />
- <download-one-file src="${xmlsec.url}" dest="${xmlsec.zip}"
- md5="${xmlsec.md5}" />
+ <mkdir dir="${xmlsec.dir}" />
+ <download-one-file src="${xmlsec.url}" dest="${xmlsec.zip}"
+ md5="${xmlsec.md5}" />
- <mkdir dir="${junit.dir}" />
- <download-one-file src="${junit.url}" dest="${junit.jar}"
+ <mkdir dir="${junit.dir}" />
+ <download-one-file src="${junit.url}" dest="${junit.jar}"
md5="${junit.md5}" />
- <mkdir dir="${bcprov.dir}" />
- <download-one-file src="${bcprov.url}" dest="${bcprov.jar}"
+ <mkdir dir="${hamcrest-library.dir}" />
+ <download-one-file src="${hamcrest-library.url}"
+ dest="${hamcrest-library.jar}"
+ md5="${hamcrest-library.md5}" />
+
+ <mkdir dir="${bcprov.dir}" />
+ <download-one-file src="${bcprov.url}" dest="${bcprov.jar}"
md5="${bcprov.md5}" />
- <mkdir dir="${jetty.dir}" />
- <download-one-file src="${jetty.url}" dest="${jetty.jar}"
+ <mkdir dir="${jetty.dir}" />
+ <download-one-file src="${jetty.url}" dest="${jetty.jar}"
md5="${jetty.md5}" />
- <download-one-file src="${jetty-util.url}" dest="${jetty-util.jar}"
+ <download-one-file src="${jetty-util.url}" dest="${jetty-util.jar}"
md5="${jetty-util.md5}" />
-
+
<download-one-file src="${servlet-api.url}" dest="${servlet-api.jar}"
md5="${servlet-api.md5}" />
-
- <mkdir dir="${dejavu-fonts.dir}" />
- <download-one-file src="${dejavu-fonts.url}" dest="${dejavu-fonts.zip}"
- md5="${dejavu-fonts.md5}" />
-
- <mkdir dir="${derby.dir}" />
- <download-one-file src="${derby.url}"
- dest="${derby.jar}"
- md5="${derby.md5}" />
-
- <mkdir dir="${icu4j.dir}" />
- <download-one-file src="${icu4j.url}"
- dest="${icu4j.jar}"
- md5="${icu4j.md5}" />
- <download-one-file src="${icu4j-charsets.url}"
- dest="${icu4j-charsets.jar}"
- md5="${icu4j-charsets.md5}" />
+
+ <mkdir dir="${icu4j.dir}" />
+ <download-one-file src="${icu4j.url}"
+ dest="${icu4j.jar}"
+ md5="${icu4j.md5}" />
+ <download-one-file src="${icu4j-charsets.url}"
+ dest="${icu4j-charsets.jar}"
+ md5="${icu4j-charsets.md5}" />
</target>
<target name="-download-win" if="is.windows">
- <property environment="hyenv" />
+ <property environment="hyenv" />
+
+ <mkdir dir="${msvcr.dir}" />
+ <download-one-file src="${msvcr.url}"
+ dest="${msvcr.dll}"
+ md5="${msvcr.md5}"
+ md5-deprecated="${msvcr.md5.deprecated}" />
+
+ <mkdir dir="${msvcp.dir}" />
+ <download-one-file src="${msvcp.url}"
+ dest="${msvcp.dll}"
+ md5="${msvcp.md5}"
+ md5-deprecated="${msvcp.md5.deprecated}" />
- <mkdir dir="${msvcr.dir}" />
- <download-one-file src="${msvcr.url}"
- dest="${msvcr.dll}"
- md5="${msvcr.md5}"
- md5-deprecated="${msvcr.md5.deprecated}" />
-
- <mkdir dir="${msvcp.dir}" />
- <download-one-file src="${msvcp.url}"
- dest="${msvcp.dll}"
- md5="${msvcp.md5}"
- md5-deprecated="${msvcp.md5.deprecated}" />
-
- <mkdir dir="${awtdeps.dir}" />
- <download-one-file src="${awtdeps.url}"
- dest="${awtdeps.tar}"
- md5="${awtdeps.md5}" />
</target>
</project>
Modified: harmony/enhanced/classlib/branches/java6/make/properties.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/make/properties.xml?rev=803102&r1=803101&r2=803102&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/make/properties.xml (original)
+++ harmony/enhanced/classlib/branches/java6/make/properties.xml Tue Aug 11 13:07:55 2009
@@ -702,6 +702,7 @@
</bootclasspath>
<classpath location="${hy.hdk}/build/test/support.jar" />
+ <classpath location="../../build/classes" />
</javac>
</sequential>
</macrodef>
@@ -745,7 +746,7 @@
<junit-elements />
<batchtest todir="${tests.output}" haltonfailure="no">
- <zipfileset src="${test.module.dir}/@{jar}">
+ <zipfileset src="${test.module.dir}/@{jar}" encoding="UTF-8">
<exclude name="Test.class" />
<exclude name="**/*$*" />
@@ -821,7 +822,7 @@
<junit-elements />
<batchtest todir="${tests.output}" haltonfailure="no">
- <zipfileset src="${test.module.dir}/@{jar}">
+ <zipfileset src="${test.module.dir}/@{jar}" encoding="UTF-8">
<exclude name="Test.class" />
<exclude name="**/*$*" />
Modified: harmony/enhanced/classlib/branches/java6/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/make/run-test.xml?rev=803102&r1=803101&r2=803102&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/make/run-test.xml (original)
+++ harmony/enhanced/classlib/branches/java6/make/run-test.xml Tue Aug 11 13:07:55 2009
@@ -21,7 +21,6 @@
<property name="hy.hdk" location="../.." />
<property name="test.jre.home" location="${hy.hdk}/jdk/jre" />
<property file="test.properties" />
- <property name="build.module" value="all"/>
<!-- These two parameters could be assigned by user -->
<property name="target.dir" value="." />
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=803102&r1=803101&r2=803102&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/accessibility/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/accessibility/build.xml Tue Aug 11 13:07:55 2009
@@ -131,7 +131,8 @@
</filterchain>
</copy>
- <copy file="../../${junit.jar}" todir="${hy.hdk}/build/test" />
+ <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=803102&r1=803101&r2=803102&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/annotation/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/annotation/build.xml Tue Aug 11 13:07:55 2009
@@ -129,7 +129,8 @@
</filterchain>
</copy>
- <copy file="../../${junit.jar}" todir="${hy.hdk}/build/test" />
+ <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=803102&r1=803101&r2=803102&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/applet/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/applet/build.xml Tue Aug 11 13:07:55 2009
@@ -130,7 +130,8 @@
</filterchain>
</copy>
- <copy file="../../${junit.jar}" todir="${hy.hdk}/build/test" />
+ <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=803102&r1=803101&r2=803102&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/archive/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/archive/build.xml Tue Aug 11 13:07:55 2009
@@ -262,7 +262,8 @@
<fileset dir="src/test/resources" />
</copy>
- <copy file="../../${junit.jar}" todir="${hy.hdk}/build/test" />
+ <copy file="../../${junit.jar}"
+ tofile="${hy.hdk}/build/test/junit.jar" />
</target>
<target name="compile-tests">
Modified: harmony/enhanced/classlib/branches/java6/modules/archive/src/main/native/archive/shared/deflater.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/archive/src/main/native/archive/shared/deflater.c?rev=803102&r1=803101&r2=803102&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/archive/src/main/native/archive/shared/deflater.c (original)
+++ harmony/enhanced/classlib/branches/java6/modules/archive/src/main/native/archive/shared/deflater.c Tue Aug 11 13:07:55 2009
@@ -22,7 +22,6 @@
#include "zlib.h"
#include "inflater.h"
#include "jclglob.h"
-#include "jclprots.h"
#ifndef HY_ZIP_API
void zfree PROTOTYPE ((void *opaque, void *address));
Modified: harmony/enhanced/classlib/branches/java6/modules/archive/src/main/native/archive/shared/jarfile.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/archive/src/main/native/archive/shared/jarfile.c?rev=803102&r1=803101&r2=803102&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/archive/src/main/native/archive/shared/jarfile.c (original)
+++ harmony/enhanced/classlib/branches/java6/modules/archive/src/main/native/archive/shared/jarfile.c Tue Aug 11 13:07:55 2009
@@ -19,7 +19,6 @@
#include "iohelp.h"
#include "exceptions.h"
#include "jclglob.h"
-#include "jclprots.h"
#ifndef HY_ZIP_API
#include "zipsup.h"
Modified: harmony/enhanced/classlib/branches/java6/modules/archive/src/main/native/archive/shared/zip.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/archive/src/main/native/archive/shared/zip.c?rev=803102&r1=803101&r2=803102&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/archive/src/main/native/archive/shared/zip.c (original)
+++ harmony/enhanced/classlib/branches/java6/modules/archive/src/main/native/archive/shared/zip.c Tue Aug 11 13:07:55 2009
@@ -18,7 +18,6 @@
#include "iohelp.h"
#include "exceptions.h"
#include "jclglob.h"
-#include "jclprots.h"
#include "zip.h"
void zfree PROTOTYPE ((void *opaque, void *address));
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=803102&r1=803101&r2=803102&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/auth/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/auth/build.xml Tue Aug 11 13:07:55 2009
@@ -91,6 +91,8 @@
target="${hy.javac.target}"
debug="${hy.javac.debug}">
+ <compilerarg line="${build.compilerarg}" />
+
<src>
<pathelement location="src/main/java/common"/>
<pathelement location="src/main/java/${hy.os.family}" />
@@ -163,7 +165,8 @@
</filterchain>
</copy>
- <copy file="../../${junit.jar}" todir="${hy.hdk}/build/test" />
+ <copy file="../../${junit.jar}"
+ tofile="${hy.hdk}/build/test/junit.jar" />
</target>
<target name="compile-tests">
Modified: harmony/enhanced/classlib/branches/java6/modules/auth/src/main/java/common/javax/security/auth/kerberos/KeyImpl.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/auth/src/main/java/common/javax/security/auth/kerberos/KeyImpl.java?rev=803102&r1=803101&r2=803102&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/auth/src/main/java/common/javax/security/auth/kerberos/KeyImpl.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/auth/src/main/java/common/javax/security/auth/kerberos/KeyImpl.java Tue Aug 11 13:07:55 2009
@@ -134,7 +134,8 @@
buf.append(realm);
buf.append(pname.substring(0, pname.length() - realm.length() - 1));
- byte[] tmp = buf.toString().getBytes();
+ byte[] tmp = org.apache.harmony.luni.util.Util.getUTF8Bytes(buf
+ .toString());
// pad with 0x00 to 8 byte boundary
byte[] raw = new byte[tmp.length
Modified: harmony/enhanced/classlib/branches/java6/modules/auth/src/main/java/common/org/apache/harmony/auth/module/LoginModuleUtils.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/auth/src/main/java/common/org/apache/harmony/auth/module/LoginModuleUtils.java?rev=803102&r1=803101&r2=803102&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/auth/src/main/java/common/org/apache/harmony/auth/module/LoginModuleUtils.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/auth/src/main/java/common/org/apache/harmony/auth/module/LoginModuleUtils.java Tue Aug 11 13:07:55 2009
@@ -17,6 +17,7 @@
package org.apache.harmony.auth.module;
+import java.io.BufferedInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.util.Arrays;
@@ -123,41 +124,46 @@
* @throws IOException
*/
public static char[] getPassword(InputStream in) throws IOException {
- char[] buffer = new char[512];
-
- // 1.Just ASCII encoding is supported. bytes read from inputstream is
- // cast and put into char array.
- // 2.just read one line.
- int length = 0;
- int nextChar = -1;
+ // just read one line.
+ char[] passwdBuffer = new char[512];
+ int passwdLength = 0;
boolean hasCarriage = false;
- do {
- nextChar = in.read();
- if (nextChar == -1 || nextChar == '\n') {
- break;
- }
-
- if (hasCarriage) {
- buffer = appendChars(buffer, '\r', length++);
- hasCarriage = false;
+ boolean isFinished = false;
+ BufferedInputStream bis = new BufferedInputStream(in);
+ byte[] byteBuffer = new byte[512];
+ byte[] utf8Bytes;
+ int readLength;
+ while (!isFinished && (readLength = bis.read(byteBuffer)) != -1) {
+ utf8Bytes = new String(byteBuffer, 0, readLength).getBytes("UTF-8"); //$NON-NLS-1$
+ for (int index = 0; index < readLength; index++) {
+ if (utf8Bytes[index] == '\n') {
+ isFinished = true;
+ break;
+ }
+
+ if (hasCarriage) {
+ passwdBuffer = appendChars(passwdBuffer, '\r',
+ passwdLength++);
+ hasCarriage = false;
+ }
+
+ if (utf8Bytes[index] == '\r') {
+ hasCarriage = true;
+ } else {
+ passwdBuffer = appendChars(passwdBuffer,
+ (char) utf8Bytes[index], passwdLength++);
+ }
}
+ }
- if (nextChar == '\r') {
- hasCarriage = true;
- } else {
- buffer = appendChars(buffer, (char) nextChar, length++);
- }
-
- } while (true);
-
- if (length == 0) {
+ if (passwdLength == 0) {
return null;
}
- char[] password = new char[length];
- System.arraycopy(buffer, 0, password, 0, length);
- return password;
+ char[] passwd = new char[passwdLength];
+ System.arraycopy(passwdBuffer, 0, passwd, 0, passwdLength);
+ return passwd;
}
private static char[] appendChars(char[] src, char c, int position) {
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=803102&r1=803101&r2=803102&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/build.xml Tue Aug 11 13:07:55 2009
@@ -21,11 +21,116 @@
<property name="hy.module" value="awt" />
<property name="hy.hdk" location="${basedir}/../../deploy" />
+ <property name="depends.dir" location="${basedir}/../../depends" />
<import file="${hy.hdk}/build/ant/properties.xml" />
+ <import file="${hy.hdk}/build/ant/depends.xml" />
<property file="../../make/depends.properties" />
- <target name="build" depends="compile-java, copy-resources, build-jar" />
+ <target name="build"
+ depends="check-depends,compile-java, copy-resources, build-jar" />
+
+ <target name="check-depends" depends="-check-depends,-extract" />
+
+ <target name="-check-depends"
+ depends="-check-win-depends,-check-unix-depends">
+ <check-one-file src="${dejavu-fonts.url}" dest="${dejavu-fonts.zip}" />
+ </target>
+
+ <target name="-check-win-depends" if="is.windows">
+ <check-one-file src="${jpeg.url}" dest="${jpeg.tar}" />
+ <check-one-file src="${lcms.url}" dest="${lcms.tar}" />
+ <check-one-file src="${png.url}" dest="${png.tar}" />
+ </target>
+
+ <target name="-check-unix-depends" if="is.unix">
+ <property name="jpeg.msg"
+ value="libjpeg development package not installed
+${line.separator}For Debian/Ubuntu try: apt-get install libjpeg62-dev
+${line.separator}For Fedora try: yum install libjpeg-devel" />
+ <check-os-file src="${jpeg.home}/include/jconfig.h"
+ message="${jpeg.msg}" />
+
+ <property name="lcms.msg"
+ value="liblcms development package not installed
+${line.separator}For Debian/Ubuntu try: apt-get install liblcms1-dev
+${line.separator}For Fedora try: yum install lcms-devel" />
+ <check-os-file src="${lcms.home}/include/lcms.h"
+ message="${lcms.msg}" />
+
+ <property name="png.msg"
+ value="libpng development package not installed
+${line.separator}For Debian/Ubuntu try: apt-get install libpng12-dev
+${line.separator}For Fedora try: yum install libpng-devel" />
+ <check-os-file src="${png.home}/include/png.h"
+ message="${png.msg}" />
+ </target>
+
+ <target name="-extract"
+ depends="-extract-props,-extract-dejavu-fonts,-extract-win" />
+
+ <target name="-extract-props">
+ <uptodate property="dejavu-fonts.uptodate"
+ srcfile="${dejavu-fonts.zip}"
+ targetfile="${dejavu-fonts.fonts.dir}/DejaVuSerif.ttf" />
+ </target>
+
+ <target name="-extract-dejavu-fonts" unless="dejavu-fonts.uptodate">
+ <unzip src="${dejavu-fonts.zip}" dest="${dejavu-fonts.dir}" />
+ <touch file="${dejavu-fonts.fonts.dir}/DejaVuSerif.ttf" />
+ </target>
+
+ <target name="-extract-win"
+ depends="-ext-props,-ext-jpeg,-ext-lcms,-ext-png" />
+
+ <target name="-ext-props" if="is.windows">
+ <uptodate property="jpeg.uptodate"
+ srcfile="${jpeg.tar}"
+ targetfile="${jpeg.testfile}" />
+ <uptodate property="lcms.uptodate"
+ srcfile="${lcms.tar}"
+ targetfile="${lcms.testfile}" />
+ <uptodate property="png.uptodate"
+ srcfile="${png.tar}"
+ targetfile="${png.testfile}" />
+ </target>
+
+ <target name="-ext-jpeg" if="is.windows" unless="jpeg.uptodate">
+ <echo>Extracting jpeg dependencies</echo>
+ <untar src="${jpeg.tar}" dest="${depends.lib.dir}" compression="gzip" />
+ <touch file="${jpeg.testfile}" />
+ </target>
+ <target name="-ext-lcms" if="is.windows" unless="lcms.uptodate">
+ <echo>Extracting lcms dependencies</echo>
+ <untar src="${lcms.tar}" dest="${depends.lib.dir}" compression="gzip" />
+ <touch file="${lcms.testfile}" />
+ </target>
+ <target name="-ext-png" if="is.windows" unless="png.uptodate">
+ <echo>Extracting png dependencies</echo>
+ <untar src="${png.tar}" dest="${depends.lib.dir}" compression="gzip" />
+ <touch file="${png.testfile}" />
+ </target>
+
+ <target name="fetch-depends" depends="-fetch-win-depends">
+ <mkdir dir="${dejavu-fonts.dir}" />
+ <download-one-file src="${dejavu-fonts.url}" dest="${dejavu-fonts.zip}"
+ md5="${dejavu-fonts.md5}" />
+ </target>
+
+ <target name="-fetch-win-depends" if="is.windows">
+ <mkdir dir="${jpeg.dir}" />
+ <download-one-file src="${jpeg.url}"
+ dest="${jpeg.tar}"
+ md5="${jpeg.md5}" />
+ <mkdir dir="${lcms.dir}" />
+ <download-one-file src="${lcms.url}"
+ dest="${lcms.tar}"
+ md5="${lcms.md5}" />
+ <mkdir dir="${png.dir}" />
+ <download-one-file src="${png.url}"
+ dest="${png.tar}"
+ md5="${png.md5}" />
+ </target>
<target name="test" depends="-test-module">
<fail message="Some tests failed">
@@ -46,6 +151,7 @@
<delete file="${hy.jdk}/jre/lib/boot/awt-src.jar" />
<delete dir="${tests.hdk.dir}" failonerror="false" />
<delete dir="${hy.jdk}/jre/lib/cmm" quiet="true" />
+ <delete dir="${hy.jdk}/jre/lib/fonts" quiet="true" />
<delete failonerror="false">
<fileset refid="classes" />
</delete>
@@ -92,7 +198,18 @@
<mkdir dir="${hy.jdk}/jre/lib/cmm" />
<copy todir="${hy.jdk}/jre/lib/cmm">
<fileset dir="src/main/resources/cmm"/>
- </copy>
+ </copy>
+
+ <mkdir dir="${hy.jdk}/jre/lib/fonts" />
+ <copy todir="${hy.jdk}/jre/lib/fonts">
+ <fileset dir="${dejavu-fonts.fonts.dir}">
+ <include name="DejaVuSans.ttf" />
+ <include name="DejaVuSans-*.ttf" />
+ <exclude name="DejaVuSans-ExtraLight.ttf" />
+ <include name="DejaVuSerif.ttf" />
+ <include name="DejaVuSerif-*.ttf" />
+ </fileset>
+ </copy>
</target>
<target name="-copy-win-resources" if="is.windows">
@@ -335,7 +452,7 @@
<fileset dir="src/test/api/resources" />
</copy>
- <copy file="../../${junit.jar}" todir="${hy.hdk}/build/test" />
+ <copy file="${junit.jar}" todir="${hy.hdk}/build/test" />
</target>
<target name="compile-tests">
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/gl/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/gl/windows/makefile?rev=803102&r1=803101&r2=803102&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/gl/windows/makefile (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/gl/windows/makefile Tue Aug 11 13:07:55 2009
@@ -16,7 +16,7 @@
APPVER = 5.0 # Need WINVER=0x0500 to get HMONITOR defined.
!include <$(HY_HDK)\build\make\defines.mak>
-PNG_DIR=$(HY_HDK)\..\depends\libs\build\png\# avoid continuation
+PNG_DIR=$(HY_HDK)\..\depends\libs\$(HY_PLATFORM)\png-1.2.12\# avoid continuation
LIBBASE=gl
DLLNAME=..\$(LIBBASE).dll
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/jpegdecoder/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/jpegdecoder/windows/makefile?rev=803102&r1=803101&r2=803102&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/jpegdecoder/windows/makefile (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/jpegdecoder/windows/makefile Tue Aug 11 13:07:55 2009
@@ -15,7 +15,7 @@
!include <$(HY_HDK)\build\make\defines.mak>
-JPEG_DIR=$(HY_HDK)\..\depends\libs\build\jpeg\# avoid continuation
+JPEG_DIR=$(HY_HDK)\..\depends\libs\$(HY_PLATFORM)\jpeg-6b\# avoid continuation
LIBBASE=jpegdecoder
DLLNAME=..\$(LIBBASE).dll
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/lcmm/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/lcmm/windows/makefile?rev=803102&r1=803101&r2=803102&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/lcmm/windows/makefile (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/lcmm/windows/makefile Tue Aug 11 13:07:55 2009
@@ -15,7 +15,7 @@
!include <$(HY_HDK)\build\make\defines.mak>
-LCMS_DIR=$(HY_HDK)\..\depends\libs\build\lcms\# comment to avoid continuation
+LCMS_DIR=$(HY_HDK)\..\depends\libs\$(HY_PLATFORM)\lcms-1.15\# avoid continuation
LIBBASE=lcmm
DLLNAME=..\$(LIBBASE).dll
@@ -35,7 +35,7 @@
SYSLIBFILES = ws2_32.lib Iphlpapi.lib
MDLLIBFILES = $(MDLLIBFILES) \
- $(LIBPATH)hypool$(HY_LINKLIB_SUFFIX) $(LIBPATH)vmi$(HY_LINKLIB_SUFFIX) $(LCMS_DIR)lcms114$(HY_LINKLIB_SUFFIX)
+ $(LIBPATH)hypool$(HY_LINKLIB_SUFFIX) $(LIBPATH)vmi$(HY_LINKLIB_SUFFIX) $(LCMS_DIR)lcms$(HY_LINKLIB_SUFFIX)
DLLBASE=0x13300000
COMMENT=/comment:"LCMM Wrapper native code. (c) Copyright 2005, 2007 The Apache Software Foundation or its licensors, as applicable."
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/test/api/java/org/apache/harmony/awt/tests/image/ImageLoadingTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/test/api/java/org/apache/harmony/awt/tests/image/ImageLoadingTest.java?rev=803102&r1=803101&r2=803102&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/test/api/java/org/apache/harmony/awt/tests/image/ImageLoadingTest.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/test/api/java/org/apache/harmony/awt/tests/image/ImageLoadingTest.java Tue Aug 11 13:07:55 2009
@@ -31,8 +31,6 @@
url = Support_Resources.class
.getResource(Support_Resources.RESOURCE_PACKAGE + "Harmony.GIF");
- System.out.println(url);
- System.out.println(url.getContent());
assertTrue("Returned object doesn't implement ImageProducer interface",
url.getContent() instanceof ImageProducer);
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=803102&r1=803101&r2=803102&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/beans/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/beans/build.xml Tue Aug 11 13:07:55 2009
@@ -154,7 +154,8 @@
</fileset>
</copy>
- <copy file="../../${junit.jar}" todir="${hy.hdk}/build/test" />
+ <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=803102&r1=803101&r2=803102&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/concurrent/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/concurrent/build.xml Tue Aug 11 13:07:55 2009
@@ -120,7 +120,8 @@
</filterchain>
</copy>
- <copy file="../../${junit.jar}" todir="${hy.hdk}/build/test" />
+ <copy file="../../${junit.jar}"
+ tofile="${hy.hdk}/build/test/junit.jar" />
</target>
<target name="compile-tests">
Modified: harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/Delayed.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/Delayed.java?rev=803102&r1=803101&r2=803102&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/Delayed.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/Delayed.java Tue Aug 11 13:07:55 2009
@@ -4,11 +4,6 @@
* http://creativecommons.org/licenses/publicdomain
*/
-/*
- * Modified in Apache Harmony to comply with Java 5 signature
- * specification.
- */
-
package java.util.concurrent;
import java.util.*;
Modified: harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/Executors.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/Executors.java?rev=803102&r1=803101&r2=803102&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/Executors.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/Executors.java Tue Aug 11 13:07:55 2009
@@ -359,7 +359,7 @@
* @return a callable object
* @throws NullPointerException if action null
*/
- public static Callable<Object> callable(final PrivilegedAction<?> action) {
+ public static Callable<Object> callable(final PrivilegedAction action) {
if (action == null)
throw new NullPointerException();
return new Callable<Object>() {
@@ -374,7 +374,7 @@
* @return a callable object
* @throws NullPointerException if action null
*/
- public static Callable<Object> callable(final PrivilegedExceptionAction<?> action) {
+ public static Callable<Object> callable(final PrivilegedExceptionAction action) {
if (action == null)
throw new NullPointerException();
return new Callable<Object>() {
Modified: harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/TimeUnit.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/TimeUnit.java?rev=803102&r1=803101&r2=803102&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/TimeUnit.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/TimeUnit.java Tue Aug 11 13:07:55 2009
@@ -83,39 +83,6 @@
public long toDays(long d) { return d/(C6/C3); }
public long convert(long d, TimeUnit u) { return u.toSeconds(d); }
int excessNanos(long d, long m) { return 0; }
- },
- MINUTES {
- public long toNanos(long d) { return x(d, C4/C0, MAX/(C4/C0)); }
- public long toMicros(long d) { return x(d, C4/C1, MAX/(C4/C1)); }
- public long toMillis(long d) { return x(d, C4/C2, MAX/(C4/C2)); }
- public long toSeconds(long d) { return x(d, C4/C3, MAX/(C4/C3)); }
- public long toMinutes(long d) { return d; }
- public long toHours(long d) { return d/(C5/C4); }
- public long toDays(long d) { return d/(C6/C4); }
- public long convert(long d, TimeUnit u) { return u.toMinutes(d); }
- int excessNanos(long d, long m) { return 0; }
- },
- HOURS {
- public long toNanos(long d) { return x(d, C5/C0, MAX/(C5/C0)); }
- public long toMicros(long d) { return x(d, C5/C1, MAX/(C5/C1)); }
- public long toMillis(long d) { return x(d, C5/C2, MAX/(C5/C2)); }
- public long toSeconds(long d) { return x(d, C5/C3, MAX/(C5/C3)); }
- public long toMinutes(long d) { return x(d, C5/C4, MAX/(C5/C4)); }
- public long toHours(long d) { return d; }
- public long toDays(long d) { return d/(C6/C5); }
- public long convert(long d, TimeUnit u) { return u.toHours(d); }
- int excessNanos(long d, long m) { return 0; }
- },
- DAYS {
- public long toNanos(long d) { return x(d, C6/C0, MAX/(C6/C0)); }
- public long toMicros(long d) { return x(d, C6/C1, MAX/(C6/C1)); }
- public long toMillis(long d) { return x(d, C6/C2, MAX/(C6/C2)); }
- public long toSeconds(long d) { return x(d, C6/C3, MAX/(C6/C3)); }
- public long toMinutes(long d) { return x(d, C6/C4, MAX/(C6/C4)); }
- public long toHours(long d) { return x(d, C6/C5, MAX/(C6/C5)); }
- public long toDays(long d) { return d; }
- public long convert(long d, TimeUnit u) { return u.toDays(d); }
- int excessNanos(long d, long m) { return 0; }
};
// Handy constants for conversion methods
Propchange: harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/atomic/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug 11 13:07:55 2009
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/atomic:765923-798021
+/harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/atomic:765923-803061
Propchange: harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/locks/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug 11 13:07:55 2009
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/locks:765923-798021
+/harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/locks:765923-803061
Modified: harmony/enhanced/classlib/branches/java6/modules/concurrent/src/test/java/TimeUnitTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/concurrent/src/test/java/TimeUnitTest.java?rev=803102&r1=803101&r2=803102&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/concurrent/src/test/java/TimeUnitTest.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/concurrent/src/test/java/TimeUnitTest.java Tue Aug 11 13:07:55 2009
@@ -27,17 +27,8 @@
*/
public void testConvert() {
for (long t = 0; t < 88888; ++t) {
- assertEquals(t*60*60*24,
- TimeUnit.SECONDS.convert(t,
- TimeUnit.DAYS));
- assertEquals(t*60*60,
- TimeUnit.SECONDS.convert(t,
- TimeUnit.HOURS));
- assertEquals(t*60,
- TimeUnit.SECONDS.convert(t,
- TimeUnit.MINUTES));
- assertEquals(t,
- TimeUnit.SECONDS.convert(t,
+ assertEquals(t,
+ TimeUnit.SECONDS.convert(t,
TimeUnit.SECONDS));
assertEquals(t,
TimeUnit.SECONDS.convert(1000L*t,
@@ -50,16 +41,7 @@
TimeUnit.NANOSECONDS));
- assertEquals(1000L*t*60*60*24,
- TimeUnit.MILLISECONDS.convert(t,
- TimeUnit.DAYS));
- assertEquals(1000L*t*60*60,
- TimeUnit.MILLISECONDS.convert(t,
- TimeUnit.HOURS));
- assertEquals(1000L*t*60,
- TimeUnit.MILLISECONDS.convert(t,
- TimeUnit.MINUTES));
- assertEquals(1000L*t,
+ assertEquals(1000L*t,
TimeUnit.MILLISECONDS.convert(t,
TimeUnit.SECONDS));
assertEquals(t,
@@ -72,16 +54,7 @@
TimeUnit.MILLISECONDS.convert(1000000L*t,
TimeUnit.NANOSECONDS));
- assertEquals(1000000L*t*60*60*24,
- TimeUnit.MICROSECONDS.convert(t,
- TimeUnit.DAYS));
- assertEquals(1000000L*t*60*60,
- TimeUnit.MICROSECONDS.convert(t,
- TimeUnit.HOURS));
- assertEquals(1000000L*t*60,
- TimeUnit.MICROSECONDS.convert(t,
- TimeUnit.MINUTES));
- assertEquals(1000000L*t,
+ assertEquals(1000000L*t,
TimeUnit.MICROSECONDS.convert(t,
TimeUnit.SECONDS));
assertEquals(1000L*t,
@@ -94,16 +67,7 @@
TimeUnit.MICROSECONDS.convert(1000L*t,
TimeUnit.NANOSECONDS));
- assertEquals(1000000000L*t*60*60*24,
- TimeUnit.NANOSECONDS.convert(t,
- TimeUnit.DAYS));
- assertEquals(1000000000L*t*60*60,
- TimeUnit.NANOSECONDS.convert(t,
- TimeUnit.HOURS));
- assertEquals(1000000000L*t*60,
- TimeUnit.NANOSECONDS.convert(t,
- TimeUnit.MINUTES));
- assertEquals(1000000000L*t,
+ assertEquals(1000000000L*t,
TimeUnit.NANOSECONDS.convert(t,
TimeUnit.SECONDS));
assertEquals(1000000L*t,
@@ -124,13 +88,7 @@
*/
public void testToNanos() {
for (long t = 0; t < 88888; ++t) {
- assertEquals(t*1000000000L*60*60*24,
- TimeUnit.DAYS.toNanos(t));
- assertEquals(t*1000000000L*60*60,
- TimeUnit.HOURS.toNanos(t));
- assertEquals(t*1000000000L*60,
- TimeUnit.MINUTES.toNanos(t));
- assertEquals(1000000000L*t,
+ assertEquals(1000000000L*t,
TimeUnit.SECONDS.toNanos(t));
assertEquals(1000000L*t,
TimeUnit.MILLISECONDS.toNanos(t));
@@ -147,13 +105,7 @@
*/
public void testToMicros() {
for (long t = 0; t < 88888; ++t) {
- assertEquals(t*1000000L*60*60*24,
- TimeUnit.DAYS.toMicros(t));
- assertEquals(t*1000000L*60*60,
- TimeUnit.HOURS.toMicros(t));
- assertEquals(t*1000000L*60,
- TimeUnit.MINUTES.toMicros(t));
- assertEquals(1000000L*t,
+ assertEquals(1000000L*t,
TimeUnit.SECONDS.toMicros(t));
assertEquals(1000L*t,
TimeUnit.MILLISECONDS.toMicros(t));
@@ -170,13 +122,7 @@
*/
public void testToMillis() {
for (long t = 0; t < 88888; ++t) {
- assertEquals(t*1000L*60*60*24,
- TimeUnit.DAYS.toMillis(t));
- assertEquals(t*1000L*60*60,
- TimeUnit.HOURS.toMillis(t));
- assertEquals(t*1000L*60,
- TimeUnit.MINUTES.toMillis(t));
- assertEquals(1000L*t,
+ assertEquals(1000L*t,
TimeUnit.SECONDS.toMillis(t));
assertEquals(t,
TimeUnit.MILLISECONDS.toMillis(t));
@@ -193,13 +139,7 @@
*/
public void testToSeconds() {
for (long t = 0; t < 88888; ++t) {
- assertEquals(t*60*60*24,
- TimeUnit.DAYS.toSeconds(t));
- assertEquals(t*60*60,
- TimeUnit.HOURS.toSeconds(t));
- assertEquals(t*60,
- TimeUnit.MINUTES.toSeconds(t));
- assertEquals(t,
+ assertEquals(t,
TimeUnit.SECONDS.toSeconds(t));
assertEquals(t,
TimeUnit.MILLISECONDS.toSeconds(t*1000L));
@@ -221,25 +161,6 @@
assertEquals(Long.MIN_VALUE,
TimeUnit.NANOSECONDS.convert(-Long.MAX_VALUE / 4,
TimeUnit.SECONDS));
- assertEquals(Long.MAX_VALUE,
- TimeUnit.NANOSECONDS.convert(Long.MAX_VALUE / 2,
- TimeUnit.MINUTES));
- assertEquals(Long.MIN_VALUE,
- TimeUnit.NANOSECONDS.convert(-Long.MAX_VALUE / 4,
- TimeUnit.MINUTES));
- assertEquals(Long.MAX_VALUE,
- TimeUnit.NANOSECONDS.convert(Long.MAX_VALUE / 2,
- TimeUnit.HOURS));
- assertEquals(Long.MIN_VALUE,
- TimeUnit.NANOSECONDS.convert(-Long.MAX_VALUE / 4,
- TimeUnit.HOURS));
- assertEquals(Long.MAX_VALUE,
- TimeUnit.NANOSECONDS.convert(Long.MAX_VALUE / 2,
- TimeUnit.DAYS));
- assertEquals(Long.MIN_VALUE,
- TimeUnit.NANOSECONDS.convert(-Long.MAX_VALUE / 4,
- TimeUnit.DAYS));
-
}
/**
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=803102&r1=803101&r2=803102&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/crypto/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/crypto/build.xml Tue Aug 11 13:07:55 2009
@@ -163,7 +163,8 @@
<fileset dir="src/test/resources" />
</copy>
- <copy file="../../${junit.jar}" todir="${hy.hdk}/build/test" />
+ <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=803102&r1=803101&r2=803102&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/imageio/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/imageio/build.xml Tue Aug 11 13:07:55 2009
@@ -21,11 +21,73 @@
<property name="hy.module" value="imageio" />
<property name="hy.hdk" location="${basedir}/../../deploy" />
+ <property name="depends.dir" location="${basedir}/../../depends" />
<import file="${hy.hdk}/build/ant/properties.xml" />
+ <import file="${hy.hdk}/build/ant/depends.xml" />
<property file="../../make/depends.properties" />
- <target name="build" depends="compile-java, copy-resources, build-jar" />
+ <target name="build"
+ depends="check-depends,compile-java,copy-resources,build-jar" />
+
+ <target name="check-depends"
+ depends="-check-win-depends,-check-unix-depends" />
+
+ <target name="-check-win-depends" if="is.windows"
+ depends="-really-check-win-depends,-ext-props,-ext-jpeg,-ext-png" />
+
+ <target name="-really-check-win-depends" if="is.windows">
+ <check-one-file src="${jpeg.url}" dest="${jpeg.tar}" />
+ <check-one-file src="${png.url}" dest="${png.tar}" />
+ </target>
+
+ <target name="-check-unix-depends" if="is.unix">
+ <property name="jpeg.msg"
+ value="libjpeg development package not installed
+${line.separator}For Debian/Ubuntu try: apt-get install libjpeg62-dev
+${line.separator}For Fedora try: yum install libjpeg-devel" />
+ <check-os-file src="${jpeg.home}/include/jconfig.h"
+ message="${jpeg.msg}" />
+
+ <property name="png.msg"
+ value="libpng development package not installed
+${line.separator}For Debian/Ubuntu try: apt-get install libpng12-dev
+${line.separator}For Fedora try: yum install libpng-devel" />
+ <check-os-file src="${png.home}/include/png.h"
+ message="${png.msg}" />
+ </target>
+
+ <target name="-ext-props" if="is.windows">
+ <uptodate property="jpeg.uptodate"
+ srcfile="${jpeg.tar}"
+ targetfile="${jpeg.testfile}" />
+ <uptodate property="png.uptodate"
+ srcfile="${png.tar}"
+ targetfile="${png.testfile}" />
+ </target>
+
+ <target name="-ext-jpeg" if="is.windows" unless="jpeg.uptodate">
+ <echo>Extracting jpeg dependencies</echo>
+ <untar src="${jpeg.tar}" dest="${depends.lib.dir}" compression="gzip" />
+ <touch file="${jpeg.testfile}" />
+ </target>
+
+ <target name="-ext-png" if="is.windows" unless="png.uptodate">
+ <echo>Extracting png dependencies</echo>
+ <untar src="${png.tar}" dest="${depends.lib.dir}" compression="gzip" />
+ <touch file="${png.testfile}" />
+ </target>
+
+ <target name="fetch-depends" if="is.windows">
+ <mkdir dir="${jpeg.dir}" />
+ <download-one-file src="${jpeg.url}"
+ dest="${jpeg.tar}"
+ md5="${jpeg.md5}" />
+ <mkdir dir="${png.dir}" />
+ <download-one-file src="${png.url}"
+ dest="${png.tar}"
+ md5="${png.md5}" />
+ </target>
<target name="test" depends="-test-module">
<fail message="Some tests failed">
@@ -175,7 +237,7 @@
<fileset dir="src/test/resources" />
</copy>
- <copy file="../../${junit.jar}" todir="${hy.hdk}/build/test" />
+ <copy file="${junit.jar}" tofile="${hy.hdk}/build/test/junit.jar" />
</target>
<target name="compile-tests">
Modified: harmony/enhanced/classlib/branches/java6/modules/imageio/src/main/native/jpegencoder/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/imageio/src/main/native/jpegencoder/windows/makefile?rev=803102&r1=803101&r2=803102&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/imageio/src/main/native/jpegencoder/windows/makefile (original)
+++ harmony/enhanced/classlib/branches/java6/modules/imageio/src/main/native/jpegencoder/windows/makefile Tue Aug 11 13:07:55 2009
@@ -15,7 +15,7 @@
!include <$(HY_HDK)\build\make\defines.mak>
-JPEG_DIR=$(HY_HDK)\..\depends\libs\build\jpeg\# avoid continuation
+JPEG_DIR=$(HY_HDK)\..\depends\libs\$(HY_PLATFORM)\jpeg-6b\# avoid continuation
LIBBASE=jpegencoder
DLLNAME=..\$(LIBBASE).dll
Modified: harmony/enhanced/classlib/branches/java6/modules/imageio/src/main/native/pngencoder/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/imageio/src/main/native/pngencoder/windows/makefile?rev=803102&r1=803101&r2=803102&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/imageio/src/main/native/pngencoder/windows/makefile (original)
+++ harmony/enhanced/classlib/branches/java6/modules/imageio/src/main/native/pngencoder/windows/makefile Tue Aug 11 13:07:55 2009
@@ -15,7 +15,7 @@
!include <$(HY_HDK)\build\make\defines.mak>
-PNG_DIR=$(HY_HDK)\..\depends\libs\build\png\# avoid continuation
+PNG_DIR=$(HY_HDK)\..\depends\libs\$(HY_PLATFORM)\png-1.2.12\# avoid continuation
LIBBASE=pngencoder
DLLNAME=..\$(LIBBASE).dll
Modified: harmony/enhanced/classlib/branches/java6/modules/instrument/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/instrument/build.xml?rev=803102&r1=803101&r2=803102&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/instrument/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/instrument/build.xml Tue Aug 11 13:07:55 2009
@@ -161,7 +161,8 @@
</fileset>
</copy>
- <copy file="../../${junit.jar}" todir="${hy.hdk}/build/test" />
+ <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 Tue Aug 11 13:07:55 2009
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/jmx/META-INF:768152-798021
+/harmony/enhanced/classlib/trunk/modules/jmx/META-INF:768152-803061
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=803102&r1=803101&r2=803102&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/jndi/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/jndi/build.xml Tue Aug 11 13:07:55 2009
@@ -135,7 +135,8 @@
</fileset>
</copy>
- <copy file="../../${junit.jar}" todir="${hy.hdk}/build/test" />
+ <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=803102&r1=803101&r2=803102&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/lang-management/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/lang-management/build.xml Tue Aug 11 13:07:55 2009
@@ -126,7 +126,8 @@
</filterchain>
</copy>
- <copy file="../../${junit.jar}" todir="${hy.hdk}/build/test" />
+ <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 Tue Aug 11 13:07:55 2009
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/lang-management/src/test/api/java/org/apache/harmony/lang/management/tests/java/util/logging:768152-798021
+/harmony/enhanced/classlib/trunk/modules/lang-management/src/test/api/java/org/apache/harmony/lang/management/tests/java/util/logging:768152-803061
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=803102&r1=803101&r2=803102&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/logging/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/logging/build.xml Tue Aug 11 13:07:55 2009
@@ -152,7 +152,8 @@
<fileset dir="src/test/resources" />
</copy>
- <copy file="../../${junit.jar}" todir="${hy.hdk}/build/test" />
+ <copy file="../../${junit.jar}"
+ tofile="${hy.hdk}/build/test/junit.jar" />
</target>
<target name="compile-tests">
Modified: harmony/enhanced/classlib/branches/java6/modules/logging/src/main/java/java/util/logging/LogManager.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/logging/src/main/java/java/util/logging/LogManager.java?rev=803102&r1=803101&r2=803102&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/logging/src/main/java/java/util/logging/LogManager.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/logging/src/main/java/java/util/logging/LogManager.java Tue Aug 11 13:07:55 2009
@@ -404,7 +404,6 @@
* not have the required permissions to perform this action.
*/
public void readConfiguration() throws IOException {
- checkAccess();
// check config class
String configClassName = System
.getProperty("java.util.logging.config.class"); //$NON-NLS-1$
@@ -425,7 +424,7 @@
InputStream input = null;
try {
input = new BufferedInputStream(new FileInputStream(configFile));
- readConfigurationImpl(input);
+ readConfiguration(input);
} finally {
if (input != null) {
try {
Modified: harmony/enhanced/classlib/branches/java6/modules/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/LogManagerTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/LogManagerTest.java?rev=803102&r1=803101&r2=803102&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/LogManagerTest.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/LogManagerTest.java Tue Aug 11 13:07:55 2009
@@ -455,6 +455,16 @@
}
+ public void testReadConfiguration() throws SecurityException,
+ IOException {
+
+ MockConfigLogManager lm = new MockConfigLogManager();
+ assertFalse(lm.isCalled);
+
+ lm.readConfiguration();
+ assertTrue(lm.isCalled);
+ }
+
private static void checkPropertyNull(LogManager m) {
// assertNull(m.getProperty(".level"));
assertNull(m.getProperty("java.util.logging.FileHandler.limit"));
@@ -933,6 +943,15 @@
public static class MockLogManager extends LogManager {
}
+ public static class MockConfigLogManager extends LogManager {
+ public boolean isCalled = false;
+
+ public void readConfiguration(InputStream ins) throws IOException {
+ isCalled = true;
+ super.readConfiguration(ins);
+ }
+ }
+
public static class MockHandler extends Handler {
static int number = 0;
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=803102&r1=803101&r2=803102&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni/build.xml Tue Aug 11 13:07:55 2009
@@ -31,7 +31,7 @@
<target name="copy-native-includes">
<copy todir="${hy.hdk}/include" overwrite="yes">
- <fileset dir="src/main/native/include/shared">
+ <fileset dir="src/main/native/include">
<include name="vmi.h" />
<include name="hyvmls.h" />
<include name="hysocket.h" />
@@ -42,20 +42,13 @@
</fileset>
</copy>
<copy todir="${hy.jdk}/include" overwrite="yes">
- <fileset dir="src/main/native/include/shared">
+ <fileset dir="src/main/native/include">
<include name="jni.h" />
<include name="jni_types.h" />
<include name="jvmti.h" />
<include name="jvmti_types.h" />
</fileset>
</copy>
-
- <copy todir="${hy.hdk}/include" overwrite="yes">
- <fileset dir="src/main/native/include/${hy.os.family}">
- <include name="jclprots.h" />
- </fileset>
- </copy>
-
</target>
<!-- Build native code -->
@@ -209,7 +202,6 @@
<fileset dir="${hy.hdk}/include">
<include name="vmi.h" />
<include name="hyvmls.h" />
- <include name="jclprots.h" />
<include name="hysocket.h" />
<include name="gp.h" />
<include name="fdlibm.h" />
@@ -229,6 +221,8 @@
<target name="compile-java">
<echo message="Compiling LUNI classes" />
+ <mkdir dir="../../build/classes" />
+
<javac sourcepath=""
srcdir="src/main/java"
destdir="../../build/classes"
@@ -321,7 +315,8 @@
</filterchain>
</copy>
- <copy file="../../${junit.jar}" todir="${hy.hdk}/build/test" />
+ <copy file="../../${junit.jar}"
+ tofile="${hy.hdk}/build/test/junit.jar" />
<copy file="../../${jetty.jar}" todir="${hy.hdk}/build/test" />
</target>
Modified: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/io/BufferedReader.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/io/BufferedReader.java?rev=803102&r1=803101&r2=803102&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/io/BufferedReader.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/io/BufferedReader.java Tue Aug 11 13:07:55 2009
@@ -301,8 +301,7 @@
* Returns the next line of text available from this reader. A line is
* represented by zero or more characters followed by {@code '\n'},
* {@code '\r'}, {@code "\r\n"} or the end of the reader. The string does
- * not include the newline sequence. In EBCDIC systems, a new line can also
- * be represented by the {@code \u0085} (NEL) character.
+ * not include the newline sequence.
*
* @return the contents of the line or {@code null} if no characters were
* read before the end of the reader has been reached.
@@ -320,7 +319,7 @@
}
for (int charPos = pos; charPos < count; charPos++) {
char ch = buf[charPos];
- if ((ch > '\r') && (ch != '\u0085')) {
+ if (ch > '\r') {
continue;
}
if (ch == '\n') {
@@ -335,11 +334,6 @@
pos++;
}
return res;
- } else if (ch == '\u0085') {
- /* Also handle the EBCDIC NEL character */
- String res = new String(buf, pos, charPos - pos);
- pos = charPos + 1;
- return res;
}
}
@@ -364,7 +358,7 @@
}
for (int charPos = pos; charPos < count; charPos++) {
if (eol == '\0') {
- if ((buf[charPos] == '\n' || buf[charPos] == '\r') || (buf[charPos] == '\u0085')) {
+ if ((buf[charPos] == '\n' || buf[charPos] == '\r')) {
eol = buf[charPos];
}
} else if (eol == '\r' && (buf[charPos] == '\n')) {
@@ -373,7 +367,7 @@
}
pos = charPos + 1;
return result.toString();
- } else if (eol != '\0') {
+ } else {
if (charPos > pos) {
result.append(buf, pos, charPos - pos - 1);
}
Modified: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/AbstractList.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/AbstractList.java?rev=803102&r1=803101&r2=803102&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/AbstractList.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/AbstractList.java Tue Aug 11 13:07:55 2009
@@ -360,7 +360,10 @@
@Override
public int size() {
- return size;
+ if (modCount == fullList.modCount) {
+ return size;
+ }
+ throw new ConcurrentModificationException();
}
void sizeChanged(boolean increment) {
|