harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r798469 [1/28] - in /harmony/enhanced/classlib/branches/java6: ./ depends/build/platform/ depends/files/ depends/jars/ depends/manifests/icu4j_4.0/ depends/manifests/icu4j_4.2.1/ depends/manifests/icu4j_4.2.1/META-INF/ make/ modules/accessi...
Date Tue, 28 Jul 2009 09:30:48 GMT
Author: hindessm
Date: Tue Jul 28 09:30:33 2009
New Revision: 798469

URL: http://svn.apache.org/viewvc?rev=798469&view=rev
Log:
Merge updates from classlib trunk@798021 since r790471.

Added:
    harmony/enhanced/classlib/branches/java6/depends/manifests/icu4j_4.2.1/
      - copied from r798021, harmony/enhanced/classlib/trunk/depends/manifests/icu4j_4.2.1/
    harmony/enhanced/classlib/branches/java6/depends/manifests/icu4j_4.2.1/META-INF/
      - copied from r798021, harmony/enhanced/classlib/trunk/depends/manifests/icu4j_4.2.1/META-INF/
    harmony/enhanced/classlib/branches/java6/depends/manifests/icu4j_4.2.1/META-INF/MANIFEST.MF
      - copied unchanged from r798021, harmony/enhanced/classlib/trunk/depends/manifests/icu4j_4.2.1/META-INF/MANIFEST.MF
    harmony/enhanced/classlib/branches/java6/modules/accessibility/make/run-test.xml
      - copied unchanged from r798021, harmony/enhanced/classlib/trunk/modules/accessibility/make/run-test.xml
    harmony/enhanced/classlib/branches/java6/modules/annotation/make/run-test.xml
      - copied unchanged from r798021, harmony/enhanced/classlib/trunk/modules/annotation/make/run-test.xml
    harmony/enhanced/classlib/branches/java6/modules/applet/make/run-test.xml
      - copied unchanged from r798021, harmony/enhanced/classlib/trunk/modules/applet/make/run-test.xml
    harmony/enhanced/classlib/branches/java6/modules/archive/make/run-test.xml
      - copied unchanged from r798021, harmony/enhanced/classlib/trunk/modules/archive/make/run-test.xml
    harmony/enhanced/classlib/branches/java6/modules/auth/make/run-test.xml
      - copied unchanged from r798021, harmony/enhanced/classlib/trunk/modules/auth/make/run-test.xml
    harmony/enhanced/classlib/branches/java6/modules/awt/make/run-test.xml
      - copied unchanged from r798021, harmony/enhanced/classlib/trunk/modules/awt/make/run-test.xml
    harmony/enhanced/classlib/branches/java6/modules/beans/make/run-test.xml
      - copied unchanged from r798021, harmony/enhanced/classlib/trunk/modules/beans/make/run-test.xml
    harmony/enhanced/classlib/branches/java6/modules/concurrent/make/run-test.xml
      - copied unchanged from r798021, harmony/enhanced/classlib/trunk/modules/concurrent/make/run-test.xml
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/Java6Arrays.java
      - copied unchanged from r798021, harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/Java6Arrays.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/atomic/package-info.java
      - copied unchanged from r798021, harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/atomic/package-info.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/locks/AbstractOwnableSynchronizer.java
      - copied unchanged from r798021, harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/locks/AbstractOwnableSynchronizer.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/locks/package-info.java
      - copied unchanged from r798021, harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/locks/package-info.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/package-info.java
      - copied unchanged from r798021, harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/package-info.java
    harmony/enhanced/classlib/branches/java6/modules/crypto/make/run-test.xml
      - copied unchanged from r798021, harmony/enhanced/classlib/trunk/modules/crypto/make/run-test.xml
    harmony/enhanced/classlib/branches/java6/modules/imageio/make/run-test.xml
      - copied unchanged from r798021, harmony/enhanced/classlib/trunk/modules/imageio/make/run-test.xml
    harmony/enhanced/classlib/branches/java6/modules/instrument/make/run-test.xml
      - copied unchanged from r798021, harmony/enhanced/classlib/trunk/modules/instrument/make/run-test.xml
    harmony/enhanced/classlib/branches/java6/modules/jndi/make/run-test.xml
      - copied unchanged from r798021, harmony/enhanced/classlib/trunk/modules/jndi/make/run-test.xml
    harmony/enhanced/classlib/branches/java6/modules/lang-management/make/run-test.xml
      - copied unchanged from r798021, harmony/enhanced/classlib/trunk/modules/lang-management/make/run-test.xml
    harmony/enhanced/classlib/branches/java6/modules/logging/make/run-test.xml
      - copied unchanged from r798021, harmony/enhanced/classlib/trunk/modules/logging/make/run-test.xml
    harmony/enhanced/classlib/branches/java6/modules/luni/make/run-test.xml
      - copied unchanged from r798021, harmony/enhanced/classlib/trunk/modules/luni/make/run-test.xml
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/internal/io/
      - copied from r798021, harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/internal/io/
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/internal/io/FileCanonPathCache.java
      - copied unchanged from r798021, harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/internal/io/FileCanonPathCache.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/test/impl/common/org/apache/harmony/luni/tests/java/io/
      - copied from r798021, harmony/enhanced/classlib/trunk/modules/luni/src/test/impl/common/org/apache/harmony/luni/tests/java/io/
    harmony/enhanced/classlib/branches/java6/modules/luni/src/test/impl/common/org/apache/harmony/luni/tests/java/io/FileCanonPathCacheTest.java
      - copied unchanged from r798021, harmony/enhanced/classlib/trunk/modules/luni/src/test/impl/common/org/apache/harmony/luni/tests/java/io/FileCanonPathCacheTest.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/test/resources/net.resources/   (props changed)
      - copied from r798021, harmony/enhanced/classlib/trunk/modules/luni/src/test/resources/net.resources/
    harmony/enhanced/classlib/branches/java6/modules/luni/src/test/resources/net.resources/FTP/
      - copied from r798021, harmony/enhanced/classlib/trunk/modules/luni/src/test/resources/net.resources/FTP/
    harmony/enhanced/classlib/branches/java6/modules/luni/src/test/resources/net.resources/FTP/jcltest/
      - copied from r798021, harmony/enhanced/classlib/trunk/modules/luni/src/test/resources/net.resources/FTP/jcltest/
    harmony/enhanced/classlib/branches/java6/modules/luni/src/test/resources/net.resources/FTP/jcltest/nettest.txt
      - copied unchanged from r798021, harmony/enhanced/classlib/trunk/modules/luni/src/test/resources/net.resources/FTP/jcltest/nettest.txt
    harmony/enhanced/classlib/branches/java6/modules/luni/src/test/resources/net.resources/HTTP/
      - copied from r798021, harmony/enhanced/classlib/trunk/modules/luni/src/test/resources/net.resources/HTTP/
    harmony/enhanced/classlib/branches/java6/modules/luni/src/test/resources/net.resources/HTTP/cgi-bin/
      - copied from r798021, harmony/enhanced/classlib/trunk/modules/luni/src/test/resources/net.resources/HTTP/cgi-bin/
    harmony/enhanced/classlib/branches/java6/modules/luni/src/test/resources/net.resources/HTTP/cgi-bin/test.pl
      - copied unchanged from r798021, harmony/enhanced/classlib/trunk/modules/luni/src/test/resources/net.resources/HTTP/cgi-bin/test.pl
    harmony/enhanced/classlib/branches/java6/modules/luni/src/test/resources/net.resources/HTTP/html/
      - copied from r798021, harmony/enhanced/classlib/trunk/modules/luni/src/test/resources/net.resources/HTTP/html/
    harmony/enhanced/classlib/branches/java6/modules/luni/src/test/resources/net.resources/HTTP/html/testres231/
      - copied from r798021, harmony/enhanced/classlib/trunk/modules/luni/src/test/resources/net.resources/HTTP/html/testres231/
    harmony/enhanced/classlib/branches/java6/modules/luni/src/test/resources/net.resources/HTTP/html/testres231/RESOURCE.TXT
      - copied unchanged from r798021, harmony/enhanced/classlib/trunk/modules/luni/src/test/resources/net.resources/HTTP/html/testres231/RESOURCE.TXT
    harmony/enhanced/classlib/branches/java6/modules/luni/src/test/resources/net.resources/HTTP/html/testres231/UCL/
      - copied from r798021, harmony/enhanced/classlib/trunk/modules/luni/src/test/resources/net.resources/HTTP/html/testres231/UCL/
    harmony/enhanced/classlib/branches/java6/modules/luni/src/test/resources/net.resources/HTTP/html/testres231/UCL/UCL.jar
      - copied unchanged from r798021, harmony/enhanced/classlib/trunk/modules/luni/src/test/resources/net.resources/HTTP/html/testres231/UCL/UCL.jar
    harmony/enhanced/classlib/branches/java6/modules/luni/src/test/resources/net.resources/HTTP/html/testres231/URLConnectionTest/
      - copied from r798021, harmony/enhanced/classlib/trunk/modules/luni/src/test/resources/net.resources/HTTP/html/testres231/URLConnectionTest/
    harmony/enhanced/classlib/branches/java6/modules/luni/src/test/resources/net.resources/HTTP/html/testres231/URLConnectionTest/Harmony.html
      - copied unchanged from r798021, harmony/enhanced/classlib/trunk/modules/luni/src/test/resources/net.resources/HTTP/html/testres231/URLConnectionTest/Harmony.html
    harmony/enhanced/classlib/branches/java6/modules/luni/src/test/resources/net.resources/HTTP/html/testres231/subdir1/
      - copied from r798021, harmony/enhanced/classlib/trunk/modules/luni/src/test/resources/net.resources/HTTP/html/testres231/subdir1/
    harmony/enhanced/classlib/branches/java6/modules/luni/src/test/resources/net.resources/HTTP/html/testres231/subdir1/RESOURCE.TXT
      - copied unchanged from r798021, harmony/enhanced/classlib/trunk/modules/luni/src/test/resources/net.resources/HTTP/html/testres231/subdir1/RESOURCE.TXT
    harmony/enhanced/classlib/branches/java6/modules/luni/src/test/resources/net.resources/README.txt
      - copied unchanged from r798021, harmony/enhanced/classlib/trunk/modules/luni/src/test/resources/net.resources/README.txt
    harmony/enhanced/classlib/branches/java6/modules/math/make/run-test.xml
      - copied unchanged from r798021, harmony/enhanced/classlib/trunk/modules/math/make/run-test.xml
    harmony/enhanced/classlib/branches/java6/modules/misc/make/run-test.xml
      - copied unchanged from r798021, harmony/enhanced/classlib/trunk/modules/misc/make/run-test.xml
    harmony/enhanced/classlib/branches/java6/modules/nio/make/run-test.xml
      - copied unchanged from r798021, harmony/enhanced/classlib/trunk/modules/nio/make/run-test.xml
    harmony/enhanced/classlib/branches/java6/modules/nio_char/make/run-test.xml
      - copied unchanged from r798021, harmony/enhanced/classlib/trunk/modules/nio_char/make/run-test.xml
    harmony/enhanced/classlib/branches/java6/modules/pack200/make/run-test.xml
      - copied unchanged from r798021, harmony/enhanced/classlib/trunk/modules/pack200/make/run-test.xml
    harmony/enhanced/classlib/branches/java6/modules/prefs/make/run-test.xml
      - copied unchanged from r798021, harmony/enhanced/classlib/trunk/modules/prefs/make/run-test.xml
    harmony/enhanced/classlib/branches/java6/modules/print/make/run-test.xml
      - copied unchanged from r798021, harmony/enhanced/classlib/trunk/modules/print/make/run-test.xml
    harmony/enhanced/classlib/branches/java6/modules/regex/make/run-test.xml
      - copied unchanged from r798021, harmony/enhanced/classlib/trunk/modules/regex/make/run-test.xml
    harmony/enhanced/classlib/branches/java6/modules/rmi/make/run-test.xml
      - copied unchanged from r798021, harmony/enhanced/classlib/trunk/modules/rmi/make/run-test.xml
    harmony/enhanced/classlib/branches/java6/modules/security/make/run-test.xml
      - copied unchanged from r798021, harmony/enhanced/classlib/trunk/modules/security/make/run-test.xml
    harmony/enhanced/classlib/branches/java6/modules/sound/make/run-test.xml
      - copied unchanged from r798021, harmony/enhanced/classlib/trunk/modules/sound/make/run-test.xml
    harmony/enhanced/classlib/branches/java6/modules/sql/make/run-test.xml
      - copied unchanged from r798021, harmony/enhanced/classlib/trunk/modules/sql/make/run-test.xml
    harmony/enhanced/classlib/branches/java6/modules/suncompat/make/run-test.xml
      - copied unchanged from r798021, harmony/enhanced/classlib/trunk/modules/suncompat/make/run-test.xml
    harmony/enhanced/classlib/branches/java6/modules/swing/make/run-test.xml
      - copied unchanged from r798021, harmony/enhanced/classlib/trunk/modules/swing/make/run-test.xml
    harmony/enhanced/classlib/branches/java6/modules/text/make/run-test.xml
      - copied unchanged from r798021, harmony/enhanced/classlib/trunk/modules/text/make/run-test.xml
    harmony/enhanced/classlib/branches/java6/modules/text/src/test/java/org/apache/harmony/text/tests/java/text/AttributedCharacterIteratorAttributeTest.java
      - copied unchanged from r798021, harmony/enhanced/classlib/trunk/modules/text/src/test/java/org/apache/harmony/text/tests/java/text/AttributedCharacterIteratorAttributeTest.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/make/run-test.xml
      - copied unchanged from r798021, harmony/enhanced/classlib/trunk/modules/x-net/make/run-test.xml
