Index: src/main/org/exolab/castor/util/LocalConfiguration.java
===================================================================
RCS file: /home/projects/castor/scm/castor/src/main/org/exolab/castor/util/LocalConfiguration.java,v
retrieving revision 1.13
diff -u -r1.13 LocalConfiguration.java
--- src/main/org/exolab/castor/util/LocalConfiguration.java	10 Apr 2006 22:39:20 -0000	1.13
+++ src/main/org/exolab/castor/util/LocalConfiguration.java	14 Apr 2006 09:12:02 -0000
@@ -44,37 +44,34 @@
  */
 package org.exolab.castor.util;
 
-import java.util.Properties;
-import java.io.OutputStream;
-import java.io.Writer;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
-import java.io.InputStream;
 import java.io.IOException;
-import java.util.StringTokenizer;
-import java.util.Hashtable;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.Writer;
 import java.net.URL;
+import java.util.Hashtable;
+import java.util.Properties;
+import java.util.StringTokenizer;
 
-import org.xml.sax.SAXException;
-import org.xml.sax.DocumentHandler;
-import org.xml.sax.Parser;
-import org.xml.sax.XMLReader;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.parsers.SAXParser;
+import javax.xml.parsers.SAXParserFactory;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.castor.util.Messages;
-
 import org.exolab.castor.xml.NodeType;
 import org.exolab.castor.xml.OutputFormat;
 import org.exolab.castor.xml.Serializer;
 import org.exolab.castor.xml.XMLNaming;
-import org.exolab.castor.xml.XMLSerializerFactory;
 import org.exolab.castor.xml.util.DefaultNaming;
