OPENJPA-2200 remove unused imports

git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@1536637 13f79535-47bb-0310-9956-ffa450edef68
2013-10-29 10:11:46 +00:00 · 2013-10-29 10:11:46 +00:00 · 08035c10ef
parent f4b2428008
commit 08035c10ef
130 changed files with 2 additions and 251 deletions
--- a/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/EntityTypeView.java
+++ b/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/EntityTypeView.java
@ -15,7 +15,6 @@ package jpa.tools.swing;

 import java.awt.Color;
 import java.awt.Component;
-import java.awt.Dimension;
 import java.awt.GridLayout;
 import java.awt.Point;
 import java.util.List;
--- a/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/InstanceView.java
+++ b/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/InstanceView.java
@ -14,7 +14,6 @@
 package jpa.tools.swing;

 import javax.persistence.metamodel.EntityType;
-import javax.swing.BorderFactory;
 import javax.swing.JTable;

@SuppressWarnings("serial")
--- a/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/MetamodelHelper.java
+++ b/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/MetamodelHelper.java
@ -26,7 +26,6 @@ import java.util.Map;
 import java.util.Set;

 import javax.persistence.metamodel.Attribute;
-import javax.persistence.metamodel.CollectionAttribute;
 import javax.persistence.metamodel.EntityType;
 import javax.persistence.metamodel.MapAttribute;
 import javax.persistence.metamodel.PluralAttribute;
--- a/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/MetamodelView.java
+++ b/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/MetamodelView.java
@ -17,7 +17,6 @@ import java.awt.Color;
 import java.awt.Component;
 import java.awt.FlowLayout;
 import java.awt.Graphics;
-import java.awt.Insets;
 import java.awt.Point;
 import java.awt.Rectangle;
 import java.util.ArrayList;
@ -30,7 +29,6 @@ import javax.persistence.metamodel.EntityType;
 import javax.persistence.metamodel.Metamodel;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.swing.JPanel;
-import javax.swing.SwingConstants;


 /**
--- a/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/PowerPointViewer.java
+++ b/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/PowerPointViewer.java
@ -16,8 +16,6 @@ package jpa.tools.swing;
 import java.awt.BorderLayout;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import java.io.File;
-import java.io.FilenameFilter;
 import java.lang.ref.WeakReference;
 import java.net.URL;
 import java.util.ArrayList;
--- a/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/ScrollingTextPane.java
+++ b/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/ScrollingTextPane.java
@ -24,7 +24,6 @@ import javax.swing.JScrollPane;
 import javax.swing.JTextPane;
 import javax.swing.Timer;
 import javax.swing.UIManager;
-import javax.swing.text.BadLocationException;
 import javax.swing.text.Document;

 /**
--- a/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/SourceCodeViewer.java
+++ b/openjpa-examples/openbooks/src/main/java/jpa/tools/swing/SourceCodeViewer.java
@ -23,12 +23,10 @@ import java.util.LinkedList;

 import javax.swing.Box;
 import javax.swing.DefaultComboBoxModel;
-import javax.swing.JButton;
 import javax.swing.JComboBox;
 import javax.swing.JEditorPane;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
-import javax.swing.JScrollBar;
 import javax.swing.JScrollPane;


--- a/openjpa-examples/openbooks/src/main/java/openbook/client/BuyBookPage.java
+++ b/openjpa-examples/openbooks/src/main/java/openbook/client/BuyBookPage.java
@ -17,7 +17,6 @@ import java.awt.BorderLayout;
 import java.awt.GridLayout;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import java.net.URI;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
@ -42,12 +41,10 @@ import jpa.tools.swing.EntityDataModel;
 import jpa.tools.swing.EntityTable;
 import jpa.tools.swing.EntityTableView;
 import jpa.tools.swing.ErrorDialog;
-import jpa.tools.swing.RoundButton;
 import openbook.client.Demo.ShowCodeAction;
 import openbook.domain.Author;
 import openbook.domain.Book;
 import openbook.domain.Customer;
-import openbook.domain.LineItem;
 import openbook.domain.PurchaseOrder;
 import openbook.domain.ShoppingCart;
 import openbook.server.OpenBookService;
--- a/openjpa-examples/openbooks/src/main/java/openbook/client/Images.java
+++ b/openjpa-examples/openbooks/src/main/java/openbook/client/Images.java
@ -21,12 +21,6 @@ import java.util.Map;
 import javax.swing.Icon;
 import javax.swing.ImageIcon;

-import openbook.client.Demo.SupplyAction;
-import openbook.client.Demo.ViewConfigAction;
-import openbook.client.Demo.ViewDomainAction;
-import openbook.client.Demo.ViewQueryCacheAction;
-import openbook.client.Demo.ViewSourceAction;
-
 /**
 * Utility to load and cache images.
 * Maintains a list of <em>known</em> images.
--- a/openjpa-examples/openbooks/src/main/java/openbook/client/SourceCodeBrowser.java
+++ b/openjpa-examples/openbooks/src/main/java/openbook/client/SourceCodeBrowser.java
@ -23,7 +23,6 @@ import java.awt.Desktop;
 import java.io.File;
 import java.io.IOException;
 import java.net.URI;
-import java.net.URISyntaxException;

 import jpa.tools.swing.SourceCodeViewer;

--- a/openjpa-examples/openbooks/src/main/java/openbook/tools/parser/JavaLexer.java
+++ b/openjpa-examples/openbooks/src/main/java/openbook/tools/parser/JavaLexer.java
@ -20,7 +20,6 @@ package openbook.tools.parser;
 // $ANTLR 3.2 Sep 23, 2009 12:02:23 Java.g 2010-05-15 01:06:38

 import org.antlr.runtime.*;
-import org.antlr.runtime.RecognitionException;

 public class JavaLexer extends Lexer {
    public static final int T__29=29;
--- a/openjpa-integration/daytrader/src/test/java/org/apache/openjpa/integration/daytrader/TradeBuildDB.java
+++ b/openjpa-integration/daytrader/src/test/java/org/apache/openjpa/integration/daytrader/TradeBuildDB.java
@ -16,14 +16,7 @@
 */
 package org.apache.openjpa.integration.daytrader;