Removed:
    harmony/enhanced/classlib/branches/java6/depends/manifests/icu4j_4.0/
    harmony/enhanced/classlib/branches/java6/modules/accessibility/make/hyproperties.xml
    harmony/enhanced/classlib/branches/java6/modules/annotation/make/hyproperties.xml
    harmony/enhanced/classlib/branches/java6/modules/applet/make/hyproperties.xml
    harmony/enhanced/classlib/branches/java6/modules/archive/make/hyproperties.xml
    harmony/enhanced/classlib/branches/java6/modules/auth/make/hyproperties.xml
    harmony/enhanced/classlib/branches/java6/modules/awt/make/hyproperties.xml
    harmony/enhanced/classlib/branches/java6/modules/beans/make/hyproperties.xml
    harmony/enhanced/classlib/branches/java6/modules/concurrent/make/hyproperties.xml
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/atomic/package.html
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/locks/package.html
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/package.html
    harmony/enhanced/classlib/branches/java6/modules/crypto/make/hyproperties.xml
    harmony/enhanced/classlib/branches/java6/modules/imageio/make/hyproperties.xml
    harmony/enhanced/classlib/branches/java6/modules/instrument/make/hyproperties.xml
    harmony/enhanced/classlib/branches/java6/modules/jndi/make/hyproperties.xml
    harmony/enhanced/classlib/branches/java6/modules/lang-management/make/hyproperties.xml
    harmony/enhanced/classlib/branches/java6/modules/logging/make/hyproperties.xml
    harmony/enhanced/classlib/branches/java6/modules/luni/make/hyproperties.xml
    harmony/enhanced/classlib/branches/java6/modules/math/make/hyproperties.xml
    harmony/enhanced/classlib/branches/java6/modules/misc/make/hyproperties.xml
    harmony/enhanced/classlib/branches/java6/modules/nio/make/hyproperties.xml
    harmony/enhanced/classlib/branches/java6/modules/nio_char/make/hyproperties.xml
    harmony/enhanced/classlib/branches/java6/modules/pack200/make/hyproperties.xml
    harmony/enhanced/classlib/branches/java6/modules/portlib/make/hyproperties.xml
    harmony/enhanced/classlib/branches/java6/modules/prefs/make/hyproperties.xml
    harmony/enhanced/classlib/branches/java6/modules/print/make/hyproperties.xml
    harmony/enhanced/classlib/branches/java6/modules/regex/make/hyproperties.xml
    harmony/enhanced/classlib/branches/java6/modules/rmi/make/hyproperties.xml
    harmony/enhanced/classlib/branches/java6/modules/security/make/hyproperties.xml
    harmony/enhanced/classlib/branches/java6/modules/sound/make/hyproperties.xml
    harmony/enhanced/classlib/branches/java6/modules/sql/make/hyproperties.xml
    harmony/enhanced/classlib/branches/java6/modules/suncompat/make/hyproperties.xml
    harmony/enhanced/classlib/branches/java6/modules/swing/make/hyproperties.xml
    harmony/enhanced/classlib/branches/java6/modules/text/make/hyproperties.xml
    harmony/enhanced/classlib/branches/java6/modules/x-net/make/hyproperties.xml
    harmony/enhanced/classlib/branches/java6/support/src/test/resources/net.resources/