-
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.parsers.SAXParser;
-import javax.xml.parsers.SAXParserFactory;
+import org.xml.sax.DocumentHandler;
+import org.xml.sax.Parser;
+import org.xml.sax.SAXException;
+import org.xml.sax.XMLReader;
 
 /**
  * Provides default configuration for Castor components from the
Index: src/main/org/exolab/castor/util/DefaultObjectFactory.java
===================================================================
RCS file: /home/projects/castor/scm/castor/src/main/org/exolab/castor/util/DefaultObjectFactory.java,v
retrieving revision 1.4
diff -u -r1.4 DefaultObjectFactory.java
--- src/main/org/exolab/castor/util/DefaultObjectFactory.java	22 Mar 2006 09:39:55 -0000	1.4
+++ src/main/org/exolab/castor/util/DefaultObjectFactory.java	14 Apr 2006 09:12:01 -0000
@@ -50,8 +50,6 @@
 
 import java.lang.reflect.Constructor;
 
-import org.xml.sax.SAXException;
-
 /** 
  * The default implementation of ObjectFactory used for 
  * creating class instances
Index: src/main/org/exolab/castor/xml/dtd/Converter.java
===================================================================
RCS file: /home/projects/castor/scm/castor/src/main/org/exolab/castor/xml/dtd/Converter.java,v
retrieving revision 1.3
diff -u -r1.3 Converter.java
--- src/main/org/exolab/castor/xml/dtd/Converter.java	23 Jun 2004 04:17:36 -0000	1.3
+++ src/main/org/exolab/castor/xml/dtd/Converter.java	14 Apr 2006 09:12:02 -0000
@@ -45,18 +45,39 @@
 
 package org.exolab.castor.xml.dtd;
 
-import org.xml.sax.SAXException;
-
-import java.io.*;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.OutputStreamWriter;
+import java.io.Reader;
+import java.io.StringReader;
+import java.io.Writer;
 import java.util.Enumeration;
 import java.util.Iterator;
 
-import org.exolab.castor.xml.*;
-import org.exolab.castor.xml.schema.*;
+import org.exolab.castor.xml.dtd.parser.DTDInitialParser;
+import org.exolab.castor.xml.dtd.parser.DTDParser;
+import org.exolab.castor.xml.dtd.parser.InputCharStream;
+import org.exolab.castor.xml.dtd.parser.ParseException;
+import org.exolab.castor.xml.dtd.parser.TokenMgrError;
+import org.exolab.castor.xml.schema.Annotation;
+import org.exolab.castor.xml.schema.AttributeDecl;
+import org.exolab.castor.xml.schema.ComplexType;
+import org.exolab.castor.xml.schema.ContentType;
+import org.exolab.castor.xml.schema.Documentation;
+import org.exolab.castor.xml.schema.ElementDecl;
+import org.exolab.castor.xml.schema.Facet;
+import org.exolab.castor.xml.schema.Group;
+import org.exolab.castor.xml.schema.Order;
+import org.exolab.castor.xml.schema.Particle;
+import org.exolab.castor.xml.schema.Schema;
+import org.exolab.castor.xml.schema.SchemaException;
+import org.exolab.castor.xml.schema.SimpleType;
 import org.exolab.castor.xml.schema.SimpleTypesFactory;
-import org.exolab.castor.xml.dtd.parser.*;
-
+import org.exolab.castor.xml.schema.Wildcard;
 import org.exolab.castor.xml.schema.writer.SchemaWriter;
+import org.xml.sax.SAXException;
 
 /**
  * Class containing static top-level methods to parse and convert
Index: src/main/org/exolab/castor/xml/handlers/ValueOfFieldHandler.java
===================================================================
RCS file: /home/projects/castor/scm/castor/src/main/org/exolab/castor/xml/handlers/ValueOfFieldHandler.java,v
retrieving revision 1.3
diff -u -r1.3 ValueOfFieldHandler.java
--- src/main/org/exolab/castor/xml/handlers/ValueOfFieldHandler.java	1 Oct 2004 13:25:18 -0000	1.3
+++ src/main/org/exolab/castor/xml/handlers/ValueOfFieldHandler.java	14 Apr 2006 09:12:03 -0000
@@ -46,13 +46,13 @@
 package org.exolab.castor.xml.handlers;
 
 
-import org.exolab.castor.mapping.CollectionHandler;
-import org.exolab.castor.mapping.GeneralizedFieldHandler;
-import org.exolab.castor.mapping.MappingException;
-
-
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
+
+import org.exolab.castor.mapping.FieldDescriptor;
+import org.exolab.castor.mapping.FieldHandler;
+import org.exolab.castor.mapping.GeneralizedFieldHandler;
+import org.exolab.castor.mapping.MappingException;
 
 
 /**
Index: src/main/org/exolab/castor/xml/handlers/SQLTimeFieldHandler.java
===================================================================
RCS file: /home/projects/castor/scm/castor/src/main/org/exolab/castor/xml/handlers/SQLTimeFieldHandler.java,v
retrieving revision 1.2
diff -u -r1.2 SQLTimeFieldHandler.java
--- src/main/org/exolab/castor/xml/handlers/SQLTimeFieldHandler.java	13 Apr 2006 12:47:34 -0000	1.2
+++ src/main/org/exolab/castor/xml/handlers/SQLTimeFieldHandler.java	14 Apr 2006 09:12:03 -0000
@@ -46,14 +46,12 @@
 package org.exolab.castor.xml.handlers;
 
 
-import org.exolab.castor.mapping.CollectionHandler;
-import org.exolab.castor.mapping.GeneralizedFieldHandler;
-import org.exolab.castor.mapping.MappingException;
-import org.exolab.castor.mapping.loader.CollectionHandlers;
-
-import java.util.Date;
-import java.util.Enumeration;
 import java.sql.Time;
+import java.util.Date;
+
+import org.exolab.castor.mapping.FieldDescriptor;
+import org.exolab.castor.mapping.FieldHandler;
+import org.exolab.castor.mapping.GeneralizedFieldHandler;
 
 /**
  * An implementation of GeneralizedFieldHandler for
Index: src/main/org/exolab/castor/xml/handlers/SQLTimestampFieldHandler.java
===================================================================
RCS file: /home/projects/castor/scm/castor/src/main/org/exolab/castor/xml/handlers/SQLTimestampFieldHandler.java,v
retrieving revision 1.2
diff -u -r1.2 SQLTimestampFieldHandler.java
--- src/main/org/exolab/castor/xml/handlers/SQLTimestampFieldHandler.java	13 Apr 2006 12:47:34 -0000	1.2
+++ src/main/org/exolab/castor/xml/handlers/SQLTimestampFieldHandler.java	14 Apr 2006 09:12:03 -0000
@@ -46,13 +46,12 @@
 package org.exolab.castor.xml.handlers;
 
 
-import org.exolab.castor.mapping.CollectionHandler;
-import org.exolab.castor.mapping.GeneralizedFieldHandler;
-import org.exolab.castor.mapping.MappingException;
-import org.exolab.castor.mapping.loader.CollectionHandlers;
-
-import java.util.Date;
 import java.sql.Timestamp;
+import java.util.Date;
+
+import org.exolab.castor.mapping.FieldDescriptor;
+import org.exolab.castor.mapping.FieldHandler;
+import org.exolab.castor.mapping.GeneralizedFieldHandler;
 
 /**
  * An implementation of GeneralizedFieldHandler for
Index: src/tests/jdo/JDOJ2EECategory.java
===================================================================
RCS file: /home/projects/castor/scm/castor/src/tests/jdo/JDOJ2EECategory.java,v
retrieving revision 1.5
diff -u -r1.5 JDOJ2EECategory.java
--- src/tests/jdo/JDOJ2EECategory.java	10 Apr 2006 22:39:23 -0000	1.5
+++ src/tests/jdo/JDOJ2EECategory.java	14 Apr 2006 09:12:06 -0000
@@ -45,44 +45,35 @@
 package jdo;
 
 
+import harness.TestHarness;
+
+import java.net.MalformedURLException;
+import java.net.URL;
 import java.sql.Connection;
 import java.sql.SQLException;
 
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+import javax.sql.DataSource;
+import javax.transaction.TransactionManager;
+import javax.transaction.UserTransaction;
+
 import org.castor.jdo.engine.ConnectionFactory;
 import org.castor.jdo.engine.DatabaseRegistry;
 import org.castor.util.Messages;
-
-import org.exolab.castor.jdo.JDO;
 import org.exolab.castor.jdo.Database;
+import org.exolab.castor.jdo.JDO;
 import org.exolab.castor.jdo.PersistenceException;
 import org.exolab.castor.mapping.MappingException;
+import org.mockejb.jndi.MockContextFactory;
 
-import java.net.URL;
-import java.net.MalformedURLException;
-import harness.TestHarness;
-
-import javax.naming.*;
-//import javax.ejb.*;
-
-//import mock ejb stuff for JNDI
-import org.mockejb.*;
-import org.mockejb.interceptor.*;
-import org.mockejb.jndi.*;
-
-//import tyrex classes for transaction management
-import tyrex.tm.TransactionDomain;
-import tyrex.resource.Resources;
 import tyrex.resource.Resource;
 import tyrex.resource.ResourceException;
+import tyrex.resource.Resources;
 import tyrex.tm.DomainConfigurationException;
 import tyrex.tm.RecoveryException;
-
-//import javax.sql stuff
-import javax.sql.DataSource;
-
-//javax.transaction classes
-import javax.transaction.UserTransaction;
-import javax.transaction.TransactionManager;
+import tyrex.tm.TransactionDomain;
 
 
 /**
Index: src/main/org/exolab/castor/xml/schema/ContentModelGroup.java
===================================================================
RCS file: /home/projects/castor/scm/castor/src/main/org/exolab/castor/xml/schema/ContentModelGroup.java,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 ContentModelGroup.java
--- src/main/org/exolab/castor/xml/schema/ContentModelGroup.java	3 Mar 2003 07:09:29 -0000	1.1.1.1
+++ src/main/org/exolab/castor/xml/schema/ContentModelGroup.java	14 Apr 2006 09:12:04 -0000
@@ -45,10 +45,6 @@
 
 package org.exolab.castor.xml.schema;
 
-import org.exolab.castor.xml.*;
-
-import java.util.Vector;
-import java.util.Hashtable;
 import java.util.Enumeration;
 
 /**
Index: src/main/org/exolab/castor/xml/schema/FacetListEnumerator.java
===================================================================
RCS file: /home/projects/castor/scm/castor/src/main/org/exolab/castor/xml/schema/FacetListEnumerator.java,v
retrieving revision 1.2
diff -u -r1.2 FacetListEnumerator.java
--- src/main/org/exolab/castor/xml/schema/FacetListEnumerator.java	13 Apr 2006 12:47:33 -0000	1.2
+++ src/main/org/exolab/castor/xml/schema/FacetListEnumerator.java	14 Apr 2006 09:12:04 -0000
@@ -45,9 +45,6 @@
 
 package org.exolab.castor.xml.schema;
 
-import org.exolab.castor.xml.*;
-import org.exolab.castor.util.List;
-
 import java.util.Enumeration;
 
 /**
Index: src/main/org/exolab/castor/xml/schema/Unique.java
===================================================================
RCS file: /home/projects/castor/scm/castor/src/main/org/exolab/castor/xml/schema/Unique.java,v
retrieving revision 1.2
diff -u -r1.2 Unique.java
--- src/main/org/exolab/castor/xml/schema/Unique.java	13 Dec 2005 21:58:28 -0000	1.2
+++ src/main/org/exolab/castor/xml/schema/Unique.java	14 Apr 2006 09:12:05 -0000
@@ -46,8 +46,6 @@
 
 package org.exolab.castor.xml.schema;
 
-import org.exolab.castor.xml.*;
-import org.exolab.castor.xml.validators.ValidationUtils;
 
 /**
  * A class that represents the XML Schema Identity Constraint: Unique.
Index: src/main/org/exolab/castor/xml/schema/Annotated.java
===================================================================
RCS file: /home/projects/castor/scm/castor/src/main/org/exolab/castor/xml/schema/Annotated.java,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Annotated.java
--- src/main/org/exolab/castor/xml/schema/Annotated.java	3 Mar 2003 07:09:27 -0000	1.1.1.1
+++ src/main/org/exolab/castor/xml/schema/Annotated.java	14 Apr 2006 09:12:03 -0000
@@ -45,8 +45,6 @@
 
 package org.exolab.castor.xml.schema;
 
-import org.exolab.castor.xml.ValidationException;
-
 import java.util.Enumeration;
 import java.util.Vector;
 
Index: src/main/org/exolab/castor/xml/schema/KeyRef.java
===================================================================
RCS file: /home/projects/castor/scm/castor/src/main/org/exolab/castor/xml/schema/KeyRef.java,v
retrieving revision 1.2
diff -u -r1.2 KeyRef.java
--- src/main/org/exolab/castor/xml/schema/KeyRef.java	13 Dec 2005 21:58:28 -0000	1.2
+++ src/main/org/exolab/castor/xml/schema/KeyRef.java	14 Apr 2006 09:12:04 -0000
@@ -46,8 +46,6 @@
 
 package org.exolab.castor.xml.schema;
 
-import org.exolab.castor.xml.*;
-import org.exolab.castor.xml.validators.ValidationUtils;
 
 /**
  * A class that represents the XML Schema Identity Constraint: KeyRef.
Index: src/main/org/exolab/castor/xml/schema/IdentityField.java
===================================================================
RCS file: /home/projects/castor/scm/castor/src/main/org/exolab/castor/xml/schema/IdentityField.java,v
retrieving revision 1.2
diff -u -r1.2 IdentityField.java
--- src/main/org/exolab/castor/xml/schema/IdentityField.java	13 Dec 2005 21:58:28 -0000	1.2
+++ src/main/org/exolab/castor/xml/schema/IdentityField.java	14 Apr 2006 09:12:04 -0000
@@ -46,9 +46,7 @@
 
 package org.exolab.castor.xml.schema;
 
-import org.exolab.castor.xml.*;
-
-import java.util.Vector;
+import org.exolab.castor.xml.ValidationException;
 
 /**
  * A class which represents the field selector for an IdentityConstraint
Index: src/main/org/exolab/castor/xml/schema/AttributeDecl.java
===================================================================
RCS file: /home/projects/castor/scm/castor/src/main/org/exolab/castor/xml/schema/AttributeDecl.java,v
retrieving revision 1.4
diff -u -r1.4 AttributeDecl.java
--- src/main/org/exolab/castor/xml/schema/AttributeDecl.java	13 Dec 2005 21:58:28 -0000	1.4
+++ src/main/org/exolab/castor/xml/schema/AttributeDecl.java	14 Apr 2006 09:12:04 -0000
@@ -46,9 +46,7 @@
 
 package org.exolab.castor.xml.schema;
 
-import org.exolab.castor.xml.*;
-
-import java.util.Vector;
+import org.exolab.castor.xml.ValidationException;
 
 /**
  * An XML Schema Attribute Definition
Index: src/main/org/exolab/castor/xml/schema/FacetList.java
===================================================================
RCS file: /home/projects/castor/scm/castor/src/main/org/exolab/castor/xml/schema/FacetList.java,v
retrieving revision 1.4
diff -u -r1.4 FacetList.java
--- src/main/org/exolab/castor/xml/schema/FacetList.java	13 Dec 2005 21:58:28 -0000	1.4
+++ src/main/org/exolab/castor/xml/schema/FacetList.java	14 Apr 2006 09:12:04 -0000
@@ -45,10 +45,9 @@
 
 package org.exolab.castor.xml.schema;
 
-import org.exolab.castor.xml.*;
-import org.exolab.castor.util.List;
-
 import java.util.Enumeration;
+
+import org.exolab.castor.util.List;
 
 /**
  * A list for maintaining facets
Index: src/main/org/exolab/castor/xml/schema/Key.java
===================================================================
RCS file: /home/projects/castor/scm/castor/src/main/org/exolab/castor/xml/schema/Key.java,v
retrieving revision 1.2
diff -u -r1.2 Key.java
--- src/main/org/exolab/castor/xml/schema/Key.java	13 Dec 2005 21:58:28 -0000	1.2
+++ src/main/org/exolab/castor/xml/schema/Key.java	14 Apr 2006 09:12:04 -0000
@@ -46,8 +46,6 @@
 
 package org.exolab.castor.xml.schema;
 
-import org.exolab.castor.xml.*;
-import org.exolab.castor.xml.validators.ValidationUtils;
 
 /**
  * A class that represents the XML Schema Identity Constraint: Key.
Index: src/main/org/exolab/castor/xml/schema/IdentitySelector.java
===================================================================
RCS file: /home/projects/castor/scm/castor/src/main/org/exolab/castor/xml/schema/IdentitySelector.java,v
retrieving revision 1.2
diff -u -r1.2 IdentitySelector.java
--- src/main/org/exolab/castor/xml/schema/IdentitySelector.java	13 Dec 2005 21:58:28 -0000	1.2
+++ src/main/org/exolab/castor/xml/schema/IdentitySelector.java	14 Apr 2006 09:12:04 -0000
@@ -46,9 +46,7 @@
 
 package org.exolab.castor.xml.schema;
 
-import org.exolab.castor.xml.*;
-
-import java.util.Vector;
+import org.exolab.castor.xml.ValidationException;
 
 /**
  * A class which represents the selector for an IdentityConstraint
Index: src/main/org/exolab/castor/xml/schema/AttributeGroupReference.java
===================================================================
RCS file: /home/projects/castor/scm/castor/src/main/org/exolab/castor/xml/schema/AttributeGroupReference.java,v
retrieving revision 1.3
diff -u -r1.3 AttributeGroupReference.java
--- src/main/org/exolab/castor/xml/schema/AttributeGroupReference.java	13 Dec 2005 21:58:28 -0000	1.3
+++ src/main/org/exolab/castor/xml/schema/AttributeGroupReference.java	14 Apr 2006 09:12:04 -0000
@@ -46,9 +46,6 @@
 
 package org.exolab.castor.xml.schema;
 
-import org.exolab.castor.xml.ValidationException;
-
-import java.util.Vector;
 import java.util.Enumeration;
 
 /**
Index: src/main/org/exolab/castor/xml/schema/IdentityConstraint.java
===================================================================
RCS file: /home/projects/castor/scm/castor/src/main/org/exolab/castor/xml/schema/IdentityConstraint.java,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 IdentityConstraint.java
--- src/main/org/exolab/castor/xml/schema/IdentityConstraint.java	3 Mar 2003 07:09:32 -0000	1.1.1.1
+++ src/main/org/exolab/castor/xml/schema/IdentityConstraint.java	14 Apr 2006 09:12:04 -0000
@@ -46,12 +46,11 @@
 
 package org.exolab.castor.xml.schema;
 
-import org.exolab.castor.xml.*;
-import org.exolab.castor.xml.validators.ValidationUtils;
-
 import java.util.Enumeration;
 import java.util.Vector;
-import java.util.Hashtable;
+
+import org.exolab.castor.xml.ValidationException;
+import org.exolab.castor.xml.validators.ValidationUtils;
 
 /**
  * The base class for the XML Schema Identity Constraints 
Index: src/main/org/exolab/castor/xml/schema/Group.java
===================================================================
RCS file: /home/projects/castor/scm/castor/src/main/org/exolab/castor/xml/schema/Group.java,v
retrieving revision 1.6
diff -u -r1.6 Group.java
--- src/main/org/exolab/castor/xml/schema/Group.java	2 Feb 2006 09:03:09 -0000	1.6
+++ src/main/org/exolab/castor/xml/schema/Group.java	14 Apr 2006 09:12:04 -0000
@@ -45,11 +45,9 @@
 
 package org.exolab.castor.xml.schema;
 
-import org.exolab.castor.xml.*;
-
-import java.util.Vector;
-import java.util.Hashtable;
 import java.util.Enumeration;
+
+import org.exolab.castor.xml.ValidationException;
 
 /**
  * An XML Schema Group
Index: src/main/org/exolab/castor/xml/schema/Union.java
===================================================================
RCS file: /home/projects/castor/scm/castor/src/main/org/exolab/castor/xml/schema/Union.java,v
retrieving revision 1.2
diff -u -r1.2 Union.java
--- src/main/org/exolab/castor/xml/schema/Union.java	13 Dec 2005 21:58:28 -0000	1.2
+++ src/main/org/exolab/castor/xml/schema/Union.java	14 Apr 2006 09:12:05 -0000
@@ -45,9 +45,6 @@
 
 package org.exolab.castor.xml.schema;
 
-import org.exolab.castor.xml.*;
-import org.exolab.castor.xml.validators.ValidationUtils;
-
 import java.util.Enumeration;
 import java.util.Vector;
 
Index: src/main/org/exolab/castor/xml/schema/SchemaException.java
===================================================================
RCS file: /home/projects/castor/scm/castor/src/main/org/exolab/castor/xml/schema/SchemaException.java,v
retrieving revision 1.2
diff -u -r1.2 SchemaException.java
--- src/main/org/exolab/castor/xml/schema/SchemaException.java	13 Dec 2005 21:58:28 -0000	1.2
+++ src/main/org/exolab/castor/xml/schema/SchemaException.java	14 Apr 2006 09:12:05 -0000
@@ -45,7 +45,6 @@
 
 package org.exolab.castor.xml.schema;
 
-import org.exolab.castor.xml.XMLException;
 
 /**
  * An XML Schema Exception class
Index: src/main/org/exolab/castor/xml/schema/XMLType.java
===================================================================
RCS file: /home/projects/castor/scm/castor/src/main/org/exolab/castor/xml/schema/XMLType.java,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 XMLType.java
--- src/main/org/exolab/castor/xml/schema/XMLType.java	3 Mar 2003 07:09:36 -0000	1.1.1.1
+++ src/main/org/exolab/castor/xml/schema/XMLType.java	14 Apr 2006 09:12:05 -0000
@@ -46,7 +46,6 @@
 package org.exolab.castor.xml.schema;
 
 
-import org.exolab.castor.xml.ValidationException;
 
 /**
  * The base type for XML Schema types, such as complex types
Index: src/main/org/exolab/castor/xml/schema/AttributeGroup.java
===================================================================
RCS file: /home/projects/castor/scm/castor/src/main/org/exolab/castor/xml/schema/AttributeGroup.java,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 AttributeGroup.java
--- src/main/org/exolab/castor/xml/schema/AttributeGroup.java	3 Mar 2003 07:09:28 -0000	1.1.1.1
+++ src/main/org/exolab/castor/xml/schema/AttributeGroup.java	14 Apr 2006 09:12:04 -0000
@@ -46,10 +46,9 @@
 
 package org.exolab.castor.xml.schema;
 
-import org.exolab.castor.xml.ValidationException;
-
-import java.util.Vector;
 import java.util.Enumeration;
+
+import org.exolab.castor.xml.ValidationException;
 
 /**
  * An XML Schema Attribute Group Definition
Index: src/main/org/exolab/castor/xml/schema/ContentModelGroupImpl.java
===================================================================
RCS file: /home/projects/castor/scm/castor/src/main/org/exolab/castor/xml/schema/ContentModelGroupImpl.java,v
retrieving revision 1.3
diff -u -r1.3 ContentModelGroupImpl.java
--- src/main/org/exolab/castor/xml/schema/ContentModelGroupImpl.java	13 Dec 2005 21:58:28 -0000	1.3
+++ src/main/org/exolab/castor/xml/schema/ContentModelGroupImpl.java	14 Apr 2006 09:12:04 -0000
@@ -45,11 +45,8 @@
 
 package org.exolab.castor.xml.schema;
 
-import org.exolab.castor.xml.*;
-
-import java.util.Vector;
-import java.util.Hashtable;
 import java.util.Enumeration;
+import java.util.Vector;
 
 /**
  * An implementation of an XML Schema ContentModelGroup
Index: src/main/org/exolab/castor/xml/XMLFieldHandler.java
===================================================================
RCS file: /home/projects/castor/scm/castor/src/main/org/exolab/castor/xml/XMLFieldHandler.java,v
retrieving revision 1.3
diff -u -r1.3 XMLFieldHandler.java
--- src/main/org/exolab/castor/xml/XMLFieldHandler.java	23 Sep 2003 21:16:41 -0000	1.3
+++ src/main/org/exolab/castor/xml/XMLFieldHandler.java	14 Apr 2006 09:12:02 -0000
@@ -47,8 +47,6 @@
 package org.exolab.castor.xml;
 
 import org.exolab.castor.mapping.AbstractFieldHandler;
-import org.exolab.castor.mapping.FieldHandler;
-import org.exolab.castor.mapping.ValidityException;
 
 /**
  * This FieldHandler is used in the generated descriptors.
Index: src/main/org/exolab/castor/xml/Introspector.java
===================================================================
RCS file: /home/projects/castor/scm/castor/src/main/org/exolab/castor/xml/Introspector.java,v
retrieving revision 1.18
diff -u -r1.18 Introspector.java
--- src/main/org/exolab/castor/xml/Introspector.java	22 May 2005 14:22:58 -0000	1.18
+++ src/main/org/exolab/castor/xml/Introspector.java	14 Apr 2006 09:12:02 -0000
@@ -45,34 +45,33 @@
 
 package org.exolab.castor.xml;
 
-import org.exolab.castor.xml.descriptors.CoreDescriptors;
-import org.exolab.castor.xml.handlers.ContainerFieldHandler;
-import org.exolab.castor.xml.handlers.DateFieldHandler;
-import org.exolab.castor.xml.handlers.DefaultFieldHandlerFactory;
-import org.exolab.castor.xml.util.ContainerElement;
-import org.exolab.castor.xml.util.DefaultNaming;
-import org.exolab.castor.xml.util.XMLClassDescriptorImpl;
-import org.exolab.castor.xml.util.XMLFieldDescriptorImpl;
+import java.io.PrintWriter;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.util.Enumeration;
+import java.util.Hashtable;
+import java.util.Vector;
+
 import org.exolab.castor.mapping.CollectionHandler;
 import org.exolab.castor.mapping.FieldHandler;
 import org.exolab.castor.mapping.FieldHandlerFactory;
 import org.exolab.castor.mapping.GeneralizedFieldHandler;
 import org.exolab.castor.mapping.MappingException;
+import org.exolab.castor.mapping.TypeConvertor;
 import org.exolab.castor.mapping.loader.CollectionHandlers;
 import org.exolab.castor.mapping.loader.FieldHandlerImpl;
 import org.exolab.castor.mapping.loader.TypeInfo;
-import org.exolab.castor.mapping.TypeConvertor;
 import org.exolab.castor.util.Configuration;
-import org.exolab.castor.util.LocalConfiguration;
 import org.exolab.castor.util.List;
-
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.io.Serializable;
-import java.lang.reflect.*;
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.Vector;
+import org.exolab.castor.util.LocalConfiguration;
+import org.exolab.castor.xml.descriptors.CoreDescriptors;
+import org.exolab.castor.xml.handlers.ContainerFieldHandler;
+import org.exolab.castor.xml.handlers.DateFieldHandler;
+import org.exolab.castor.xml.handlers.DefaultFieldHandlerFactory;
+import org.exolab.castor.xml.util.ContainerElement;
+import org.exolab.castor.xml.util.XMLClassDescriptorImpl;
+import org.exolab.castor.xml.util.XMLFieldDescriptorImpl;
 
 /**
  * A Helper class for the Marshaller and Unmarshaller,
Index: src/main/org/exolab/castor/xml/schema/reader/ComponentReader.java
===================================================================
RCS file: /home/projects/castor/scm/castor/src/main/org/exolab/castor/xml/schema/reader/ComponentReader.java,v
retrieving revision 1.3
diff -u -r1.3 ComponentReader.java
--- src/main/org/exolab/castor/xml/schema/reader/ComponentReader.java	7 Mar 2005 08:27:13 -0000	1.3
+++ src/main/org/exolab/castor/xml/schema/reader/ComponentReader.java	14 Apr 2006 09:12:05 -0000
@@ -51,9 +51,7 @@
 import org.exolab.castor.xml.Namespaces;
 import org.exolab.castor.xml.XMLException;
 import org.exolab.castor.xml.schema.Resolver;
-
 import org.xml.sax.Locator;
-import java.io.Reader;
 
 /**
  * The base class for separate component unmarshallers for
Index: src/main/org/exolab/castor/xml/schema/reader/ComplexContentRestrictionUnmarshaller.java
===================================================================
RCS file: /home/projects/castor/scm/castor/src/main/org/exolab/castor/xml/schema/reader/ComplexContentRestrictionUnmarshaller.java,v
retrieving revision 1.4
diff -u -r1.4 ComplexContentRestrictionUnmarshaller.java
--- src/main/org/exolab/castor/xml/schema/reader/ComplexContentRestrictionUnmarshaller.java	13 Dec 2005 21:58:33 -0000	1.4
+++ src/main/org/exolab/castor/xml/schema/reader/ComplexContentRestrictionUnmarshaller.java	14 Apr 2006 09:12:05 -0000
@@ -57,7 +57,6 @@
 import org.exolab.castor.xml.schema.Schema;
 import org.exolab.castor.xml.schema.SchemaException;
 import org.exolab.castor.xml.schema.SchemaNames;
-import org.exolab.castor.xml.schema.Structure;
 import org.exolab.castor.xml.schema.Wildcard;
 import org.exolab.castor.xml.schema.XMLType;
 
Index: src/main/org/exolab/castor/xml/schema/reader/Sax2ComponentReader.java
===================================================================
RCS file: /home/projects/castor/scm/castor/src/main/org/exolab/castor/xml/schema/reader/Sax2ComponentReader.java,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Sax2ComponentReader.java
--- src/main/org/exolab/castor/xml/schema/reader/Sax2ComponentReader.java	3 Mar 2003 07:09:40 -0000	1.1.1.1
+++ src/main/org/exolab/castor/xml/schema/reader/Sax2ComponentReader.java	14 Apr 2006 09:12:05 -0000
@@ -50,9 +50,11 @@
 import org.exolab.castor.xml.Namespaces;
 import org.exolab.castor.xml.XMLException;
 import org.exolab.castor.xml.util.AttributeSetImpl;
-
-import org.exolab.castor.xml.schema.*;
-import org.xml.sax.*;
+import org.xml.sax.AttributeList;
+import org.xml.sax.DocumentHandler;
+import org.xml.sax.Locator;
+import org.xml.sax.SAXException;
+import org.xml.sax.SAXParseException;
 
 /**
  * A SAX adapter class for the ComponentReader.
Index: src/main/org/exolab/castor/xml/schema/reader/SimpleTypeUnmarshaller.java
===================================================================
RCS file: /home/projects/castor/scm/castor/src/main/org/exolab/castor/xml/schema/reader/SimpleTypeUnmarshaller.java,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 SimpleTypeUnmarshaller.java
--- src/main/org/exolab/castor/xml/schema/reader/SimpleTypeUnmarshaller.java	3 Mar 2003 07:09:43 -0000	1.1.1.1
+++ src/main/org/exolab/castor/xml/schema/reader/SimpleTypeUnmarshaller.java	14 Apr 2006 09:12:06 -0000
@@ -53,7 +53,6 @@
 import org.exolab.castor.xml.schema.Schema;
 import org.exolab.castor.xml.schema.SchemaNames;
 import org.exolab.castor.xml.schema.SimpleType;
-import org.exolab.castor.xml.schema.simpletypes.ListType;
 
 /**
  * A class for Unmarshalling SimpleTypes
Index: src/main/org/exolab/castor/xml/schema/reader/SchemaLocation.java
===================================================================
RCS file: /home/projects/castor/scm/castor/src/main/org/exolab/castor/xml/schema/reader/SchemaLocation.java,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 SchemaLocation.java
--- src/main/org/exolab/castor/xml/schema/reader/SchemaLocation.java	3 Mar 2003 07:09:41 -0000	1.1.1.1
+++ src/main/org/exolab/castor/xml/schema/reader/SchemaLocation.java	14 Apr 2006 09:12:05 -0000
@@ -44,14 +44,11 @@
  */
 package org.exolab.castor.xml.schema.reader;
 
