Index: modules/archive/make/common/build.xml =================================================================== --- modules/archive/make/common/build.xml.orig 2006-04-24 06:42:20.000000000 +0100 +++ modules/archive/make/common/build.xml 2006-04-24 11:05:06.000000000 +0100 @@ -96,10 +96,10 @@ - - - - + + + + Index: modules/beans/make/common/build.xml =================================================================== --- modules/beans/make/common/build.xml.orig 2006-04-21 06:29:05.000000000 +0100 +++ modules/beans/make/common/build.xml 2006-04-24 10:49:32.000000000 +0100 @@ -98,16 +98,16 @@ - - - - - - + + + + + + @@ -132,6 +132,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-24 06:43:47.000000000 +0100 +++ modules/beans/src/test/java/org/apache/harmony/tests/java/beans/BeansTest.java 2006-04-24 10:32:20.000000000 +0100 @@ -56,7 +56,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(); @@ -79,7 +79,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); @@ -132,4 +132,4 @@ private void checkValues(SampleBean sampleBean) { assertNull(sampleBean.getText()); } -} \ No newline at end of file +} Index: modules/crypto/make/common/build.xml =================================================================== --- modules/crypto/make/common/build.xml.orig 2006-04-21 08:18:45.000000000 +0100 +++ modules/crypto/make/common/build.xml 2006-04-24 10:51:46.000000000 +0100 @@ -67,7 +67,6 @@ - Index: modules/jndi/make/common/build.xml =================================================================== --- modules/jndi/make/common/build.xml.orig 2006-04-20 21:30:51.000000000 +0100 +++ modules/jndi/make/common/build.xml 2006-04-24 11:14:08.000000000 +0100 @@ -97,23 +97,23 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + Index: modules/logging/make/common/build.xml =================================================================== --- modules/logging/make/common/build.xml.orig 2006-04-20 21:30:52.000000000 +0100 +++ modules/logging/make/common/build.xml 2006-04-24 11:24:20.000000000 +0100 @@ -118,16 +118,16 @@ - - - - - - - - - - + + + + + + + + + + Index: modules/math/make/common/build.xml =================================================================== --- modules/math/make/common/build.xml.orig 2006-04-20 21:30:56.000000000 +0100 +++ modules/math/make/common/build.xml 2006-04-24 12:03:29.000000000 +0100 @@ -97,9 +97,9 @@ - + - + Index: modules/nio_char/make/common/build.xml =================================================================== --- modules/nio_char/make/common/build.xml.orig 2006-04-24 06:42:20.000000000 +0100 +++ modules/nio_char/make/common/build.xml 2006-04-24 11:26:16.000000000 +0100 @@ -96,21 +96,19 @@ - - - - + + + + - - - - - - - - - - + + + + + + + + Index: modules/prefs/make/common/build.xml =================================================================== --- modules/prefs/make/common/build.xml.orig 2006-04-20 21:30:50.000000000 +0100 +++ modules/prefs/make/common/build.xml 2006-04-24 11:28:43.000000000 +0100 @@ -96,9 +96,9 @@ - - - + + + Index: modules/sql/make/common/build.xml =================================================================== --- modules/sql/make/common/build.xml.orig 2006-04-24 06:42:22.000000000 +0100 +++ modules/sql/make/common/build.xml 2006-04-24 11:59:17.000000000 +0100 @@ -98,7 +98,7 @@ - + Index: modules/text/make/common/build.xml =================================================================== --- modules/text/make/common/build.xml.orig 2006-04-24 06:42:20.000000000 +0100 +++ modules/text/make/common/build.xml 2006-04-24 11:03:03.000000000 +0100 @@ -96,13 +96,13 @@ - - - - + + + + - - + + Index: modules/x-net/make/common/build.xml =================================================================== --- modules/x-net/make/common/build.xml.orig 2006-04-20 21:30:58.000000000 +0100 +++ modules/x-net/make/common/build.xml 2006-04-24 12:01:11.000000000 +0100 @@ -63,7 +63,6 @@ - @@ -115,13 +114,13 @@ - - - - - - - + + + + + + +