Modified:
    harmony/enhanced/classlib/branches/java6/   (props changed)
    harmony/enhanced/classlib/branches/java6/build.xml
    harmony/enhanced/classlib/branches/java6/depends/build/platform/aix.ppc32.mk
    harmony/enhanced/classlib/branches/java6/depends/build/platform/macosx.x86.mk
    harmony/enhanced/classlib/branches/java6/depends/build/platform/macosx.x86_64.mk
    harmony/enhanced/classlib/branches/java6/depends/files/bootclasspath.properties
    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-native.xml
    harmony/enhanced/classlib/branches/java6/make/build-test.xml
    harmony/enhanced/classlib/branches/java6/make/depends-common.xml   (props changed)
    harmony/enhanced/classlib/branches/java6/make/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/make/test.properties
    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/test/java/org/apache/harmony/archive/tests/java/util/jar/ManifestTest.java
    harmony/enhanced/classlib/branches/java6/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/ZipFileTest.java
    harmony/enhanced/classlib/branches/java6/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/ZipOutputStreamTest.java
    harmony/enhanced/classlib/branches/java6/modules/auth/build.xml
    harmony/enhanced/classlib/branches/java6/modules/auth/src/main/native/auth/unix/authnix.c
    harmony/enhanced/classlib/branches/java6/modules/awt/build.xml
    harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/CommonGraphics2D.java
    harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/image/PngDecoder.java
    harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/fontlib/   (props changed)
    harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/fontlib/unix/makefile
    harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/gl/shared/SurfaceDataStructure.h
    harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/lcmm/shared/NativeCMM.c
    harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/lcmm/shared/NativeImageFormat.c
    harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/lcmm/shared/NativeImageFormat.h
    harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/lcmm/unix/makefile
    harmony/enhanced/classlib/branches/java6/modules/awt/src/main/native/linuxfont/unix/makefile
    harmony/enhanced/classlib/branches/java6/modules/beans/build.xml
    harmony/enhanced/classlib/branches/java6/modules/beans/src/main/java/java/beans/Statement.java
    harmony/enhanced/classlib/branches/java6/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/ExpressionTest.java
    harmony/enhanced/classlib/branches/java6/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/StatementTest.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/build.xml
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/AbstractExecutorService.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/ArrayBlockingQueue.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/BlockingQueue.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/CompletionService.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/ConcurrentHashMap.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/ConcurrentLinkedQueue.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/ConcurrentMap.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/CopyOnWriteArrayList.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/CopyOnWriteArraySet.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/CountDownLatch.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/CyclicBarrier.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/DelayQueue.java
    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/Exchanger.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/ExecutionException.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/Executor.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/ExecutorCompletionService.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/ExecutorService.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/Future.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/FutureTask.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/LinkedBlockingQueue.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/PriorityBlockingQueue.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/RejectedExecutionException.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/RejectedExecutionHandler.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/ScheduledExecutorService.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/ScheduledThreadPoolExecutor.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/Semaphore.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/SynchronousQueue.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/ThreadFactory.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/ThreadPoolExecutor.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/atomic/AtomicBoolean.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/atomic/AtomicInteger.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/atomic/AtomicIntegerArray.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/atomic/AtomicIntegerFieldUpdater.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/atomic/AtomicLong.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/atomic/AtomicLongArray.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/atomic/AtomicLongFieldUpdater.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/atomic/AtomicMarkableReference.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/atomic/AtomicReference.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/atomic/AtomicReferenceArray.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/atomic/AtomicReferenceFieldUpdater.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/atomic/AtomicStampedReference.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/locks/   (props changed)
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/locks/AbstractQueuedSynchronizer.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/locks/Condition.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/locks/Lock.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/locks/LockSupport.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/locks/ReadWriteLock.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/locks/ReentrantLock.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/locks/ReentrantReadWriteLock.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/test/java/AbstractQueuedSynchronizerTest.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/test/java/ArrayBlockingQueueTest.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/test/java/AtomicIntegerFieldUpdaterTest.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/test/java/AtomicIntegerTest.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/test/java/AtomicLongFieldUpdaterTest.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/test/java/AtomicLongTest.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/test/java/AtomicReferenceFieldUpdaterTest.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/test/java/AtomicReferenceTest.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/test/java/ConcurrentHashMapTest.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/test/java/CyclicBarrierTest.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/test/java/DelayQueueTest.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/test/java/ExecutorCompletionServiceTest.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/test/java/ExecutorsTest.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/test/java/JSR166TestCase.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/test/java/LinkedBlockingQueueTest.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/test/java/LockSupportTest.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/test/java/PriorityBlockingQueueTest.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/test/java/ReentrantLockTest.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/test/java/ReentrantReadWriteLockTest.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/test/java/SynchronousQueueTest.java
    harmony/enhanced/classlib/branches/java6/modules/concurrent/src/test/java/ThreadPoolExecutorTest.java
    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/test/java/javax/imageio/ImageIOTest.java
    harmony/enhanced/classlib/branches/java6/modules/instrument/build.xml
    harmony/enhanced/classlib/branches/java6/modules/jmx/META-INF/   (props changed)
    harmony/enhanced/classlib/branches/java6/modules/jmx/build.xml
    harmony/enhanced/classlib/branches/java6/modules/jndi/build.xml
    harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/CompositeName.java
    harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/org/apache/harmony/jndi/internal/parser/LdapNameParser.java
    harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/org/apache/harmony/jndi/internal/parser/LdapRdnParser.java
    harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/ldap/parser/FilterParser.java
    harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/ldap/parser/FilterParserConstants.java
    harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/ldap/parser/FilterParserTokenManager.java
    harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/ldap/parser/LdapUrlParser.java
    harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/ldap/parser/LdapUrlParserConstants.java
    harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/ldap/parser/LdapUrlParserTokenManager.java
    harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/ldap/parser/ParseException.java
    harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/ldap/parser/SimpleCharStream.java
    harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/ldap/parser/Token.java
    harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/ldap/parser/TokenMgrError.java
    harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/ldap/parser/filter.g
    harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/org/apache/harmony/jndi/provider/ldap/parser/url.g
    harmony/enhanced/classlib/branches/java6/modules/jndi/src/test/java/org/apache/harmony/jndi/tests/javax/naming/CompositeNameTest.java
    harmony/enhanced/classlib/branches/java6/modules/jndi/src/test/java/org/apache/harmony/jndi/tests/javax/naming/ldap/LdapNameTest.java
    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/FileHandler.java
    harmony/enhanced/classlib/branches/java6/modules/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/FileHandlerTest.java
    harmony/enhanced/classlib/branches/java6/modules/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/LoggerTest.java
    harmony/enhanced/classlib/branches/java6/modules/luni-kernel/build.xml
    harmony/enhanced/classlib/branches/java6/modules/luni-kernel/src/main/java/org/apache/harmony/kernel/vm/VM.java
    harmony/enhanced/classlib/branches/java6/modules/luni/.classpath
    harmony/enhanced/classlib/branches/java6/modules/luni/build.xml
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/io/File.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/io/PipedInputStream.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/lang/AbstractStringBuilder.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/lang/Math.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/lang/String.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/net/URLClassLoader.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/HashMap.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/Timer.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/jar/JarURLConnection.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/util/ExternalMessages.properties
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/util/FloatingPointParser.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/util/Util.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/launcher/shared/main.c
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/shared/cbigint.c
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/shared/dblparse.c
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/shared/fltparse.c
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/unix/OSFileSystemLinux32.c
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/unix/procimpl.c
    harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/BufferedOutputStreamTest.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/FilterInputStreamTest.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/ObjectStreamClassTest.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/PipedInputStreamTest.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/lang/DoubleTest.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/lang/FloatTest.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/lang/MathTest.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/lang/String2Test.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/JarURLConnectionTest.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/net/URLClassLoaderTest.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/URLTest.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/CurrencyTest.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/GregorianCalendarTest.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/HashMapTest.java
    harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/TimerTest.java
    harmony/enhanced/classlib/branches/java6/modules/math/build.xml
    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/src/test/java/common/org/apache/harmony/nio/tests/java/nio/channels/FileChannelTest.java
    harmony/enhanced/classlib/branches/java6/modules/nio_char/build.xml
    harmony/enhanced/classlib/branches/java6/modules/nio_char/src/test/java/tests/api/java/nio/charset/CharsetProviderTest.java
    harmony/enhanced/classlib/branches/java6/modules/orb/build.xml
    harmony/enhanced/classlib/branches/java6/modules/pack200/build.xml
    harmony/enhanced/classlib/branches/java6/modules/pack200/depends/manifests/asm-3.1/   (props changed)
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/Archive.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/FileBands.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/PackingOptions.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/PackingUtils.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/pack200/Segment.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/Archive.java
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java5/org/apache/harmony/pack200/Pack200Adapter.java   (props changed)
    harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java5/org/apache/harmony/pack200/Pack200PackerAdapter.java   (props changed)
    harmony/enhanced/classlib/branches/java6/modules/portlib/build.xml
    harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/port/shared/hystrftime.c
    harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/port/unix/hyfiletext.c
    harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/port/unix/hyosdump.c
    harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/port/unix/hysl.c
    harmony/enhanced/classlib/branches/java6/modules/prefs/build.xml
    harmony/enhanced/classlib/branches/java6/modules/prefs/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/AbstractPreferencesTest.java
    harmony/enhanced/classlib/branches/java6/modules/print/build.xml
    harmony/enhanced/classlib/branches/java6/modules/regex/build.xml
    harmony/enhanced/classlib/branches/java6/modules/rmi/build.xml
    harmony/enhanced/classlib/branches/java6/modules/security-kernel/build.xml
    harmony/enhanced/classlib/branches/java6/modules/security/build.xml
    harmony/enhanced/classlib/branches/java6/modules/security/src/main/java/common/org/apache/harmony/security/asn1/ASN1GeneralizedTime.java
    harmony/enhanced/classlib/branches/java6/modules/security/src/main/java/common/org/apache/harmony/security/x509/DNParser.java
    harmony/enhanced/classlib/branches/java6/modules/security/src/main/native/security/   (props changed)
    harmony/enhanced/classlib/branches/java6/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/DigestInputStream2Test.java
    harmony/enhanced/classlib/branches/java6/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/MessageDigest2Test.java
    harmony/enhanced/classlib/branches/java6/modules/security/src/test/impl/java/org/apache/harmony/security/tests/asn1/der/DerGeneralizedTimeEDTest.java
    harmony/enhanced/classlib/branches/java6/modules/security/src/test/impl/java/org/apache/harmony/security/tests/asn1/der/DerUTCTimeEDTest.java
    harmony/enhanced/classlib/branches/java6/modules/security/src/test/impl/java/org/apache/harmony/security/tests/java/security/cert/CertificateFactory_ImplTest.java
    harmony/enhanced/classlib/branches/java6/modules/sound/build.xml
    harmony/enhanced/classlib/branches/java6/modules/sql/build.xml
    harmony/enhanced/classlib/branches/java6/modules/sql/src/test/java/org/apache/harmony/sql/tests/internal/rowset/CachedRowSetTestCase.java
    harmony/enhanced/classlib/branches/java6/modules/sql/src/test/java/org/apache/harmony/sql/tests/internal/rowset/XmlReaderTest.java
    harmony/enhanced/classlib/branches/java6/modules/suncompat/build.xml
    harmony/enhanced/classlib/branches/java6/modules/suncompat/src/main/java/sun/misc/Unsafe.java
    harmony/enhanced/classlib/branches/java6/modules/swing/build.xml
    harmony/enhanced/classlib/branches/java6/modules/swing/src/main/java/common/javax/swing/plaf/basic/BasicSliderUI.java
    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/text/src/main/java/java/text/AttributedCharacterIterator.java
    harmony/enhanced/classlib/branches/java6/modules/text/src/main/java/java/text/DateFormat.java
    harmony/enhanced/classlib/branches/java6/modules/text/src/test/java/org/apache/harmony/text/tests/java/text/DecimalFormatSymbolsTest.java
    harmony/enhanced/classlib/branches/java6/modules/text/src/test/java/org/apache/harmony/text/tests/java/text/FieldPositionTest.java
    harmony/enhanced/classlib/branches/java6/modules/x-net/build.xml
    harmony/enhanced/classlib/branches/java6/support/src/test/java/tests/support/Support_HttpTests.java