+import java.io.Reader;
+
 import org.exolab.castor.net.URILocation;
-import org.exolab.castor.net.URIException;
 import org.exolab.castor.net.util.URIUtils;
-
 import org.exolab.castor.xml.schema.Schema;
-
-import java.io.IOException;
-import java.io.Reader;
 
 
 /**
Index: src/main/org/exolab/castor/xml/schema/reader/SimpleContentUnmarshaller.java
===================================================================
RCS file: /home/projects/castor/scm/castor/src/main/org/exolab/castor/xml/schema/reader/SimpleContentUnmarshaller.java,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 SimpleContentUnmarshaller.java
--- src/main/org/exolab/castor/xml/schema/reader/SimpleContentUnmarshaller.java	3 Mar 2003 07:09:42 -0000	1.1.1.1
+++ src/main/org/exolab/castor/xml/schema/reader/SimpleContentUnmarshaller.java	14 Apr 2006 09:12:06 -0000
@@ -52,7 +52,6 @@
 import org.exolab.castor.xml.schema.Annotation;
 import org.exolab.castor.xml.schema.ComplexType;
 import org.exolab.castor.xml.schema.Resolver;
-import org.exolab.castor.xml.schema.Schema;
 import org.exolab.castor.xml.schema.SchemaNames;
 
 /**
Index: src/main/org/exolab/castor/xml/schema/reader/SaxUnmarshaller.java
===================================================================
RCS file: /home/projects/castor/scm/castor/src/main/org/exolab/castor/xml/schema/reader/SaxUnmarshaller.java,v
retrieving revision 1.2
diff -u -r1.2 SaxUnmarshaller.java
--- src/main/org/exolab/castor/xml/schema/reader/SaxUnmarshaller.java	7 Mar 2005 08:26:57 -0000	1.2
+++ src/main/org/exolab/castor/xml/schema/reader/SaxUnmarshaller.java	14 Apr 2006 09:12:05 -0000
@@ -46,9 +46,12 @@
 package org.exolab.castor.xml.schema.reader;
 
 //-- imported classes and packages
-import org.exolab.castor.xml.schema.*;
-import org.xml.sax.*;
-import java.io.Reader;
+import org.exolab.castor.xml.schema.Resolver;
+import org.xml.sax.AttributeList;
+import org.xml.sax.DocumentHandler;
+import org.xml.sax.Locator;
+import org.xml.sax.SAXException;
+import org.xml.sax.SAXParseException;
 
 /**
  * The base class for unmarshallers
Index: src/main/org/exolab/castor/xml/schema/reader/ComplexContentUnmarshaller.java
===================================================================
RCS file: /home/projects/castor/scm/castor/src/main/org/exolab/castor/xml/schema/reader/ComplexContentUnmarshaller.java,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 ComplexContentUnmarshaller.java
--- src/main/org/exolab/castor/xml/schema/reader/ComplexContentUnmarshaller.java	3 Mar 2003 07:09:37 -0000	1.1.1.1
+++ src/main/org/exolab/castor/xml/schema/reader/ComplexContentUnmarshaller.java	14 Apr 2006 09:12:05 -0000
@@ -53,8 +53,6 @@
 import org.exolab.castor.xml.schema.ComplexType;
 import org.exolab.castor.xml.schema.ContentType;
 import org.exolab.castor.xml.schema.Resolver;
-import org.exolab.castor.xml.schema.Schema;
-import org.exolab.castor.xml.schema.SchemaException;
 import org.exolab.castor.xml.schema.SchemaNames;
 
 /**
Index: src/main/org/exolab/castor/xml/schema/reader/SimpleContentRestrictionUnmarshaller.java
===================================================================
RCS file: /home/projects/castor/scm/castor/src/main/org/exolab/castor/xml/schema/reader/SimpleContentRestrictionUnmarshaller.java,v
retrieving revision 1.5
diff -u -r1.5 SimpleContentRestrictionUnmarshaller.java
--- src/main/org/exolab/castor/xml/schema/reader/SimpleContentRestrictionUnmarshaller.java	1 Feb 2006 22:47:48 -0000	1.5
+++ src/main/org/exolab/castor/xml/schema/reader/SimpleContentRestrictionUnmarshaller.java	14 Apr 2006 09:12:06 -0000
@@ -60,7 +60,6 @@
 import org.exolab.castor.xml.schema.SchemaNames;
 import org.exolab.castor.xml.schema.SimpleContent;
 import org.exolab.castor.xml.schema.SimpleType;
-import org.exolab.castor.xml.schema.Structure;
 import org.exolab.castor.xml.schema.Wildcard;
 import org.exolab.castor.xml.schema.XMLType;
 
Index: src/main/org/exolab/castor/xml/schema/util/XMLInstance2SchemaHandler.java
===================================================================
RCS file: /home/projects/castor/scm/castor/src/main/org/exolab/castor/xml/schema/util/XMLInstance2SchemaHandler.java,v
retrieving revision 1.5
diff -u -r1.5 XMLInstance2SchemaHandler.java
--- src/main/org/exolab/castor/xml/schema/util/XMLInstance2SchemaHandler.java	13 Dec 2005 21:58:48 -0000	1.5
+++ src/main/org/exolab/castor/xml/schema/util/XMLInstance2SchemaHandler.java	14 Apr 2006 09:12:06 -0000
@@ -45,15 +45,27 @@
 
 package org.exolab.castor.xml.schema.util;
 
-import org.exolab.castor.xml.Namespaces;
-import org.exolab.castor.xml.schema.*;
-
-import org.xml.sax.*;
-
 import java.util.Enumeration;
-import java.util.Hashtable;
 import java.util.Stack;
 import java.util.Vector;
+
+import org.exolab.castor.xml.Namespaces;
+import org.exolab.castor.xml.schema.AttributeDecl;
+import org.exolab.castor.xml.schema.ComplexType;
+import org.exolab.castor.xml.schema.ContentType;
+import org.exolab.castor.xml.schema.ElementDecl;
+import org.exolab.castor.xml.schema.Group;
+import org.exolab.castor.xml.schema.Order;
+import org.exolab.castor.xml.schema.Particle;
+import org.exolab.castor.xml.schema.Schema;
+import org.exolab.castor.xml.schema.SchemaException;
+import org.exolab.castor.xml.schema.Structure;
+import org.exolab.castor.xml.schema.XMLType;
+import org.xml.sax.AttributeList;
+import org.xml.sax.DocumentHandler;
+import org.xml.sax.Locator;
+import org.xml.sax.SAXException;
+import org.xml.sax.SAXParseException;
 
 
 
Index: src/main/org/exolab/castor/xml/dtd/parser/DTDInitialParserTokenManager.java
===================================================================
RCS file: /home/projects/castor/scm/castor/src/main/org/exolab/castor/xml/dtd/parser/DTDInitialParserTokenManager.java,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 DTDInitialParserTokenManager.java
--- src/main/org/exolab/castor/xml/dtd/parser/DTDInitialParserTokenManager.java	3 Mar 2003 07:09:21 -0000	1.1.1.1
+++ src/main/org/exolab/castor/xml/dtd/parser/DTDInitialParserTokenManager.java	14 Apr 2006 09:12:03 -0000
@@ -1,8 +1,5 @@
 /* Generated By:JavaCC: Do not edit this line. DTDInitialParserTokenManager.java */
 package org.exolab.castor.xml.dtd.parser;
