Index: modules/beans/make/common/build.xml
===================================================================
--- modules/beans/make/common/build.xml.orig 2006-04-13 20:37:41.000000000 +0100
+++ modules/beans/make/common/build.xml 2006-04-13 20:45:59.000000000 +0100
@@ -86,6 +86,7 @@
+
@@ -100,8 +101,6 @@
-
-
Index: modules/beans/src/test/java/org/apache/harmony/tests/java/beans/XMLDecoderTest.java
===================================================================
--- modules/beans/src/test/java/org/apache/harmony/tests/java/beans/XMLDecoderTest.java.orig 2006-04-13 20:34:06.000000000 +0100
+++ modules/beans/src/test/java/org/apache/harmony/tests/java/beans/XMLDecoderTest.java 2006-04-13 20:50:51.000000000 +0100
@@ -56,56 +56,56 @@
* The test checks the code generation for XML from Test1.xml
*/
public void testDecodeLinkedList() {
- decode("/java/beans/xml/Test1.xml");
+ decode("xml/Test1.xml");
}
/**
* The test checks the code generation for XML from Test2.xml
*/
public void testDecodePrimitiveArrayByLength() {
- decode("/java/beans/xml/Test2.xml");
+ decode("xml/Test2.xml");
}
/**
* The test checks the code generation for XML from Test3.xml
*/
public void testDecodePrimitiveArrayByElements() {
- decode("/java/beans/xml/Test3.xml");
+ decode("xml/Test3.xml");
}
/**
* The test checks the code generation for XML from Test4.xml
*/
public void testDecodeObjectArrayByLength() {
- decode("/java/beans/xml/Test4.xml");
+ decode("xml/Test4.xml");
}
/**
* The test checks the code generation for XML from Test5.xml
*/
public void testDecodeObjectArrayByElements() {
- decode("/java/beans/xml/Test5.xml");
+ decode("xml/Test5.xml");
}
/**
* The test checks the code generation for XML from Test6.xml
*/
public void testDecodeReference() {
- decode("/java/beans/xml/Test6.xml");
+ decode("xml/Test6.xml");
}
/**
* The test checks the code generation for XML from Test7.xml
*/
public void testDecodeStringArray() {
- decode("/java/beans/xml/Test7.xml");
+ decode("xml/Test7.xml");
}
/*
* The test checks the code generation for XML from MainTest.xml
*
public void testMain() {
- decode("/java/beans/xml/MainTest.xml");
+ decode("xml/MainTest.xml");
}
*/
@@ -131,7 +131,7 @@
try {
Introspector.setBeanInfoSearchPath(new String[] {});
d = new XMLDecoder(new BufferedInputStream(
- FileInputStream.class.getResourceAsStream(resourceName)));
+ ClassLoader.getSystemClassLoader().getResourceAsStream(resourceName)));
while(true) {
Object obj = d.readObject();
}
Index: modules/beans/src/test/resources/xml/Test6.xml
===================================================================
--- modules/beans/src/test/resources/xml/Test6.xml.orig 2006-04-13 20:34:06.000000000 +0100
+++ modules/beans/src/test/resources/xml/Test6.xml 2006-04-13 20:37:41.000000000 +0100
@@ -20,11 +20,11 @@
Version: $Revision: 1.1.6.3 $
-->
-
\ No newline at end of file
+
Index: modules/applet/make/common/hyproperties.xml
===================================================================
--- modules/applet/make/common/hyproperties.xml.orig 2006-03-29 17:38:05.000000000 +0100
+++ modules/applet/make/common/hyproperties.xml 2006-04-13 20:52:43.000000000 +0100
@@ -24,7 +24,7 @@
-
+
Index: modules/archive/make/common/hyproperties.xml
===================================================================
--- modules/archive/make/common/hyproperties.xml.orig 2006-03-29 10:25:14.000000000 +0100
+++ modules/archive/make/common/hyproperties.xml 2006-04-13 20:52:46.000000000 +0100
@@ -24,7 +24,7 @@
-
+
Index: modules/auth/make/common/hyproperties.xml
===================================================================
--- modules/auth/make/common/hyproperties.xml.orig 2006-04-07 12:55:15.000000000 +0100
+++ modules/auth/make/common/hyproperties.xml 2006-04-13 20:52:48.000000000 +0100
@@ -24,7 +24,7 @@
-
+
Index: modules/awt/make/common/hyproperties.xml
===================================================================
--- modules/awt/make/common/hyproperties.xml.orig 2006-03-29 17:38:09.000000000 +0100
+++ modules/awt/make/common/hyproperties.xml 2006-04-13 20:52:50.000000000 +0100
@@ -24,7 +24,7 @@
-
+
Index: modules/beans/make/common/hyproperties.xml
===================================================================
--- modules/beans/make/common/hyproperties.xml.orig 2006-03-29 10:26:48.000000000 +0100
+++ modules/beans/make/common/hyproperties.xml 2006-04-13 20:52:55.000000000 +0100
@@ -20,11 +20,11 @@
-
+
-
+
Index: modules/crypto/make/common/hyproperties.xml
===================================================================
--- modules/crypto/make/common/hyproperties.xml.orig 2006-03-30 13:07:06.000000000 +0100
+++ modules/crypto/make/common/hyproperties.xml 2006-04-13 20:52:57.000000000 +0100
@@ -24,7 +24,7 @@
-
+
Index: modules/jndi/make/common/hyproperties.xml
===================================================================
--- modules/jndi/make/common/hyproperties.xml.orig 2006-03-29 10:25:42.000000000 +0100
+++ modules/jndi/make/common/hyproperties.xml 2006-04-13 20:52:59.000000000 +0100
@@ -24,7 +24,7 @@
-
+
Index: modules/logging/make/common/hyproperties.xml
===================================================================
--- modules/logging/make/common/hyproperties.xml.orig 2006-04-01 06:52:25.000000000 +0100
+++ modules/logging/make/common/hyproperties.xml 2006-04-13 20:53:01.000000000 +0100
@@ -24,7 +24,7 @@
-
+
Index: modules/luni/make/common/hyproperties.xml
===================================================================
--- modules/luni/make/common/hyproperties.xml.orig 2006-03-29 10:30:25.000000000 +0100
+++ modules/luni/make/common/hyproperties.xml 2006-04-13 20:53:03.000000000 +0100
@@ -24,7 +24,7 @@
-
+
Index: modules/math/make/common/hyproperties.xml
===================================================================
--- modules/math/make/common/hyproperties.xml.orig 2006-03-29 17:38:08.000000000 +0100
+++ modules/math/make/common/hyproperties.xml 2006-04-13 20:53:05.000000000 +0100
@@ -24,7 +24,7 @@
-
+
Index: modules/nio/make/common/hyproperties.xml
===================================================================
--- modules/nio/make/common/hyproperties.xml.orig 2006-03-29 10:26:29.000000000 +0100
+++ modules/nio/make/common/hyproperties.xml 2006-04-13 20:53:09.000000000 +0100
@@ -24,7 +24,7 @@
-
+
Index: modules/nio_char/make/common/hyproperties.xml
===================================================================
--- modules/nio_char/make/common/hyproperties.xml.orig 2006-03-29 10:25:29.000000000 +0100
+++ modules/nio_char/make/common/hyproperties.xml 2006-04-13 20:53:07.000000000 +0100
@@ -24,7 +24,7 @@
-
+
Index: modules/prefs/make/common/hyproperties.xml
===================================================================
--- modules/prefs/make/common/hyproperties.xml.orig 2006-03-29 10:25:06.000000000 +0100
+++ modules/prefs/make/common/hyproperties.xml 2006-04-13 20:53:11.000000000 +0100
@@ -24,7 +24,7 @@
-
+
Index: modules/regex/make/common/hyproperties.xml
===================================================================
--- modules/regex/make/common/hyproperties.xml.orig 2006-04-13 08:04:18.000000000 +0100
+++ modules/regex/make/common/hyproperties.xml 2006-04-13 20:53:13.000000000 +0100
@@ -24,7 +24,7 @@
-
+
Index: modules/rmi/make/common/hyproperties.xml
===================================================================
--- modules/rmi/make/common/hyproperties.xml.orig 2006-03-29 17:38:05.000000000 +0100
+++ modules/rmi/make/common/hyproperties.xml 2006-04-13 20:53:14.000000000 +0100
@@ -24,7 +24,7 @@
-
+
Index: modules/security/make/common/hyproperties.xml
===================================================================
--- modules/security/make/common/hyproperties.xml.orig 2006-04-05 06:32:27.000000000 +0100
+++ modules/security/make/common/hyproperties.xml 2006-04-13 20:53:16.000000000 +0100
@@ -24,7 +24,7 @@
-
+
Index: modules/sql/make/common/hyproperties.xml
===================================================================
--- modules/sql/make/common/hyproperties.xml.orig 2006-03-29 10:27:18.000000000 +0100
+++ modules/sql/make/common/hyproperties.xml 2006-04-13 20:53:18.000000000 +0100
@@ -24,7 +24,7 @@
-
+
Index: modules/text/make/common/hyproperties.xml
===================================================================
--- modules/text/make/common/hyproperties.xml.orig 2006-03-29 10:26:24.000000000 +0100
+++ modules/text/make/common/hyproperties.xml 2006-04-13 20:53:20.000000000 +0100
@@ -24,7 +24,7 @@
-
+
Index: modules/x-net/make/common/hyproperties.xml
===================================================================
--- modules/x-net/make/common/hyproperties.xml.orig 2006-03-29 10:27:03.000000000 +0100
+++ modules/x-net/make/common/hyproperties.xml 2006-04-13 20:53:24.000000000 +0100
@@ -24,7 +24,7 @@
-
+