Index: modules/regex/make/common/build.xml
===================================================================
--- modules/regex/make/common/build.xml.orig 2006-03-21 08:55:56.000000000 +0000
+++ modules/regex/make/common/build.xml 2006-03-21 08:56:38.000000000 +0000
@@ -91,12 +91,6 @@
-
-
-
-
-
-
Index: make/build-test.xml
===================================================================
--- make/build-test.xml.orig 2006-03-21 07:48:19.000000000 +0000
+++ make/build-test.xml 2006-03-21 09:17:30.000000000 +0000
@@ -43,7 +43,7 @@
+ depends="clean, compile-support, test-luni, test-archive, test-text, test-nio, test-xnet, test-nio_char, test-jndi, test-sql, test-prefs, test-beans, test-regex, gen-report">
@@ -139,6 +139,13 @@
+
+
+
+
+
+
+
Index: make/patternsets/regex.txt
===================================================================
--- make/patternsets/regex.txt.orig 2006-03-20 18:40:50.000000000 +0000
+++ make/patternsets/regex.txt 2006-03-21 09:16:26.000000000 +0000
@@ -13,4 +13,3 @@
# limitations under the License.
java/util/regex/*
-com/ibm/regex/*
\ No newline at end of file
Index: modules/regex/src/test/java/org/apache/harmony/tests/regex/MatcherTest.java
===================================================================
--- modules/regex/src/test/java/org/apache/harmony/tests/regex/MatcherTest.java.orig 2006-03-21 08:47:13.000000000 +0000
+++ modules/regex/src/test/java/org/apache/harmony/tests/regex/MatcherTest.java 2006-03-21 13:26:19.000000000 +0000
@@ -18,9 +18,10 @@
* @author Nikolay A. Kuznetsov
* @version $Revision: 1.10.2.2 $
*/
-package java.util.regex;
+package org.apache.harmony.tests.regex;
import junit.framework.TestCase;
+import java.util.regex.*;
/**
* @author Nikolay A. Kuznetsov
Index: modules/regex/src/test/java/org/apache/harmony/tests/regex/PatternTest.java
===================================================================
--- modules/regex/src/test/java/org/apache/harmony/tests/regex/PatternTest.java.orig 2006-03-21 08:47:13.000000000 +0000
+++ modules/regex/src/test/java/org/apache/harmony/tests/regex/PatternTest.java 2006-03-21 13:26:19.000000000 +0000
@@ -18,9 +18,10 @@
* @author Nikolay A. Kuznetsov
* @version $Revision: 1.12.2.2 $
*/
-package java.util.regex;
+package org.apache.harmony.tests.regex;
import junit.framework.TestCase;
+import java.util.regex.*;
/**
* @author Nikolay A. Kuznetsov