Propchange: harmony/enhanced/classlib/branches/java6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jul 28 09:30:33 2009
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk:713674-735919,765923-790471
+/harmony/enhanced/classlib/trunk:713674-735919,765923-798021

Modified: harmony/enhanced/classlib/branches/java6/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/build.xml?rev=798469&r1=798468&r2=798469&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/build.xml Tue Jul 28 09:30:33 2009
@@ -73,7 +73,6 @@
     <property file="${user.home}/.harmony-classlib.properties" />
 
     <property name="hy.hdk" location="deploy" />
-    <property name="hy.jdk" location="${hy.hdk}/jdk" />
 
     <!-- import properties for snapshot targets -->
     <import file="${basedir}/make/properties.xml" />
@@ -86,8 +85,10 @@
     <target name="rebuild" depends="clean,build"
         description="Performs a full build - that is 'clean' then 'build'" />
 	
-    <target name="build" depends="build-java,build-native"
-        description="Compiles the java and native code to produce a jdk">
+    <target name="build" depends="build-java,build-native,build-test"
+        description="Compiles the java and native code to produce a jdk" />
+
+    <target name="support-jar" depends="build-java" >
         <ant antfile="make/build-test.xml" inheritall="false"
              target="support-jar"/>
     </target>
@@ -174,11 +175,11 @@
         <ant antfile="make/build-test.xml" inheritall="false" target="test-all"/>
     </target>
 
-    <target name="test-jar" depends="-init-hdk"
-            description="Jar all tests">
+    <target name="build-test" depends="-init-hdk,support-jar"
+            description="Compile and archive all tests">
         <echo>
 ========================================
-Archive testing classes ...
+Compiling and archiving test classes ...
 ========================================
 </echo>
         <ant antfile="make/build-test.xml" inheritall="false" target="test-jar-modules"/>

Modified: harmony/enhanced/classlib/branches/java6/depends/build/platform/aix.ppc32.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/depends/build/platform/aix.ppc32.mk?rev=798469&r1=798468&r2=798469&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/depends/build/platform/aix.ppc32.mk (original)
+++ harmony/enhanced/classlib/branches/java6/depends/build/platform/aix.ppc32.mk Tue Jul 28 09:30:33 2009
@@ -14,7 +14,7 @@
 #  limitations under the License.
 
 CC = xlc
-DEFINES += -DAIX -DAIX_PPC32 -DHYPPC32 -D_Xconst="" -DIPv6_FUNCTION_SUPPORT \
+DEFINES += -DAIX -DAIX_PPC32 -DHYPPC32 -D_Xconst="" -DIPv6_FUNCTION_SUPPORT
 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

Modified: harmony/enhanced/classlib/branches/java6/depends/build/platform/macosx.x86.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/depends/build/platform/macosx.x86.mk?rev=798469&r1=798468&r2=798469&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/depends/build/platform/macosx.x86.mk (original)
+++ harmony/enhanced/classlib/branches/java6/depends/build/platform/macosx.x86.mk Tue Jul 28 09:30:33 2009
@@ -13,11 +13,15 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
+CC = gcc-4.2
+CXX = g++-4.2
+
 DEFINES += -DMACOSX -DMACOSX_X86 -DHYX86 -DIPv6_FUNCTION_SUPPORT
 
 # Add the default location of the macports.org install to the includes
 INCLUDES += -I/opt/local/include
