Index: make/build-test.xml
===================================================================
--- make/build-test.xml.orig 2006-04-05 21:03:22.000000000 +0100
+++ make/build-test.xml 2006-04-07 09:46:46.000000000 +0100
@@ -33,7 +33,7 @@
+ depends="clean, test-luni, test-archive, test-text, test-nio, test-xnet, test-nio_char, test-logging, test-jndi, test-sql, test-prefs, test-beans, test-math, test-regex, test-crypto, gen-report">
@@ -144,6 +144,13 @@
+
+
+
+
+
+
+
Index: make/patternsets/regex.txt
===================================================================
--- make/patternsets/regex.txt.orig 2006-03-29 10:30:55.000000000 +0100
+++ make/patternsets/regex.txt 2006-04-07 09:44:53.000000000 +0100
@@ -13,4 +13,3 @@
# limitations under the License.
java/util/regex/*
-com/ibm/regex/*
\ No newline at end of file
Index: modules/regex/make/common/build.xml
===================================================================
--- modules/regex/make/common/build.xml.orig 2006-04-07 09:43:46.000000000 +0100
+++ modules/regex/make/common/build.xml 2006-04-07 09:44:53.000000000 +0100
@@ -91,12 +91,6 @@
-
-
-
-
-
-
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-29 10:26:32.000000000 +0100
+++ modules/regex/src/test/java/org/apache/harmony/tests/regex/MatcherTest.java 2006-04-07 09:44:53.000000000 +0100
@@ -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-29 17:38:07.000000000 +0100
+++ modules/regex/src/test/java/org/apache/harmony/tests/regex/PatternTest.java 2006-04-07 09:47:58.000000000 +0100
@@ -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