Index: modules/archive/make/common/build.xml =================================================================== --- modules/archive/make/common/build.xml.orig 2006-04-27 06:59:15.000000000 +0100 +++ modules/archive/make/common/build.xml 2006-04-27 07:00:32.000000000 +0100 @@ -99,10 +99,10 @@ - - - - + + + + Index: modules/beans/make/common/build.xml =================================================================== --- modules/beans/make/common/build.xml.orig 2006-04-27 06:59:15.000000000 +0100 +++ modules/beans/make/common/build.xml 2006-04-27 07:00:32.000000000 +0100 @@ -101,16 +101,16 @@ - - - - - - + + + + + + @@ -134,6 +134,8 @@ + + Index: modules/beans/src/test/java/org/apache/harmony/tests/java/beans/BeansTest.java =================================================================== --- modules/beans/src/test/java/org/apache/harmony/tests/java/beans/BeansTest.java.orig 2006-04-27 06:59:15.000000000 +0100 +++ modules/beans/src/test/java/org/apache/harmony/tests/java/beans/BeansTest.java 2006-04-27 07:00:32.000000000 +0100 @@ -59,7 +59,7 @@ * using specific classloader for class loading */ public void testLoadBySpecificClassLoader() { - String beanName = "org.apache.harmony.tests.beans.auxiliary.SampleBean"; + String beanName = "org.apache.harmony.tests.java.beans.auxiliary.SampleBean"; try { ClassLoader cls = createSpecificClassLoader(); @@ -82,7 +82,7 @@ * using default classloader for class loading */ public void testLoadByDefaultClassLoader() { - String beanName = "org.apache.harmony.tests.beans.auxiliary.SampleBean"; + String beanName = "org.apache.harmony.tests.java.beans.auxiliary.SampleBean"; try { Object bean = Beans.instantiate(null, beanName); Index: modules/jndi/make/common/build.xml =================================================================== --- modules/jndi/make/common/build.xml.orig 2006-04-27 06:59:46.000000000 +0100 +++ modules/jndi/make/common/build.xml 2006-04-27 07:02:34.000000000 +0100 @@ -107,8 +107,8 @@ To make the following two test cases pass, set forkmode="perTest" --> - - + + Index: modules/logging/make/common/build.xml =================================================================== --- modules/logging/make/common/build.xml.orig 2006-04-27 06:59:15.000000000 +0100 +++ modules/logging/make/common/build.xml 2006-04-27 07:00:32.000000000 +0100 @@ -121,16 +121,16 @@ - - - - - - - - - - + + + + + + + + + + Index: modules/nio_char/make/common/build.xml =================================================================== --- modules/nio_char/make/common/build.xml.orig 2006-04-27 06:59:15.000000000 +0100 +++ modules/nio_char/make/common/build.xml 2006-04-27 07:00:32.000000000 +0100 @@ -99,21 +99,19 @@ - - - - + + + + - - - - - - - - - - + + + + + + + + Index: modules/prefs/make/common/build.xml =================================================================== --- modules/prefs/make/common/build.xml.orig 2006-04-27 06:59:15.000000000 +0100 +++ modules/prefs/make/common/build.xml 2006-04-27 07:00:32.000000000 +0100 @@ -99,9 +99,9 @@ - - - + + + Index: modules/sql/make/common/build.xml =================================================================== --- modules/sql/make/common/build.xml.orig 2006-04-27 06:59:15.000000000 +0100 +++ modules/sql/make/common/build.xml 2006-04-27 07:00:32.000000000 +0100 @@ -101,7 +101,7 @@ - + Index: modules/text/make/common/build.xml =================================================================== --- modules/text/make/common/build.xml.orig 2006-04-27 06:59:15.000000000 +0100 +++ modules/text/make/common/build.xml 2006-04-27 07:00:32.000000000 +0100 @@ -99,13 +99,13 @@ - - - - - - - + + + + + + + Index: modules/x-net/make/common/build.xml =================================================================== --- modules/x-net/make/common/build.xml.orig 2006-04-27 06:59:15.000000000 +0100 +++ modules/x-net/make/common/build.xml 2006-04-27 07:00:32.000000000 +0100 @@ -63,7 +63,6 @@ - @@ -118,13 +117,13 @@ - - - - - - - + + + + + + +