-PLATFORM = -fPIC -fno-common
+PLATFORM = -fPIC -fno-common -arch i386 -mmacosx-version-min=10.5
+ASFLAGS += -arch i386
 OSLIBS = -L/opt/local/lib -lc -lm -ldl -liconv
 XLIBS = -L/usr/X11R6/lib -lX11 -lXft -lXext -lXtst -lXrender -lexpat \
         -lfreetype -lfontconfig

Modified: harmony/enhanced/classlib/branches/java6/depends/build/platform/macosx.x86_64.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/depends/build/platform/macosx.x86_64.mk?rev=798469&r1=798468&r2=798469&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/depends/build/platform/macosx.x86_64.mk (original)
+++ harmony/enhanced/classlib/branches/java6/depends/build/platform/macosx.x86_64.mk Tue Jul 28 09:30:33 2009
@@ -19,7 +19,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
+# WARNFLAGS += -Wconversion -Wformat -Wshorten-64-to-32
 OSLIBS = -L/opt/local/lib -lc -lm -ldl -liconv
 XLIBS = -L/usr/X11R6/lib -lX11 -lXft -lXext -lXtst -lXrender -lexpat \
         -lfreetype -lfontconfig

Modified: harmony/enhanced/classlib/branches/java6/depends/files/bootclasspath.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/depends/files/bootclasspath.properties?rev=798469&r1=798468&r2=798469&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/depends/files/bootclasspath.properties (original)
+++ harmony/enhanced/classlib/branches/java6/depends/files/bootclasspath.properties Tue Jul 28 09:30:33 2009
@@ -161,8 +161,8 @@
 
 # ICU functionality for text/characters are provided by the ICU4J 
 # and ICU4J-charsets JAR files.
-bootclasspath.31=icu4j_4.0/icu4j-4_0.jar
-bootclasspath.32=icu4j_4.0/icu4j-charsets-4_0.jar
+bootclasspath.31=icu4j_4.2.1/icu4j-4_2_1.jar
+bootclasspath.32=icu4j_4.2.1/icu4j-charsets-4_2_1.jar
 
 # The following JARs are from Xerces/Xalan
 bootclasspath.34=xalan-j_2.7.0/xalan.jar

Propchange: harmony/enhanced/classlib/branches/java6/depends/jars/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Jul 28 09:30:33 2009
@@ -8,6 +8,6 @@
 yoko-1.0
 bcprov-jdk15-141
 asm-3.1
-icu4j_4.0
 xmlsec_1.4.0
 bsf-3.0-beta3
+icu4j_4.2.1

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=798469&r1=798468&r2=798469&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/make/build-java.xml (original)
+++ harmony/enhanced/classlib/branches/java6/make/build-java.xml Tue Jul 28 09:30:33 2009
@@ -25,6 +25,8 @@
         Compile the Java source and package in component archives.
     </description>
 
+    <property name="hy.hdk" location="deploy" />
+
     <!-- import common properties -->
     <import file="${basedir}/make/properties.xml" />
 
@@ -32,8 +34,6 @@
     <property name="depends.jars" location="depends/jars" />
     <property name="depends.manifests" location="depends/manifests" />
     <property name="depends.files" location="depends/files" />
-    <property name="hy.hdk" location="deploy" />
-    <property name="hy.jdk" location="${hy.hdk}/jdk" />
     <property file="make/depends.properties" />
 
 
@@ -201,7 +201,7 @@
         <!-- Copy across the boot dependency jars --><!-- TOFIX clean these? -->
         <copy todir="${hy.jdk}/jre/lib/boot">
             <fileset dir="${depends.jars}">
-                <patternset includes="icu4j_4.0/*.jar" />
+                <patternset includes="icu4j_4.2.1/*.jar" />
                 <patternset includes="xalan-j_2.7.0/xalan.jar" />
                 <patternset includes="xerces_2.9.1/*.jar" />
             </fileset>

Modified: harmony/enhanced/classlib/branches/java6/make/build-native.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/make/build-native.xml?rev=798469&r1=798468&r2=798469&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/make/build-native.xml (original)
+++ harmony/enhanced/classlib/branches/java6/make/build-native.xml Tue Jul 28 09:30:33 2009
@@ -25,12 +25,12 @@
 		Compile the native source into component shared libs.
     </description>
 
+    <property name="hy.hdk" location="deploy" />
+
     <!-- import common properties -->
     <import file="${basedir}/make/properties.xml" />
     <import file="${basedir}/make/depends.xml" />
 
-    <property name="hy.hdk" location="deploy" />
-    <property name="hy.jdk" location="${hy.hdk}/jdk" />
     <property name="depends.build" location="depends/build" />
     <property name="depends.oss" location="depends/oss" />
     <property name="depends.libs" location="depends/libs/${hy.platform}" />

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=798469&r1=798468&r2=798469&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/make/build-test.xml (original)
+++ harmony/enhanced/classlib/branches/java6/make/build-test.xml Tue Jul 28 09:30:33 2009
@@ -22,16 +22,11 @@
     <description> Tests for classlib package</description>
 
     <property name="hy.hdk" location="deploy" />
-    <property name="hy.jdk" location="${hy.hdk}/jdk" />
 
     <!-- import common properties -->
-    <import file="${basedir}/make/properties.xml" />
-
-    <!-- set global properties for this build. -->
-
     <property name="tests.output" location="build/test_report" />
+    <import file="${basedir}/make/properties.xml" />
 
-    <property name="tests.build.output" location="build/tests" />
     <property name="tests.support.output" location="build/test_support" />
     <property name="support.dir" location="support"/>
     <property name="tests.depends.jars" location="deploy/jdk/jre/lib/boot" />
@@ -46,7 +41,6 @@
 
     <target name="clean">
         <delete dir="${tests.output}" />
-        <delete dir="${tests.build.output}" />
         <delete dir="${tests.support.output}" />
         <delete file="${hy.hdk}/build/test/support.jar" />
     </target>
@@ -177,99 +171,6 @@
 
     </target>
 
-    <target name="run-tests" description="Run JUnit tests">
-        <!-- The location of the Harmony launcher can be overridden by 
-             the "harmony.vm.exe" property. Default value of property
-             is set assuming it is under the deploy tree -->
-        <property name="harmony.vm.exe" location="${hy.jdk}/jre/bin/java"/>
-        
-        <!-- Delete "junitCompleted" - an empty file that can be used to
-             check that the junit test VM does not exit prematurely -->
-        <delete file="${user.home}/junitCompleted" failonerror="false" />
-
-        <path id="classpath.id" location="${tests.build.output}" />
-        
-        <java classname="tests.main.AllTests"
-              fork="true"
-              jvm="${harmony.vm.exe}">
-            
-
-            <!-- Required by various tests that set security manager etc -->
-            <jvmarg value="-Djava.security.policy=${hy.hdk}/build/test/testing.policy" />
-
-            <!-- Required for running the java.net unit tests -->
-            <jvmarg value="-Dtest.ini.file=${support.dir}/src/test/resources/config/localhosttest.ini" />
-
-            <!-- Required if using the test excluder decorator -->
-            <jvmarg value="-Dexcludes.file.uri=file:///${support.dir}/src/test/resources/config/jcltest-excludes.xml" />
-            
-            <classpath>
-                <path refid="classpath.id" />
-                <pathelement location="${junit.jar}" />
-            </classpath>
-        </java>
-    </target>
-
-    
-    <!-- ================================= 
-          target: run-tests-with-junit-task
-         ================================= -->
-    <target name="run-tests-with-junit-task" description="Run JUnit tests">
-        <!-- The location of the Harmony launcher can be overridden by 
-             the "harmony.vm.exe" property. Default value of property
-             is set assuming it is under the deploy tree -->
-        <property name="harmony.vm.exe" location="${hy.jdk}/jre/bin/java"/>
-
-        <!-- Delete "junitCompleted" - an empty file that can be used to
-             check that the junit test VM does not exit prematurely -->
-        <delete file="${user.home}/junitCompleted" failonerror="false" />
-
-        <path id="classpath.id" location="${tests.build.output}" />
-        
-        <junit fork="true"
-               forkmode="once"
-               jvm="${harmony.vm.exe}"
-               errorproperty="tests.failed"
-               failureproperty="tests.failed">
-
-            <env key="LD_LIBRARY_PATH" value="" />
-            <!-- required to be unset on Linux -->
-
-            <!-- Required by various tests that set security manager etc -->
-            <jvmarg value="-Djava.security.policy=${hy.hdk}/build/test/testing.policy" />
-
-            <!-- Required for running the java.net unit tests -->
-            <jvmarg value="-Dtest.ini.file=${support.dir}/src/test/resources/config/localhosttest.ini" />
-
-            <!-- Required if using the test excluder decorator -->
-            <jvmarg value="-Dexcludes.file.uri=file:///${support.dir}/src/test/resources/config/jcltest-excludes.xml" />
-            
-            <classpath>
-                <path refid="classpath.id" />
-                <pathelement location="${junit.jar}" />
-            </classpath>
-            
-            <formatter type="plain" usefile="false" />
-            <formatter type="xml" />
-            
-            <test todir="${tests.results.dir}" name="tests.main.AllTests" />
-        </junit>
-
-        <fail if="tests.failed" message="Some Tests Failed !" />
-
-        <!-- if the junit test process completed as expected, this file
-             should now exist -->
-        <fail message="JUnit task ended prematurely - Hint: This may have been caused by the test VM terminating unexpectedly during the test run">
-            <condition>
-                <not>
-                    <available file="${user.home}/junitCompleted" />
-                </not>
-            </condition>
-        </fail>
-        <!-- Clean up after ourselves -->
-        <delete file="${user.home}/junitCompleted" />
-    </target>
-
     <target name="process-empty" depends="-check-for-empty, -process-empty"/>
     <target name="-check-for-empty">
         <fileset id="empty.test.reports" dir="${tests.output}">