-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileReader;
-import java.io.IOException;
 import java.math.BigDecimal;
-import java.util.ArrayList;
-
-import javax.persistence.EntityManagerFactory;

 import org.apache.openjpa.lib.log.Log;

--- a/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/Book.java
+++ b/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/Book.java
@ -24,7 +24,6 @@ import javax.persistence.Entity;
 import javax.persistence.FetchType;
 import javax.persistence.Id;
 import javax.validation.Valid;
-import javax.validation.constraints.Min;
 import javax.validation.constraints.Size;

@Entity(name="Vbook")
--- a/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/ICustomer.java
+++ b/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/ICustomer.java
@ -18,8 +18,6 @@
 */
 package org.apache.openjpa.integration.validation;

-import java.util.*;
-
 public interface ICustomer extends IPerson {

    public void setShippingAddress(IAddress shippingAddress);
--- a/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/TestValidatingLEM.java
+++ b/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/TestValidatingLEM.java
@ -28,7 +28,6 @@ import javax.validation.ValidatorFactory;

 import org.apache.openjpa.conf.OpenJPAConfiguration;
 import org.apache.openjpa.integration.validation.SimpleEntity;
-import org.apache.openjpa.lib.log.Log;
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
 import org.apache.openjpa.persistence.OpenJPAEntityManagerFactorySPI;
 import org.apache.openjpa.persistence.OpenJPAPersistence;
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/conf/JDBCConfigurationImpl.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/conf/JDBCConfigurationImpl.java
@ -49,7 +49,6 @@ import org.apache.openjpa.lib.conf.PluginValue;
 import org.apache.openjpa.lib.conf.ProductDerivations;
 import org.apache.openjpa.lib.conf.StringListValue;
 import org.apache.openjpa.lib.conf.StringValue;
-import org.apache.openjpa.lib.identifier.IdentifierUtil;
 import org.apache.openjpa.lib.jdbc.ConnectionDecorator;
 import org.apache.openjpa.lib.jdbc.DecoratingDataSource;
 import org.apache.openjpa.lib.jdbc.JDBCListener;
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/conf/JDBCProductDerivation.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/conf/JDBCProductDerivation.java
@ -18,18 +18,14 @@
 */
 package org.apache.openjpa.jdbc.conf;

-import java.util.ArrayList;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.HashSet;
-import java.util.List;
 import java.util.Map;
 import java.util.Set;

 import org.apache.openjpa.conf.BrokerFactoryValue;
 import org.apache.openjpa.conf.OpenJPAProductDerivation;
 import org.apache.openjpa.jdbc.kernel.JDBCBrokerFactory;
-import org.apache.openjpa.jdbc.kernel.JDBCFetchConfiguration;
 import org.apache.openjpa.jdbc.sql.MariaDBDictionary;
 import org.apache.openjpa.jdbc.sql.MySQLDictionary;
 import org.apache.openjpa.jdbc.sql.OracleDictionary;
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/identifier/Normalizer.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/identifier/Normalizer.java
@ -19,7 +19,6 @@
 package org.apache.openjpa.jdbc.identifier;

 import org.apache.commons.lang.StringUtils;
-import org.apache.openjpa.jdbc.sql.DBDictionary;
 import org.apache.openjpa.lib.identifier.IdentifierConfiguration;
 import org.apache.openjpa.lib.identifier.IdentifierRule;
 import org.apache.openjpa.lib.identifier.IdentifierUtil;
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/AbstractJDBCSeq.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/AbstractJDBCSeq.java
@ -21,11 +21,8 @@ package org.apache.openjpa.jdbc.kernel;
 import java.sql.Connection;
 import java.sql.SQLException;
 import javax.sql.DataSource;
-import javax.transaction.Transaction;
-import javax.transaction.TransactionManager;

 import org.apache.openjpa.jdbc.conf.JDBCConfiguration;
-import org.apache.openjpa.jdbc.kernel.JDBCStoreManager.RefCountConnection;
 import org.apache.openjpa.jdbc.meta.ClassMapping;
 import org.apache.openjpa.jdbc.schema.SchemaGroup;
 import org.apache.openjpa.jdbc.sql.SQLExceptions;
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/AbstractUpdateManager.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/AbstractUpdateManager.java
@ -43,7 +43,6 @@ import org.apache.openjpa.kernel.PCState;
 import org.apache.openjpa.kernel.StateManagerImpl;
 import org.apache.openjpa.lib.conf.Configurable;
 import org.apache.openjpa.lib.conf.Configuration;
-import org.apache.openjpa.meta.ClassMetaData;
 import org.apache.openjpa.util.ImplHelper;
 import org.apache.openjpa.util.OpenJPAException;
 import org.apache.openjpa.util.OptimisticException;
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/MixedLockManager.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/MixedLockManager.java
@ -19,9 +19,7 @@
 package org.apache.openjpa.jdbc.kernel;

 import java.sql.SQLException;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;

 import org.apache.openjpa.jdbc.identifier.DBIdentifier;
 import org.apache.openjpa.jdbc.meta.ClassMapping;
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/CurrentDate.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/CurrentDate.java
@ -23,7 +23,6 @@ import java.sql.Time;
 import java.sql.Timestamp;
 import java.util.Date;

-import org.apache.openjpa.jdbc.meta.JavaSQLTypes;
 import org.apache.openjpa.jdbc.sql.Result;
 import org.apache.openjpa.jdbc.sql.SQLBuffer;
 import org.apache.openjpa.jdbc.sql.Select;
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/ClassNameDiscriminatorStrategy.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/ClassNameDiscriminatorStrategy.java
@ -24,7 +24,6 @@ import java.sql.ResultSet;
 import java.sql.SQLException;

 import org.apache.commons.lang.StringUtils;
-import org.apache.openjpa.jdbc.conf.JDBCConfiguration;
 import org.apache.openjpa.jdbc.kernel.JDBCFetchConfiguration;
 import org.apache.openjpa.jdbc.kernel.JDBCStore;
 import org.apache.openjpa.jdbc.meta.ClassMapping;
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/ColumnVersionStrategy.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/ColumnVersionStrategy.java
@ -21,7 +21,6 @@ package org.apache.openjpa.jdbc.meta.strats;
 import java.lang.reflect.Array;
 import java.math.BigDecimal;
 import java.sql.SQLException;
-import java.sql.Timestamp;
 import java.util.Comparator;

 import org.apache.openjpa.jdbc.identifier.DBIdentifier;
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/NumberVersionStrategy.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/NumberVersionStrategy.java
@ -21,7 +21,6 @@ package org.apache.openjpa.jdbc.meta.strats;
 import java.util.HashMap;
 import java.util.Map;

-import org.apache.openjpa.jdbc.meta.FieldMapping;
 import org.apache.openjpa.jdbc.schema.Column;
 import org.apache.openjpa.meta.JavaTypes;

--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/RelationCollectionInverseKeyFieldStrategy.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/RelationCollectionInverseKeyFieldStrategy.java
@ -20,7 +20,6 @@ package org.apache.openjpa.jdbc.meta.strats;

 import java.sql.SQLException;

-import org.apache.openjpa.conf.OpenJPAConfiguration;
 import org.apache.openjpa.jdbc.kernel.JDBCFetchConfiguration;
 import org.apache.openjpa.jdbc.kernel.JDBCStore;
 import org.apache.openjpa.jdbc.meta.ClassMapping;
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/RelationCollectionTableFieldStrategy.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/RelationCollectionTableFieldStrategy.java
@ -20,7 +20,6 @@ package org.apache.openjpa.jdbc.meta.strats;

 import java.sql.SQLException;

-import org.apache.openjpa.conf.OpenJPAConfiguration;
 import org.apache.openjpa.jdbc.kernel.JDBCFetchConfiguration;
 import org.apache.openjpa.jdbc.kernel.JDBCStore;
 import org.apache.openjpa.jdbc.meta.ClassMapping;
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/RelationFieldStrategy.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/RelationFieldStrategy.java
@ -37,7 +37,6 @@ import org.apache.openjpa.jdbc.meta.FieldMapping;
 import org.apache.openjpa.jdbc.meta.FieldStrategy;
 import org.apache.openjpa.jdbc.meta.Joinable;
 import org.apache.openjpa.jdbc.meta.MappingInfo;
-import org.apache.openjpa.jdbc.meta.ValueHandler;
 import org.apache.openjpa.jdbc.meta.ValueMapping;
 import org.apache.openjpa.jdbc.meta.ValueMappingImpl;
 import org.apache.openjpa.jdbc.meta.ValueMappingInfo;
@ -55,7 +54,6 @@ import org.apache.openjpa.jdbc.sql.SQLBuffer;
 import org.apache.openjpa.jdbc.sql.Select;
 import org.apache.openjpa.jdbc.sql.SelectExecutor;
 import org.apache.openjpa.jdbc.sql.Union;
-import org.apache.openjpa.kernel.LockManager;
 import org.apache.openjpa.kernel.OpenJPAStateManager;
 import org.apache.openjpa.kernel.StateManagerImpl;
 import org.apache.openjpa.lib.log.Log;
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/RelationMapInverseKeyFieldStrategy.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/RelationMapInverseKeyFieldStrategy.java
@ -22,7 +22,6 @@ import java.sql.SQLException;
 import java.util.Collection;
 import java.util.Map;

-import org.apache.openjpa.conf.OpenJPAConfiguration;
 import org.apache.openjpa.jdbc.kernel.JDBCFetchConfiguration;
 import org.apache.openjpa.jdbc.kernel.JDBCStore;
 import org.apache.openjpa.jdbc.meta.ClassMapping;
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/StateComparisonVersionStrategy.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/StateComparisonVersionStrategy.java
@ -22,7 +22,6 @@ import java.sql.SQLException;
 import java.util.BitSet;
 import java.util.Collection;

-import org.apache.openjpa.jdbc.identifier.Normalizer;
 import org.apache.openjpa.jdbc.kernel.JDBCStore;
 import org.apache.openjpa.jdbc.meta.ClassMapping;
 import org.apache.openjpa.jdbc.meta.FieldMapping;
@ -34,7 +33,6 @@ import org.apache.openjpa.jdbc.sql.RowImpl;
 import org.apache.openjpa.jdbc.sql.RowManager;
 import org.apache.openjpa.kernel.OpenJPAStateManager;
 import org.apache.openjpa.kernel.StoreManager;
-import org.apache.openjpa.lib.identifier.IdentifierConfiguration;
 import org.apache.openjpa.lib.util.Localizer;
 import org.apache.openjpa.util.ArrayStateImage;
 import org.apache.openjpa.util.InternalException;
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/TimestampVersionStrategy.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/TimestampVersionStrategy.java
@ -21,11 +21,9 @@ package org.apache.openjpa.jdbc.meta.strats;
 import java.sql.Timestamp;
 import java.util.Map;
 import java.util.HashMap;
-import java.util.Date;

 import org.apache.openjpa.jdbc.meta.JavaSQLTypes;
 import org.apache.openjpa.jdbc.schema.Column;
-import org.apache.openjpa.util.InternalException;

 /**
 * Uses a timestamp for optimistic versioning.
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/DynamicSchemaFactory.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/DynamicSchemaFactory.java
@ -21,7 +21,6 @@ package org.apache.openjpa.jdbc.schema;
 import java.sql.Types;

 import org.apache.openjpa.jdbc.conf.JDBCConfiguration;
-import org.apache.openjpa.jdbc.identifier.Normalizer;
 import org.apache.openjpa.jdbc.identifier.DBIdentifier;
 import org.apache.openjpa.jdbc.identifier.QualifiedDBIdentifier;
 import org.apache.openjpa.jdbc.sql.DBDictionary;
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/ForeignKey.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/ForeignKey.java
@ -26,8 +26,6 @@ import java.util.LinkedHashMap;
 import java.util.List;

 import org.apache.commons.lang.ObjectUtils;
-import org.apache.commons.lang.StringUtils;
-import org.apache.openjpa.jdbc.identifier.Normalizer;
 import org.apache.openjpa.jdbc.identifier.DBIdentifier;
 import org.apache.openjpa.jdbc.sql.DBDictionary;
 import org.apache.openjpa.lib.log.Log;
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/LazySchemaFactory.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/LazySchemaFactory.java
@ -24,12 +24,10 @@ import java.sql.SQLException;

 import org.apache.openjpa.jdbc.conf.JDBCConfiguration;
 import org.apache.openjpa.jdbc.identifier.DBIdentifier;
-import org.apache.openjpa.jdbc.identifier.DBIdentifierUtil;
 import org.apache.openjpa.jdbc.identifier.QualifiedDBIdentifier;
 import org.apache.openjpa.jdbc.sql.SQLExceptions;
 import org.apache.openjpa.lib.conf.Configurable;
 import org.apache.openjpa.lib.conf.Configuration;
-import org.apache.openjpa.lib.identifier.IdentifierRule;

 /**
 * Factory that uses database metadata to construct the system schema.
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/Sequence.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/Sequence.java
@ -20,10 +20,8 @@ package org.apache.openjpa.jdbc.schema;

 import java.io.File;

-import org.apache.openjpa.jdbc.identifier.Normalizer;
 import org.apache.openjpa.jdbc.identifier.DBIdentifier;
 import org.apache.openjpa.jdbc.identifier.QualifiedDBIdentifier;
-import org.apache.openjpa.lib.identifier.IdentifierUtil;
 import org.apache.openjpa.lib.meta.SourceTracker;

 /**
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/Table.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/Table.java
@ -26,13 +26,10 @@ import java.util.Map;
 import java.util.TreeMap;
 import java.util.LinkedHashMap;

-import org.apache.openjpa.jdbc.identifier.Normalizer;
 import org.apache.openjpa.jdbc.identifier.DBIdentifier;
-import org.apache.openjpa.jdbc.identifier.DBIdentifierUtilImpl;
 import org.apache.openjpa.jdbc.identifier.QualifiedDBIdentifier;
 import org.apache.openjpa.jdbc.identifier.DBIdentifier.DBIdentifierType;
 import org.apache.openjpa.jdbc.sql.DBDictionary;
-import org.apache.openjpa.lib.identifier.IdentifierUtil;
 import org.apache.openjpa.lib.meta.SourceTracker;

 /**
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/TableSchemaFactory.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/TableSchemaFactory.java
@ -30,7 +30,6 @@ import java.sql.Types;

 import org.apache.openjpa.jdbc.conf.JDBCConfiguration;
 import org.apache.openjpa.jdbc.conf.JDBCConfigurationImpl;
-import org.apache.openjpa.jdbc.identifier.Normalizer;
 import org.apache.openjpa.jdbc.identifier.DBIdentifier;
 import org.apache.openjpa.jdbc.identifier.QualifiedDBIdentifier;
 import org.apache.openjpa.jdbc.sql.DBDictionary;
@ -45,7 +44,6 @@ import org.apache.openjpa.lib.util.Localizer;
 import org.apache.openjpa.lib.util.Options;
 import org.apache.openjpa.meta.JavaTypes;
 import org.apache.openjpa.util.GeneralException;
-import serp.util.Strings;

 /**
 * Factory that uses an XML schema definition stored in a database table
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/AccessDictionary.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/AccessDictionary.java
@ -21,7 +21,6 @@ package org.apache.openjpa.jdbc.sql;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;

-import org.apache.openjpa.jdbc.kernel.exps.FilterValue;
 import org.apache.openjpa.jdbc.schema.Column;

 /**
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionary.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionary.java
@ -28,7 +28,6 @@ import java.io.OutputStream;
 import java.io.Reader;
 import java.io.StringReader;
 import java.io.Writer;
-import java.lang.reflect.Method;
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.sql.Array;
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DerbyDictionary.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DerbyDictionary.java
@ -19,12 +19,9 @@
 package org.apache.openjpa.jdbc.sql;

 import java.sql.Connection;
-import java.sql.DatabaseMetaData;
 import java.sql.DriverManager;
 import java.sql.SQLException;
 import java.util.Arrays;
-import java.util.EnumSet;
-import java.util.Set;

 import javax.sql.DataSource;

--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/MariaDBDictionary.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/MariaDBDictionary.java
@ -20,7 +20,6 @@ package org.apache.openjpa.jdbc.sql;

 import java.sql.Connection;
 import java.sql.DatabaseMetaData;
-import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Types;
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SQLExceptions.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SQLExceptions.java
@ -22,8 +22,6 @@ import java.sql.SQLException;
 import java.util.LinkedList;
 import java.util.List;

-import org.apache.openjpa.conf.OpenJPAConfiguration;
-import org.apache.openjpa.kernel.OpenJPAStateManager;
 import org.apache.openjpa.lib.util.Localizer.Message;
 import org.apache.openjpa.util.LockException;
 import org.apache.openjpa.util.OpenJPAException;
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SybaseDictionary.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SybaseDictionary.java
@ -32,7 +32,6 @@ import org.apache.commons.lang.StringUtils;
 import org.apache.openjpa.jdbc.identifier.DBIdentifier.DBIdentifierType;
 import org.apache.openjpa.jdbc.kernel.exps.FilterValue;
 import org.apache.openjpa.jdbc.schema.Column;
-import org.apache.openjpa.jdbc.schema.ForeignKey;
 import org.apache.openjpa.jdbc.schema.Index;
 import org.apache.openjpa.jdbc.schema.PrimaryKey;
 import org.apache.openjpa.jdbc.schema.Table;
--- a/openjpa-jest/src/test/java/org/apache/openjpa/persistence/jest/TestJEST.java
+++ b/openjpa-jest/src/test/java/org/apache/openjpa/persistence/jest/TestJEST.java
@ -29,13 +29,11 @@ import javax.xml.xpath.XPathConstants;
 import javax.xml.xpath.XPathFactory;

 import org.w3c.dom.Document;
-import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;

 import junit.framework.TestCase;

-import com.meterware.httpunit.HTMLElement;
 import com.meterware.httpunit.HttpException;
 import com.meterware.httpunit.HttpUnitOptions;
 import com.meterware.httpunit.WebResponse;
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/abstractstore/AbstractStoreBrokerFactory.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/abstractstore/AbstractStoreBrokerFactory.java
@ -20,7 +20,6 @@ package org.apache.openjpa.abstractstore;

 import java.security.AccessController;
 import java.util.Map;
-import java.util.Properties;

 import org.apache.openjpa.conf.OpenJPAConfiguration;
 import org.apache.openjpa.kernel.AbstractBrokerFactory;
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/abstractstore/AbstractStoreManager.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/abstractstore/AbstractStoreManager.java
@ -22,7 +22,6 @@ import java.util.BitSet;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.LinkedList;

 import org.apache.openjpa.conf.OpenJPAConfiguration;
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/conf/BrokerFactoryValue.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/conf/BrokerFactoryValue.java
@ -20,7 +20,6 @@ package org.apache.openjpa.conf;

 import java.util.HashMap;
 import java.util.Map;
-import java.util.Iterator;

 import org.apache.openjpa.abstractstore.AbstractStoreBrokerFactory;
 import org.apache.openjpa.kernel.BrokerFactory;
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/conf/Specification.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/conf/Specification.java
@ -18,11 +18,7 @@
 */
 package org.apache.openjpa.conf;

-import java.text.MessageFormat;
-
 import org.apache.commons.lang.StringUtils;
-import org.apache.openjpa.lib.conf.Configurable;
-import org.apache.openjpa.lib.conf.Configuration;
 import org.apache.openjpa.lib.util.Localizer;
 import org.apache.openjpa.util.UserException;

--- a/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/AbstractDataCache.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/AbstractDataCache.java
@ -41,8 +41,6 @@ import org.apache.openjpa.lib.log.Log;
 import org.apache.openjpa.lib.util.Localizer;
 import org.apache.openjpa.lib.util.concurrent.AbstractConcurrentEventManager;
 import org.apache.openjpa.util.GeneralException;
-import org.apache.openjpa.util.InternalException;
-import org.apache.openjpa.util.OpenJPAId;

 import serp.util.Strings;

--- a/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/CacheStatistics.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/CacheStatistics.java
@ -20,12 +20,9 @@ package org.apache.openjpa.datacache;

 import java.io.Serializable;
 import java.util.Date;
-import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;

-import org.apache.openjpa.util.OpenJPAId;
-
 /**
 * Counts number of read/write requests and hit ratio for a cache in total and
 * per-class basis.
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/ConcurrentDataCache.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/ConcurrentDataCache.java
@ -18,8 +18,6 @@
 */
 package org.apache.openjpa.datacache;

-import java.util.List;
-
 import org.apache.openjpa.event.RemoteCommitListener;
 import org.apache.openjpa.lib.util.Localizer;
 import org.apache.openjpa.util.CacheMap;
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/QueryCacheStoreQuery.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/QueryCacheStoreQuery.java
@ -22,7 +22,6 @@ import java.io.ObjectStreamException;
 import java.io.Serializable;
 import java.util.AbstractList;
 import java.util.ArrayList;
-import java.util.BitSet;
 import java.util.Collections;
 import java.util.Date;
 import java.util.List;
@ -33,7 +32,6 @@ import java.util.TreeMap;

 import org.apache.commons.collections.map.LinkedMap;
 import org.apache.openjpa.datacache.AbstractQueryCache.EvictPolicy;
-import org.apache.openjpa.kernel.DelegatingStoreManager;
 import org.apache.openjpa.kernel.FetchConfiguration;
 import org.apache.openjpa.kernel.LockLevels;
 import org.apache.openjpa.kernel.OpenJPAStateManager;
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/ee/AbstractManagedRuntime.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/ee/AbstractManagedRuntime.java
@ -17,7 +17,6 @@

 package org.apache.openjpa.ee;

-import javax.transaction.InvalidTransactionException;
 import javax.transaction.NotSupportedException;
 import javax.transaction.SystemException;
 import javax.transaction.Transaction;
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/ApplicationIdTool.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/ApplicationIdTool.java
@ -46,7 +46,6 @@ import org.apache.openjpa.lib.meta.ClassArgParser;
 import org.apache.openjpa.lib.util.CodeFormat;
 import org.apache.openjpa.lib.util.Files;
 import org.apache.openjpa.lib.util.J2DoPrivHelper;
-import org.apache.openjpa.lib.util.JavaVersions;
 import org.apache.openjpa.lib.util.Localizer;
 import org.apache.openjpa.lib.util.Options;
 import org.apache.openjpa.meta.AccessCode;
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/CodeGenerator.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/CodeGenerator.java
@ -27,7 +27,6 @@ import java.util.TreeSet;
 import java.util.List;

 import org.apache.commons.lang.StringUtils;
-import org.apache.commons.lang.WordUtils;
 import org.apache.openjpa.conf.OpenJPAConfiguration;
 import org.apache.openjpa.lib.util.CodeFormat;
 import org.apache.openjpa.lib.util.Files;
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/InstrumentationFactory.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/InstrumentationFactory.java
@ -38,7 +38,6 @@ import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;

 import org.apache.openjpa.lib.log.Log;
-import org.apache.openjpa.lib.util.J2DoPrivHelper;
 import org.apache.openjpa.lib.util.JavaVendors;
 import org.apache.openjpa.lib.util.JavaVersions;
 import org.apache.openjpa.lib.util.Localizer;
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/PCRegistry.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/PCRegistry.java
@ -20,8 +20,6 @@ package org.apache.openjpa.enhance;

 import java.util.Collection;
 import java.util.Collections;
-import java.util.LinkedHashSet;
-import java.util.LinkedList;
 import java.util.Map;

 import org.apache.openjpa.lib.util.Localizer;
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/PCSubclassValidator.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/PCSubclassValidator.java
@ -18,7 +18,6 @@
 */
 package org.apache.openjpa.enhance;

-import java.lang.reflect.Field;
 import java.lang.reflect.Member;
 import java.lang.reflect.Modifier;
 import java.lang.reflect.Constructor;
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/instrumentation/AbstractDataCacheInstrument.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/instrumentation/AbstractDataCacheInstrument.java
@ -18,18 +18,13 @@
 */
 package org.apache.openjpa.instrumentation;

-import java.util.Collections;
 import java.util.Date;
-import java.util.HashSet;
-import java.util.List;
 import java.util.Map;
-import java.util.Set;

 import org.apache.openjpa.datacache.CacheStatistics;
 import org.apache.openjpa.datacache.CacheStatisticsSPI;
 import org.apache.openjpa.datacache.DataCache;
 import org.apache.openjpa.datacache.DataCacheManager;
-import org.apache.openjpa.datacache.DataCacheManagerImpl;
 import org.apache.openjpa.lib.instrumentation.AbstractInstrument;
 import org.apache.openjpa.lib.instrumentation.InstrumentationLevel;

--- a/openjpa-kernel/src/main/java/org/apache/openjpa/instrumentation/DataCacheInstrument.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/instrumentation/DataCacheInstrument.java
@ -21,9 +21,6 @@ package org.apache.openjpa.instrumentation;
 import java.util.Date;
 import java.util.Map;

-import org.apache.openjpa.datacache.CacheStatistics;
-import org.apache.openjpa.datacache.DataCacheManager;
-
 /**
 * Interface for providing instrumented data cache metrics and operations.
 */
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/AbstractBrokerFactory.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/AbstractBrokerFactory.java
@ -40,7 +40,6 @@ import javax.transaction.TransactionManager;

 import org.apache.commons.collections.set.MapBackedSet;
 import org.apache.commons.lang.StringUtils;
-import org.apache.openjpa.kernel.AuditManager;
 import org.apache.openjpa.audit.Auditor;
 import org.apache.openjpa.conf.BrokerValue;
 import org.apache.openjpa.conf.OpenJPAConfiguration;
@ -60,7 +59,6 @@ import org.apache.openjpa.lib.instrumentation.InstrumentationLevel;
 import org.apache.openjpa.lib.log.Log;
 import org.apache.openjpa.lib.util.J2DoPrivHelper;
 import org.apache.openjpa.lib.util.Localizer;
-import org.apache.openjpa.lib.util.Options;
 import org.apache.openjpa.lib.util.concurrent.ConcurrentReferenceHashSet;
 import org.apache.openjpa.meta.MetaDataModes;
 import org.apache.openjpa.meta.MetaDataRepository;
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/BrokerImpl.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/BrokerImpl.java
@ -45,7 +45,6 @@ import javax.transaction.Status;
 import javax.transaction.Synchronization;

 import org.apache.commons.collections.iterators.IteratorChain;
-import org.apache.commons.collections.map.IdentityMap;
 import org.apache.commons.collections.map.LinkedMap;
 import org.apache.commons.collections.set.MapBackedSet;
 import org.apache.commons.lang.StringUtils;
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DelegatingBrokerFactory.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DelegatingBrokerFactory.java
@ -19,7 +19,6 @@
 package org.apache.openjpa.kernel;

 import java.util.Map;
-import java.util.Properties;
 import java.util.Set;

 import org.apache.openjpa.conf.OpenJPAConfiguration;
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DetachedStateManager.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DetachedStateManager.java
@ -28,11 +28,9 @@ import java.util.Map;
 import org.apache.openjpa.conf.Compatibility;
 import org.apache.openjpa.enhance.PersistenceCapable;
 import org.apache.openjpa.enhance.StateManager;
-import org.apache.openjpa.event.LifecycleEventManager;
 import org.apache.openjpa.lib.util.Localizer;
 import java.util.concurrent.locks.ReentrantLock;
 import org.apache.openjpa.meta.ClassMetaData;
-import org.apache.openjpa.meta.FetchGroup;
 import org.apache.openjpa.meta.FieldMetaData;
 import org.apache.openjpa.meta.JavaTypes;
 import org.apache.openjpa.meta.ValueMetaData;
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DetachedValueStateManager.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DetachedValueStateManager.java
@ -28,7 +28,6 @@ import org.apache.openjpa.lib.util.Localizer;
 import org.apache.openjpa.meta.ClassMetaData;
 import org.apache.openjpa.meta.FieldMetaData;
 import org.apache.openjpa.meta.JavaTypes;
-import org.apache.openjpa.meta.ValueMetaData;
 import org.apache.openjpa.util.InternalException;
 import org.apache.openjpa.util.UnsupportedException;
 import org.apache.openjpa.util.ImplHelper;
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/MethodStoreQuery.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/MethodStoreQuery.java
@ -29,7 +29,6 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;

-import org.apache.commons.collections.map.LinkedMap;
 import org.apache.commons.lang.StringUtils;
 import org.apache.openjpa.lib.rop.ListResultObjectProvider;
 import org.apache.openjpa.lib.rop.RangeResultObjectProvider;
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/OpenJPAStateManager.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/OpenJPAStateManager.java
@ -25,7 +25,6 @@ import org.apache.openjpa.enhance.PersistenceCapable;
 import org.apache.openjpa.enhance.StateManager;
 import org.apache.openjpa.meta.ClassMetaData;
 import org.apache.openjpa.meta.FieldMetaData;
-import org.apache.openjpa.meta.ValueMetaData;
 import org.apache.openjpa.util.Proxy;

 /**
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PCDataImpl.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PCDataImpl.java
@ -19,7 +19,6 @@
 package org.apache.openjpa.kernel;

 import java.util.BitSet;
-import java.util.Map;

 import org.apache.openjpa.datacache.DataCache;
 import org.apache.openjpa.meta.ClassMetaData;
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PreparedQueryCache.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PreparedQueryCache.java
@ -18,7 +18,6 @@
 */
 package org.apache.openjpa.kernel;

-import java.io.Serializable;
 import java.util.List;
 import java.util.Map;

--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/StateManagerImpl.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/StateManagerImpl.java
@ -34,7 +34,6 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
-import java.util.Set;
 import java.util.TimeZone;
 import java.util.concurrent.locks.ReentrantLock;

--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Type.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Type.java
@ -18,9 +18,6 @@
 */
 package org.apache.openjpa.kernel.exps;

-import java.util.Collection;
-import java.util.Map;
-
 import org.apache.openjpa.kernel.StoreContext;


--- a/openjpa-kernel/src/main/java/org/apache/openjpa/meta/AbstractMetaDataDefaults.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/meta/AbstractMetaDataDefaults.java
@ -22,17 +22,13 @@ import java.lang.reflect.Field;
 import java.lang.reflect.Member;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
-import java.security.AccessController;
 import java.security.PrivilegedActionException;
 import java.util.ArrayList;
 import java.util.List;

 import org.apache.openjpa.enhance.PCRegistry;
-import org.apache.openjpa.enhance.Reflection;
 import org.apache.openjpa.lib.log.Log;
-import org.apache.openjpa.lib.util.J2DoPrivHelper;
 import org.apache.openjpa.lib.util.Localizer;
-import org.apache.openjpa.util.InternalException;
 import org.apache.openjpa.util.OpenJPAException;
 import org.apache.openjpa.util.UserException;

--- a/openjpa-kernel/src/main/java/org/apache/openjpa/meta/ProxySetupStateManager.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/meta/ProxySetupStateManager.java
@ -19,7 +19,6 @@
 package org.apache.openjpa.meta;

 import java.io.ObjectOutput;
-import java.lang.reflect.Modifier;
 import java.util.Calendar;
 import java.util.SortedMap;
 import java.util.SortedSet;
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/meta/QueryMetaData.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/meta/QueryMetaData.java
@ -25,7 +25,6 @@ import java.util.List;

 import org.apache.commons.lang.StringUtils;
 import org.apache.openjpa.kernel.Query;
-import org.apache.openjpa.kernel.QueryLanguages;
 import org.apache.openjpa.kernel.jpql.JPQLParser;
 import org.apache.openjpa.lib.meta.SourceTracker;
 import org.apache.openjpa.lib.util.OrderedMap;
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/util/DelayedLinkedHashSetProxy.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/util/DelayedLinkedHashSetProxy.java
@ -21,7 +21,6 @@ package org.apache.openjpa.util;
 import java.io.ObjectStreamException;
 import java.util.Collection;
 import java.util.Comparator;
-import java.util.HashSet;
 import java.util.Iterator;
 import java.util.LinkedHashSet;

--- a/openjpa-kernel/src/main/java/org/apache/openjpa/util/GeneratedClasses.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/util/GeneratedClasses.java
@ -19,11 +19,8 @@
 package org.apache.openjpa.util;

 import java.security.AccessController;
-import java.security.PrivilegedActionException;
-import java.lang.reflect.Constructor;

 import org.apache.openjpa.lib.util.J2DoPrivHelper;
-import org.apache.openjpa.lib.util.Localizer;
 import serp.bytecode.BCClass;
 import serp.bytecode.BCClassLoader;

--- a/openjpa-kernel/src/test/java/org/apache/openjpa/util/TestProxyManager.java
+++ b/openjpa-kernel/src/test/java/org/apache/openjpa/util/TestProxyManager.java
@ -28,7 +28,6 @@ import java.util.AbstractSet;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.Comparator;
 import java.util.Date;
 import java.util.GregorianCalendar;
--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/Configurations.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/Configurations.java
@ -21,7 +21,6 @@ package org.apache.openjpa.lib.conf;
 import java.io.File;
 import java.security.AccessController;
 import java.security.PrivilegedActionException;
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashMap;
--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/ProductDerivations.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/ProductDerivations.java
@ -34,7 +34,6 @@ import java.util.TreeSet;

 import org.apache.commons.lang.StringUtils;
 import org.apache.openjpa.lib.util.J2DoPrivHelper;
-import org.apache.openjpa.lib.util.JavaVersions;
 import org.apache.openjpa.lib.util.Localizer;
 import org.apache.openjpa.lib.util.MultiClassLoader;
 import org.apache.openjpa.lib.util.Services;
--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/identifier/IdentifierRule.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/identifier/IdentifierRule.java
@ -21,7 +21,6 @@ package org.apache.openjpa.lib.identifier;
 import java.util.HashSet;
 import java.util.Set;

-import org.apache.commons.lang.ArrayUtils;
 import org.apache.commons.lang.CharUtils;
 import org.apache.commons.lang.StringUtils;

--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/rop/AbstractResultList.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/rop/AbstractResultList.java
@ -19,7 +19,6 @@
 package org.apache.openjpa.lib.rop;

 import java.util.Collection;
-import java.util.List;
 import java.util.NoSuchElementException;

 import org.apache.openjpa.lib.util.Localizer;
--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/Files.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/Files.java
@ -30,7 +30,6 @@ import java.io.IOException;
 import java.io.OutputStream;
 import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
-import java.io.UnsupportedEncodingException;
 import java.io.Writer;
 import java.net.URL;
 import java.net.URLDecoder;
--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/StringDistance.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/StringDistance.java
@ -20,7 +20,6 @@ package org.apache.openjpa.lib.util;

 import java.util.Arrays;
 import java.util.Collection;
-import java.util.Iterator;

 /**
 * Utilities for calculating string distance.
--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/TemporaryClassLoader.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/TemporaryClassLoader.java
@ -21,7 +21,6 @@ package org.apache.openjpa.lib.util;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.security.AccessController;

 import serp.bytecode.lowlevel.ConstantPoolTable;

--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/concurrent/NullSafeConcurrentHashMap.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/concurrent/NullSafeConcurrentHashMap.java
@ -27,7 +27,6 @@ import java.util.Iterator;
 import java.util.AbstractCollection;
 import java.util.Random;
 import java.util.HashSet;
-import java.util.TreeSet;

 import org.apache.commons.collections.set.MapBackedSet;

--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/concurrent/SizedConcurrentHashMap.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/concurrent/SizedConcurrentHashMap.java
@ -19,9 +19,6 @@
 package org.apache.openjpa.lib.util.concurrent;

 import java.util.concurrent.ConcurrentHashMap;
-import java.util.Map;
-import java.util.Iterator;
-import java.util.Set;
 import java.io.ObjectOutputStream;
 import java.io.IOException;
 import java.io.ObjectInputStream;
--- a/openjpa-lib/src/test/java/org/apache/openjpa/lib/test/AbstractTestCase.java
+++ b/openjpa-lib/src/test/java/org/apache/openjpa/lib/test/AbstractTestCase.java
@ -32,9 +32,6 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
-import java.io.PrintStream;
-import java.io.PrintWriter;
-import java.io.StringWriter;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.math.BigDecimal;
--- a/openjpa-lib/src/test/java/org/apache/openjpa/lib/util/TestUUIDGenerator.java
+++ b/openjpa-lib/src/test/java/org/apache/openjpa/lib/util/TestUUIDGenerator.java
@ -20,7 +20,6 @@ package org.apache.openjpa.lib.util;

 import java.lang.reflect.Field;
 import java.security.AccessController;
-import java.security.PrivilegedAction;
 import java.security.PrivilegedExceptionAction;
 import java.util.HashSet;
 import java.util.Set;
--- a/openjpa-lib/src/test/java/org/apache/openjpa/lib/util/concurrent/TestConcurrentMap.java
+++ b/openjpa-lib/src/test/java/org/apache/openjpa/lib/util/concurrent/TestConcurrentMap.java
@ -25,7 +25,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.TreeSet;
-import java.io.IOException;

 import org.apache.openjpa.lib.util.ReferenceMap;
 import org.apache.openjpa.lib.test.AbstractTestCase;
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/audit/TestBeginEventOnTransactionListener.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/audit/TestBeginEventOnTransactionListener.java
@ -18,7 +18,6 @@
 */
 package org.apache.openjpa.audit;

-import junit.framework.TestCase;
 import org.apache.openjpa.ee.ManagedRuntime;
 import org.apache.openjpa.kernel.Audited;
 import org.apache.openjpa.kernel.Broker;
@ -28,7 +27,6 @@ import org.apache.openjpa.persistence.test.SingleEMFTestCase;

 import javax.persistence.EntityManager;
 import javax.persistence.EntityManagerFactory;
-import javax.persistence.Persistence;
 import java.util.Collection;

 public class TestBeginEventOnTransactionListener extends SingleEMFTestCase {
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/audit/X.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/audit/X.java
@ -21,7 +21,6 @@ package org.apache.openjpa.audit;
 import java.util.concurrent.atomic.AtomicLong;

 import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
 import javax.persistence.Id;


--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/meta/strats/AbstractLobTest.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/meta/strats/AbstractLobTest.java
@ -31,7 +31,6 @@ import org.apache.commons.lang.StringUtils;
 import org.apache.openjpa.conf.OpenJPAConfiguration;
 import org.apache.openjpa.datacache.DataCachePCData;
 import org.apache.openjpa.jdbc.sql.DB2Dictionary;
-import org.apache.openjpa.jdbc.sql.MariaDBDictionary;
 import org.apache.openjpa.jdbc.sql.MySQLDictionary;
 import org.apache.openjpa.jdbc.sql.OracleDictionary;
 import org.apache.openjpa.jdbc.sql.SQLServerDictionary;
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/Part.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/apps/Part.java
@ -26,9 +26,6 @@ import javax.persistence.ManyToOne;
 import javax.persistence.MapsId;
 import javax.persistence.Table;

-import org.apache.openjpa.persistence.jdbc.ForeignKey;
-import org.apache.openjpa.persistence.jdbc.ForeignKeyAction;
-
@Entity
@Table(name="MPTZZS")
 public class Part implements Serializable {
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/mappedsuperclass/DerivedEntityFromMappedSuperWithoutId.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/mappedsuperclass/DerivedEntityFromMappedSuperWithoutId.java
@ -20,7 +20,6 @@ package org.apache.openjpa.persistence.inheritance.mappedsuperclass;

 import javax.persistence.Entity;
 import javax.persistence.Id;
-import javax.persistence.MappedSuperclass;
 import javax.persistence.Version;

 /**
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/mappingApp/SQLMapOrder.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/mappingApp/SQLMapOrder.java
@ -21,10 +21,7 @@ package org.apache.openjpa.persistence.jdbc.common.apps.mappingApp;
 import java.io.Serializable;

 import javax.persistence.*;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.OneToOne;
-import javax.persistence.Table;
+
 /** Exemplifies a mapping that is overwritten in orm.xml file.
 * 
 * @author <A HREF="mailto:pinaki.poddar@gmail.com>Pinaki Poddar</A>
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/mappingApp/SQLMapPerson.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/common/apps/mappingApp/SQLMapPerson.java
@ -21,10 +21,6 @@ package org.apache.openjpa.persistence.jdbc.common.apps.mappingApp;
 import java.io.Serializable;

 import javax.persistence.*;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.OneToOne;
-import javax.persistence.Table;

 /** 
 * @author ppoddar
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/kernel/TestEmbeddedPessimisticLocking.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/kernel/TestEmbeddedPessimisticLocking.java
@ -21,7 +21,6 @@ package org.apache.openjpa.persistence.jdbc.kernel;

 import java.util.*;

-import org.apache.openjpa.jdbc.conf.*;
 import org.apache.openjpa.persistence.jdbc.common.apps.*;


--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/kernel/TestPagingResultObjectProvider.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/kernel/TestPagingResultObjectProvider.java
@ -19,7 +19,7 @@
 package org.apache.openjpa.persistence.jdbc.kernel;

 import java.util.*;
-import org.apache.openjpa.jdbc.conf.*;
+
 import org.apache.openjpa.jdbc.sql.*;
 import org.apache.openjpa.persistence.jdbc.common.apps.*;

--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestEagerOuterToManyJoins.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestEagerOuterToManyJoins.java
@ -38,7 +38,6 @@ import org.apache.openjpa.persistence.jdbc.common.apps.*;


 import org.apache.openjpa.persistence.OpenJPAEntityManager;
-import org.apache.openjpa.persistence.jdbc.common.apps.EagerOuterJoinPC;


 public class TestEagerOuterToManyJoins
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestIrregularJoins.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/TestIrregularJoins.java
@ -33,8 +33,6 @@ import org.apache.openjpa.persistence.jdbc.common.apps.*;


 import org.apache.openjpa.persistence.OpenJPAEntityManager;
-import org.apache.openjpa.persistence.jdbc.common.apps.NonPKJoinPC2;
-


 public class TestIrregularJoins
--- a/Show More
+++ b/Show More