-import org.exolab.castor.xml.dtd.DTDException;
-import java.util.Hashtable;
-import java.io.*;
 
 public class DTDInitialParserTokenManager implements DTDInitialParserConstants
 {
Index: src/main/org/exolab/castor/xml/dtd/parser/DTDInitialParser.java
===================================================================
RCS file: /home/projects/castor/scm/castor/src/main/org/exolab/castor/xml/dtd/parser/DTDInitialParser.java,v
retrieving revision 1.2
diff -u -r1.2 DTDInitialParser.java
--- src/main/org/exolab/castor/xml/dtd/parser/DTDInitialParser.java	7 Mar 2005 08:29:37 -0000	1.2
+++ src/main/org/exolab/castor/xml/dtd/parser/DTDInitialParser.java	14 Apr 2006 09:12:03 -0000
@@ -1,10 +1,9 @@
 /* Generated By:JavaCC: Do not edit this line. DTDInitialParser.java */
 package org.exolab.castor.xml.dtd.parser;
 
-import org.exolab.castor.xml.dtd.DTDException;
-
 import java.util.Hashtable;
-import java.io.*;
+
+import org.exolab.castor.xml.dtd.DTDException;
 
 /**
  * Initial XML DTD parser. Searches for <b>parameter entity</b> declarations
Index: src/main/org/exolab/castor/xml/schema/simpletypes/AtomicType.java
===================================================================
RCS file: /home/projects/castor/scm/castor/src/main/org/exolab/castor/xml/schema/simpletypes/AtomicType.java,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 AtomicType.java
--- src/main/org/exolab/castor/xml/schema/simpletypes/AtomicType.java	3 Mar 2003 07:09:43 -0000	1.1.1.1
+++ src/main/org/exolab/castor/xml/schema/simpletypes/AtomicType.java	14 Apr 2006 09:12:06 -0000
@@ -47,10 +47,6 @@
 
 import org.exolab.castor.xml.schema.Facet;
 import org.exolab.castor.xml.schema.SimpleType;
-import org.exolab.castor.xml.schema.Schema;
-
-import java.util.Enumeration;
-import java.util.Vector;
 
 /**
  * The base class for built-in atomic Schema types