Propchange: harmony/enhanced/classlib/branches/java6/make/depends-common.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jul 28 09:30:33 2009
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/make/depends-common.xml:768152-790471
+/harmony/enhanced/classlib/trunk/make/depends-common.xml:768152-798021

Modified: harmony/enhanced/classlib/branches/java6/make/depends.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/make/depends.properties?rev=798469&r1=798468&r2=798469&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/make/depends.properties (original)
+++ harmony/enhanced/classlib/branches/java6/make/depends.properties Tue Jul 28 09:30:33 2009
@@ -112,14 +112,14 @@
 bcprov.url=${depends.url}/jars/bcprov/${bcprov.ver}/bcprov.jar
 bcprov.md5=f7cd7e1dcfe4b84d820b3a0937dc13f4
 
-icu4j.ver=icu4j_4.0
+icu4j.ver=icu4j_4.2.1
 icu4j.dir=${depends.jars}/${icu4j.ver}
-icu4j.jar=${icu4j.dir}/icu4j-4_0.jar
-icu4j.url=http://download.icu-project.org/files/icu4j/4.0/icu4j-4_0.jar
-icu4j.md5=08397653119558593204474fd5a9a7e3
+icu4j.jar=${icu4j.dir}/icu4j-4_2_1.jar
+icu4j.url=http://download.icu-project.org/files/icu4j/4.2.1/icu4j-4_2_1.jar
+icu4j.md5=2bef290de1db6970a6699bf78f0dca77
 
-icu4j-charsets.ver=icu4j_4.0
+icu4j-charsets.ver=icu4j_4.2.1
 icu4j-charsets.dir=${depends.jars}/${icu4j.ver}
-icu4j-charsets.jar=${icu4j.dir}/icu4j-charsets-4_0.jar
-icu4j-charsets.url=http://download.icu-project.org/files/icu4j/4.0/icu4j-charsets-4_0.jar
-icu4j-charsets.md5=5dd1d6aaffa6762e09541b3bb412d8ee
+icu4j-charsets.jar=${icu4j.dir}/icu4j-charsets-4_2_1.jar
+icu4j-charsets.url=http://download.icu-project.org/files/icu4j/4.2.1/icu4j-charsets-4_2_1.jar
+icu4j-charsets.md5=bccab3c39d735171fb54ce5e4f49207b

Modified: harmony/enhanced/classlib/branches/java6/make/depends.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/make/depends.xml?rev=798469&r1=798468&r2=798469&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/make/depends.xml (original)
+++ harmony/enhanced/classlib/branches/java6/make/depends.xml Tue Jul 28 09:30:33 2009
@@ -25,6 +25,8 @@
     where possible.
     </description>
 
+    <property name="hy.hdk" location="${basedir}/deploy" />
+
     <import file="${basedir}/make/properties.xml" />
     <import file="${basedir}/make/depends-common.xml" />
 

Modified: harmony/enhanced/classlib/branches/java6/make/properties.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/make/properties.xml?rev=798469&r1=798468&r2=798469&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/make/properties.xml (original)
+++ harmony/enhanced/classlib/branches/java6/make/properties.xml Tue Jul 28 09:30:33 2009
@@ -21,11 +21,20 @@
 
 <project name="Top-Level property definitions" default="echo" basedir="..">
     <description>
-        Ant file of common properties to be imported by other ant files
+        Ant file of common properties to be imported by other ant files.
+        Property "hy.hdk" must be defined before this file is imported.
     </description>
 
     <property file="${user.home}/.harmony-classlib.properties" />
 
+    <fail message="Property 'hy.hdk' is not defined">
+        <condition>
+            <not><isset property="hy.hdk" /></not>
+        </condition>
+    </fail>
+    <property name="hy.jdk" location="${hy.hdk}/jdk" />
+    <property name="hy.jre" location="${hy.jdk}/jre" />
+
     <!-- Debug or release version -->
     <property name="hy.cfg" value="debug" />
 
@@ -316,6 +325,49 @@
     <property name="hy.platform.variant"
               value="${hy.platform}${hy.libstdc++.suffix}" />
 
+    <!-- fileset to represent classes built by a module. -->
+    <fileset id="classes" dir="../../build/classes">
+        <or>
+            <!-- only common code case -->
+            <present targetdir="src/main/java" />
+            <present targetdir="src/main/java">
+                <mapper type="regexp"
+                        from="^(.*?)(\$$[^/\\\.]*)?\.class$$"
+                        to="\1.java"/>
+            </present>
+
+            <!-- java5 common code case -->
+            <present targetdir="src/main/java5" />
+            <present targetdir="src/main/java5">
+                <mapper type="regexp"
+                        from="^(.*?)(\$$[^/\\\.]*)?\.class$$"
+                        to="\1.java"/>
+            </present>
+
+            <!-- all common and platform code case -->
+            <present targetdir="src/main/java/common" />
+            <present targetdir="src/main/java/common">
+                <mapper type="regexp"
+                        from="^(.*?)(\$$[^/\\\.]*)?\.class$$"
+                        to="\1.java"/>
+            </present>
+            <present targetdir="src/main/java/${hy.os.family}" />
+            <present targetdir="src/main/java/${hy.os.family}">
+                <mapper type="regexp"
+                        from="^(.*?)(\$$[^/\\\.]*)?\.class$$"
+                        to="\1.java"/>
+            </present>
+        </or>
+
+    </fileset>
+
+    <!-- test properties -->
+    <property name="tests.output" location="../../build/test_report" />
+    <property name="tests.hdk.dir" value="${hy.hdk}/build/test/${hy.module}" />
+    <property name="tests.excludes.hdk.dir" value="${tests.hdk.dir}/excludes" />
+    <property name="tests.resources.hdk.dir"
+              value="${tests.hdk.dir}/resources" />
+
     <target name="echo" depends="svn-prop, svn-info, test-jre-vm-info"
             description="Display the properties defined by this ant file" >
         <echo>
@@ -371,7 +423,8 @@
   make.command = ${make.command}
 
   hy.hdk = ${hy.hdk}
-
+  hy.jdk = ${hy.jdk}
+  hy.jre = ${hy.jre}
 
 The following property is only set if the "svn-prop" target has been
 called:
@@ -454,7 +507,7 @@
     </target>
 
     <target name="-get-test-vm-output">
-        <condition property="test.jre.home" value="${hy.jdk}/jre">
+        <condition property="test.jre.home" value="${hy.jre}">
             <not><isset property="test.jre.home" /></not>
         </condition>
         <exec executable="${test.jre.home}/bin/java" failifexecutionfails="false">
@@ -581,6 +634,9 @@
                       value="exclude.${hy.platform}.${hy.test.vm.name}.interm"
             />
 
