fix imports

Author: darkv

Applications/Uber/Sources/er/uber/components/CharacterEncoding.java

@@ -1,6 +1,7 @@
 package er.uber.components;
 
-import junit.framework.Assert;
+
+import org.junit.Assert;
 
 import com.webobjects.appserver.WOActionResults;
 import com.webobjects.appserver.WOContext;

Examples/Ajax/AjaxExample2/Sources/er/ajax/example2/util/Year.java

@@ -1,6 +1,7 @@
 package er.ajax.example2.util;
 
-import com.ibm.icu.util.Calendar;
+import java.util.Calendar;
+
 import com.webobjects.foundation.NSArray;
 import com.webobjects.foundation.NSMutableArray;
 

Frameworks/Core/ERExtensions/Sources/er/extensions/eof/ERXQuery.java

@@ -2,6 +2,7 @@
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
+import java.text.SimpleDateFormat;
 import java.util.Enumeration;
 import java.util.StringTokenizer;
 import java.util.regex.Matcher;
@@ -10,7 +11,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.ibm.icu.text.SimpleDateFormat;
 import com.webobjects.eoaccess.EOAdaptor;
 import com.webobjects.eoaccess.EOAdaptorChannel;
 import com.webobjects.eoaccess.EOAttribute;

Frameworks/EOAdaptors/JavaLuceneAdaptor/Sources/er/luceneadaptor/ERLuceneAdaptorChannel.java

@@ -1,6 +1,7 @@
 package er.luceneadaptor;
 
 import java.io.IOException;
+import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.text.Format;
 import java.text.ParseException;
@@ -34,7 +35,6 @@
 import org.apache.lucene.util.NumericUtils;
 import org.apache.lucene.util.Version;
 
-import com.ibm.icu.math.BigDecimal;
 import com.webobjects.eoaccess.EOAdaptorChannel;
 import com.webobjects.eoaccess.EOAttribute;
 import com.webobjects.eoaccess.EOEntity;

Tests/ERXTest/Sources/com/webobjects/appserver/WOTimerTest.java

@@ -1,8 +1,8 @@
 package com.webobjects.appserver;
 
-import er.erxtest.ERXTestCase;
+import org.junit.Assert;
 
-import junit.framework.Assert;
+import er.erxtest.ERXTestCase;
 
 public class WOTimerTest extends ERXTestCase {
 

Tests/ERXTest/Sources/com/webobjects/eoaccess/ERXEntityTest.java

@@ -3,7 +3,7 @@
 
 import java.net.URL;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import com.webobjects.eocontrol.EOClassDescription;
 import com.webobjects.eocontrol.EOEditingContext;

Tests/ERXTest/Sources/com/webobjects/eoaccess/ERXModelTest.java

@@ -1,6 +1,7 @@
 package com.webobjects.eoaccess;
 
-import junit.framework.Assert;
+import org.junit.Assert;
+
 import er.erxtest.ERXTestCase;
 
 public class ERXModelTest extends ERXTestCase {

Tests/ERXTest/Sources/com/webobjects/foundation/NSKeyValueCodingTest.java

@@ -1,6 +1,7 @@
 package com.webobjects.foundation;
 
-import junit.framework.Assert;
+import org.junit.Assert;
+
 import er.erxtest.ERXTestCase;
 
 public class NSKeyValueCodingTest extends ERXTestCase {

Tests/ERXTest/Sources/com/webobjects/foundation/NSTimestampTest.java

@@ -4,7 +4,8 @@
 import java.util.Enumeration;
 import java.util.Locale;
 
-import junit.framework.Assert;
+import org.junit.Assert;
+
 import er.erxtest.ERXTestCase;
 import er.extensions.foundation.ERXFileUtilities;
 import er.extensions.foundation.ERXValueUtilities;

Tests/ERXTest/Sources/er/extensions/eof/ERXECTest.java

@@ -7,7 +7,7 @@
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import com.webobjects.eoaccess.EOUtilities;
 import com.webobjects.eocontrol.EOEditingContext;