+            <dirname file="@{result}" property="@{result}.dir" />
+            <mkdir dir="${@{result}.dir}" />
+
            <echo message="" file="@{result}"/>
            <concat destfile="@{result}" force="yes" fixlastline="yes" append="true">
                <fileset dir="@{dir}">
@@ -619,4 +675,212 @@
        </javac>
    </presetdef>
 
+    <macrodef name="compile-tests">
+        <attribute name="description" default="" />
+        <attribute name="destdir" default="bin/test" />
+        <element name="javac-elements" />
+        <sequential>
+            <echo message="Compiling @{description}" />
+            
+            <mkdir dir="@{destdir}" />
+            
+            <javac destdir="@{destdir}"
+               compiler="${hy.javac.compiler}"
+               memoryMaximumSize="${hy.javac.maxmem}"
+               source="${hy.javac.source}" 
+               target="${hy.javac.target}"
+               debug="${hy.javac.debug}">
+
+                <javac-elements />
+
+                <compilerarg line="${build.compilerarg}" />
+
+                <bootclasspath>
+                    <fileset dir="${hy.jre}/lib/boot">
+                        <include name="**/*.jar" />
+                    </fileset>
+                </bootclasspath>
+
+                <classpath location="${hy.hdk}/build/test/support.jar" />
+            </javac>
+        </sequential>
+    </macrodef>
+
+    <macrodef name="run-hdk-tests">
+        <attribute name="module" />
+        <attribute name="jar" />
+        <element name="junit-elements" optional="true"/>
+        <element name="excludeorinclude" optional="true"/>
+        <sequential>
+            <echo message="Running @{module} Unit Test from @{jar}" />
+            <echo message="Tested jre: ${test.jre.home}/bin/java" />
+            <property name="test.module.dir" value="${target.dir}/@{module}" />
+            <property name="test.excludes.dir" value="${test.module.dir}/excludes" />
+            <property name="test.resources.dir" value="${test.module.dir}/resources" />
+            <property name="test.exclude.file" value="${work.dir}/@{module}/test.exclude" />
+            
+            <mkdir dir="${tests.output}" /> 
+
+            <prepare-exclude-list moduleName="@{module}" dir="${test.excludes.dir}" result="${test.exclude.file}" />
+            <junit fork="yes" 
+                   forkmode="${hy.test.forkmode}" 
+                   timeout="${hy.test.timeout}" 
+                   printsummary="withOutAndErr" 
+                   errorproperty="test.errors" 
+                   failureproperty="test.failures" 
+                   showoutput="on" 
+                   dir="${work.dir}/@{module}" 
+                   tempdir="${work.dir}"
+                   jvm="${test.jre.home}/bin/java">
+
+                <classpath>
+                    <fileset dir="${target.dir}">
+                        <include name="*.jar" />
+                    </fileset>
+                    <pathelement path="${test.resources.dir}/" />
+                    <pathelement path="${test.module.dir}/" />
+                    <pathelement location="${test.module.dir}/@{jar}" />
+                </classpath>
+
+                <junit-elements />
+
+                <batchtest todir="${tests.output}" haltonfailure="no">
+                    <zipfileset src="${test.module.dir}/@{jar}">
+                        <exclude name="Test.class" />
+                        <exclude name="**/*$*" />
+
+                        <!-- if ${test.case}     -->
+                        <include name="${converted.tc.class}" if="test.case" />
+                        <!-- unless ${test.case} -->
+                        <include name="**/*Test.class" unless="test.case" />
+                        <excludesfile name="${test.exclude.file}" unless="test.case"/>
+                        <excludeorinclude/>
+                    </zipfileset>
+                </batchtest>
+
+                <assertions enableSystemAssertions="true">
+                    <enable />
+                </assertions>
+
+                <jvmarg line="${hy.test.vmargs}" />
+                <!-- Used by Support_Exec.execJava() -->
+                <jvmarg value="-Dhy.test.vmargs=${hy.test.vmargs}" />
+
+                <formatter type="xml" />
+            </junit>
+
+            <antcall target="touch-failures-file">
+                <param name="module" value="@{module}" />
+            </antcall>
+            <antcall target="touch-errors-file">
+                <param name="module" value="@{module}" />
+            </antcall>
+
+        </sequential>
+    </macrodef>
+
+    <!-- TOFIX: Can't seem to override the line:
+             <include name="**/*Test.class" unless="test.case" />
+         so this is just run-hdk-tests without that line -->
+    <macrodef name="run-selected-hdk-tests">
+        <attribute name="module" />
+        <attribute name="jar" />
+        <element name="junit-elements" optional="true"/>
+        <element name="excludeorinclude" optional="true"/>
+        <sequential>
+            <echo message="Running @{module} Unit Test from @{jar}" />
+            <echo message="Tested jre: ${test.jre.home}/bin/java" />
+            <property name="test.module.dir" value="${target.dir}/@{module}" />
+            <property name="test.excludes.dir" value="${test.module.dir}/excludes" />
+            <property name="test.resources.dir" value="${test.module.dir}/resources" />
+            <property name="test.exclude.file" value="${work.dir}/@{module}/test.exclude" />
+            
+            <mkdir dir="${tests.output}" /> 
+
+            <prepare-exclude-list moduleName="@{module}" dir="${test.excludes.dir}" result="${test.exclude.file}" />
+            <junit fork="yes" 
+                   forkmode="${hy.test.forkmode}" 
+                   timeout="${hy.test.timeout}" 
+                   printsummary="withOutAndErr" 
+                   errorproperty="test.errors" 
+                   failureproperty="test.failures" 
+                   showoutput="on" 
+                   dir="${work.dir}/@{module}" 
+                   tempdir="${work.dir}"
+                   jvm="${test.jre.home}/bin/java">
+
+                <classpath>
+                    <fileset dir="${target.dir}">
+                        <include name="*.jar" />
+                    </fileset>
+                    <pathelement path="${test.resources.dir}/" />
+                    <pathelement path="${test.module.dir}/" />
+                    <pathelement location="${test.module.dir}/@{jar}" />
+                </classpath>
+
+                <junit-elements />
+
+                <batchtest todir="${tests.output}" haltonfailure="no">
+                    <zipfileset src="${test.module.dir}/@{jar}">
+                        <exclude name="Test.class" />
+                        <exclude name="**/*$*" />
+
+                        <!-- if ${test.case}     -->
+                        <include name="${converted.tc.class}" if="test.case" />
+                        <!-- unless ${test.case} -->
+                        <excludesfile name="${test.exclude.file}" unless="test.case"/>
+                        <excludeorinclude/>
+                    </zipfileset>
+                </batchtest>
+
+                <assertions enableSystemAssertions="true">
+                    <enable />
+                </assertions>
+
+                <jvmarg line="${hy.test.vmargs}" />
+                <!-- Used by Support_Exec.execJava() -->
+                <jvmarg value="-Dhy.test.vmargs=${hy.test.vmargs}" />
+
+                <formatter type="xml" />
+            </junit>
+
+            <antcall target="touch-failures-file">
+                <param name="module" value="@{module}" />
+            </antcall>
+            <antcall target="touch-errors-file">
+                <param name="module" value="@{module}" />
+            </antcall>
+
+        </sequential>
+    </macrodef>
+
+    <target name="touch-failures-file" if="test.failures">
+        <echo file="${tests.output}/test.failures"
+            append="true">${module}${line.separator}</echo>
+    </target>
+
+    <target name="touch-errors-file" if="test.errors">
+        <echo file="${tests.output}/test.errors"
+            append="true">${module}${line.separator}</echo>
+    </target>
+
+    <!-- To use with -Dtest.case=... option                   -->
+    <!-- if ${test.case} is provided in package+class form    -->
+    <!-- it is converted to dir+filename form                 -->
+    <macrodef name="convert-test-as-class">
+        <attribute name="from" />
+        <attribute name="to" />
+        <sequential>
+            <pathconvert property="@{to}" setonempty="no">
+                <path path="${@{from}}" />
+                <chainedmapper>
+                    <filtermapper>
+                        <replaceregex pattern="\.java$$" />
+                    </filtermapper>
+                    <unpackagemapper from="${basedir}${file.separator}*" to="*.class" />
+                </chainedmapper>
+            </pathconvert>
+        </sequential>
+    </macrodef>
+
 </project>

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=798469&r1=798468&r2=798469&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/make/run-test.xml (original)
+++ harmony/enhanced/classlib/branches/java6/make/run-test.xml Tue Jul 28 09:30:33 2009
@@ -18,68 +18,28 @@
 
 <project name="Harmony Test" default="test" basedir=".">
 
-    <property name="test.jre.home" location="../../jdk/jre" />
+    <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"/>
-    <import file="properties.xml" />
 
     <!-- These two parameters could be assigned by user -->
     <property name="target.dir" value="." />
     <property name="work.dir" value="${target.dir}" />
-    <property name="test.report.dir" value="${work.dir}/report" />
+    <property name="tests.output" value="${work.dir}/report" />
     <property name="junit.jar" value="${target.dir}/junit.jar" />
 
-    <target name="test" depends="test-jre-vm-info">
+    <import file="../ant/properties.xml" />
+
+    <target name="test"
+            depends="test-jre-vm-info,-test,gen-report,check-test-result" />
+
+    <target name="-test">
         <echo message="Test Work Dir: ${work.dir}" />
         <echo message="Test Target Dir: ${target.dir}" />
         <mkdir dir="${work.dir}" /> 
-        <delete dir="${test.report.dir}" quiet="true"/>
-        <convert-test-as-class from="test.case" to="converted.tc.class" />
-
-        <antcall target="test-module"/>
-
-        <antcall target="generate-report"/>
-        <antcall target="check-test-result"/>
-    </target>
-    
-    <target name="test-module">
-        <antcall target="test-${build.module}"/>
-    </target>
-
-    <target name="test-all">
-        <echo message="Test all modules"/>
-        <!--TODO: will add all modules here -->
-        <antcall target="test-luni"/>
-    </target>
-    
-    <target name="test-luni">
-        <run-tests module="luni" jar="luni_tests_api.jar">
-            <junit-elements>
-                <!-- Required by various tests that set security manager etc -->
-                <jvmarg value="-Djava.security.policy=${hy.hdk}/build/test/testing.policy" />
-
-                <!-- Required for running the java.net unit tests -->
-                <jvmarg value="-Dtest.ini.file=${target.dir}/luni/resources/config/localhosttest.ini" />
-            </junit-elements>
-        </run-tests>    
-
-        <run-tests module="luni" jar="luni_tests_impl.jar">
-            <junit-elements>
-                <!-- Required by various tests that set security manager etc -->
-                <jvmarg value="-Djava.security.policy=${hy.hdk}/build/test/testing.policy" />
-
-                <!-- Required for running the java.net unit tests -->
-                <jvmarg value="-Dtest.ini.file=${target.dir}/luni/resources/config/localhosttest.ini" />
-            </junit-elements>
-        </run-tests>
-    </target>
-    
-    <target name="touch-failures-file" if="test.failures">
-        <echo file="${work.dir}/report/test.failures" append="true">failure${line.separator}</echo>
-    </target>
-
-    <target name="touch-errors-file" if="test.errors">
-        <echo file="${work.dir}/report/test.errors" append="true">error${line.separator}</echo>
+        <delete dir="${tests.output}" quiet="true"/>
+        <poll-modules dir="." target="test-module" />
     </target>
 
     <target name="check-test-result">
@@ -89,115 +49,16 @@
         <fail if="test.failures" message="There were test failures." />
     </target>
 
-    <target name="generate-report">
-        <junitreport todir="${test.report.dir}">
-            <fileset dir="${test.report.dir}">
-                <include name="**/TEST*-*.xml" />
+    <target name="gen-report">
+        <junitreport todir="${tests.output}">
+            <fileset dir="${tests.output}">
+                <include name="TEST*-*.xml" />
             </fileset>
-            <report format="frames" todir="${test.report.dir}" />
+            <report format="frames" todir="${tests.output}" />
         </junitreport>
         <property name="display-location"
-                  location="${test.report.dir}/index.html"/>
+                  location="${tests.output}/index.html"/>
         <echo message="The test report is in ${display-location}"/>
     </target>
     
-    <target name="failure">
-        <fail message="Some tests failed">
-            <condition>
-                <or>
-                    <isset property="test.failures" />
-                    <isset property="test.errors" />
-                </or>
-            </condition>
-        </fail>
-    </target>
-
-    <macrodef name="run-tests">
-        <attribute name="module" />
-        <attribute name="jar" />
-        <element name="junit-elements" optional="true"/>
-        <element name="excludeorinclude" optional="true"/>
-        <sequential>
-            <echo message="Running @{module} Unit Test from @{jar}" />
-            <echo message="Tested jre: ${test.jre.home}/bin/java" />
-            <property name="test.module.dir" value="${target.dir}/@{module}" />
-            <property name="test.excludes.dir" value="${test.module.dir}/excludes" />
-            <property name="test.resources.dir" value="${test.module.dir}/resources" />
-            <property name="test.exclude.file" value="${work.dir}/@{module}.exclude" />
-            
-            <mkdir dir="${test.report.dir}/@{module}" /> 
-
-            <prepare-exclude-list moduleName="@{module}" dir="${test.excludes.dir}" result="${test.exclude.file}" />
-            <junit fork="yes" 
-                   forkmode="${hy.test.forkmode}" 
-                   timeout="${hy.test.timeout}" 
-                   printsummary="withOutAndErr" 
-                   errorproperty="test.errors" 
-                   failureproperty="test.failures" 
-                   showoutput="on" 
-                   dir="${work.dir}" 
-                   tempdir="${work.dir}"
-                   jvm="${test.jre.home}/bin/java">
-
-                <classpath>
-                    <fileset dir="${target.dir}">
-                        <include name="*.jar" />
-                    </fileset>
-                    <pathelement path="${test.resources.dir}/" />
-                    <pathelement path="${test.module.dir}/" />
-                    <pathelement location="${test.module.dir}/@{jar}" />
-                </classpath>
-
-                <junit-elements />
-
-                <batchtest todir="${test.report.dir}/@{module}" haltonfailure="no">
-                    <zipfileset src="${test.module.dir}/@{jar}">
-                        <exclude name="Test.class" />
-                        <exclude name="**/*$*" />
-
-                        <!-- if ${test.case}     -->
-                        <include name="${converted.tc.class}" if="test.case" />
-                        <!-- unless ${test.case} -->
-                        <include name="**/*Test.class" unless="test.case" />
-                        <excludesfile name="${test.exclude.file}" unless="test.case"/>
-                        <excludeorinclude/>
-                    </zipfileset>
-                </batchtest>
-
-                <assertions enableSystemAssertions="true">
-                    <enable />
-                </assertions>
-
-                <jvmarg line="${hy.test.vmargs}" />
-                <!-- Used by Support_Exec.execJava() -->
-                <jvmarg value="-Dhy.test.vmargs=${hy.test.vmargs}" />
-
-                <formatter type="xml" />
-            </junit>
-
-            <antcall target="touch-failures-file" />
-            <antcall target="touch-errors-file" />
-
-        </sequential>
-    </macrodef>
-
-    <!-- To use with -Dtest.case=... option                   -->
-    <!-- if ${test.case} is provided in package+class form    -->
-    <!-- it is converted to dir+filename form                 -->
-    <macrodef name="convert-test-as-class">
-        <attribute name="from" />
-        <attribute name="to" />
-        <sequential>
-            <pathconvert property="@{to}" setonempty="no">
-                <path path="${@{from}}" />
-                <chainedmapper>
-                    <filtermapper>
-                        <replaceregex pattern="\.java$$" />
-                    </filtermapper>
-                    <unpackagemapper from="${basedir}${file.separator}*" to="*.class" />
-                </chainedmapper>
-            </pathconvert>
-        </sequential>
-    </macrodef>
-
 </project>

Modified: harmony/enhanced/classlib/branches/java6/make/test.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/make/test.properties?rev=798469&r1=798468&r2=798469&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/make/test.properties (original)
+++ harmony/enhanced/classlib/branches/java6/make/test.properties Tue Jul 28 09:30:33 2009
@@ -25,7 +25,7 @@
 test.jre.home=
 
 # Junit test mode
-hy.test.forkmode=perTest
+hy.test.forkmode=once
 
 # Junit test timeout
 hy.test.timeout=900000



Mime
View raw message