ran 'orgainize imports' to get rid of 100 or "unused imports" .... please don't make me do it again :)

77 files changed, 352 insertions, 251 deletions

diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/WSITag.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/WSITag.java
index c4638a182..1fb343339 100644
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/WSITag.java
+++ b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/WSITag.java
@@ -10,10 +10,10 @@
  *******************************************************************************/
 package org.eclipse.wst.wsi.internal.core;
 
-import org.eclipse.wst.wsi.internal.core.xml.XMLTags;
-
 import javax.xml.namespace.QName;
 
+import org.eclipse.wst.wsi.internal.core.xml.XMLTags;
+
 /**
  * WS-I constants.  
  *  
diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/Analyzer.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/Analyzer.java
index 4d5e46cc8..80e3c1ce1 100644
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/Analyzer.java
+++ b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/Analyzer.java
@@ -14,6 +14,11 @@
  */
 package org.eclipse.wst.wsi.internal.core.analyzer;
 
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.util.List;
+import java.util.Vector;
+
 import org.eclipse.wst.wsi.internal.core.ToolInfo;
 import org.eclipse.wst.wsi.internal.core.WSIConstants;
 import org.eclipse.wst.wsi.internal.core.WSIException;
@@ -26,11 +31,6 @@ import org.eclipse.wst.wsi.internal.core.report.Reporter;
 import org.eclipse.wst.wsi.internal.core.util.MessageList;
 import org.eclipse.wst.wsi.internal.core.util.TestUtils;
 
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.util.List;
-import java.util.Vector;
-
 /**
  * The Analyzer will process all Profile conformance functions.
  * This class should be sub-classed for each profile.
diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/EnvironmentInfo.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/EnvironmentInfo.java
index 8f35c3447..3f3eb4d1c 100644
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/EnvironmentInfo.java
+++ b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/EnvironmentInfo.java
@@ -10,11 +10,12 @@
  *******************************************************************************/
 package org.eclipse.wst.wsi.internal.core.analyzer;
 
+import java.io.PrintWriter;
+import java.io.StringWriter;
+
 import org.eclipse.wst.wsi.internal.core.WSIConstants;
 import org.eclipse.wst.wsi.internal.core.util.XMLInfo;
 
-import java.io.*;
-
 /**
  * This class maintains the Environment information.
  * 
diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/config/AnalyzerConfigReader.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/config/AnalyzerConfigReader.java
index d92011560..7c364fb4e 100644
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/config/AnalyzerConfigReader.java
+++ b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/config/AnalyzerConfigReader.java
@@ -10,12 +10,12 @@
  *******************************************************************************/
 package org.eclipse.wst.wsi.internal.core.analyzer.config;
 
+import java.io.Reader;
+
 import org.eclipse.wst.wsi.internal.core.WSIException;
 import org.eclipse.wst.wsi.internal.core.document.DocumentReader;
 import org.eclipse.wst.wsi.internal.core.util.MessageList;
 
-import java.io.Reader;
-
 
 /**
  * Defines the interface used to read the analyzer config documents.
diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/config/UDDIReference.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/config/UDDIReference.java
index f549cb264..2a3bcd215 100644
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/config/UDDIReference.java
+++ b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/config/UDDIReference.java
@@ -10,11 +10,11 @@
  *******************************************************************************/
 package org.eclipse.wst.wsi.internal.core.analyzer.config;
 
+import javax.xml.namespace.QName;
+
 import org.eclipse.wst.wsi.internal.core.WSIConstants;
 import org.eclipse.wst.wsi.internal.core.document.DocumentElement;
 
-import javax.xml.namespace.QName;
-
 /**
  * The interface for a reference to a discovery artifact.  
  * 
diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/config/WSDLElement.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/config/WSDLElement.java
index ad0870f89..2be33e22c 100644
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/config/WSDLElement.java
+++ b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/config/WSDLElement.java
@@ -10,11 +10,11 @@
  *******************************************************************************/
 package org.eclipse.wst.wsi.internal.core.analyzer.config;
 
+import javax.xml.namespace.QName;
+
 import org.eclipse.wst.wsi.internal.core.WSIConstants;
 import org.eclipse.wst.wsi.internal.core.document.DocumentElement;
 
-import javax.xml.namespace.QName;
-
 /**
  * The base interface for WSDL definitions. 
  * 
diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/config/WSDLReference.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/config/WSDLReference.java
index 2bf3dcc66..ec550c249 100644
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/config/WSDLReference.java
+++ b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/config/WSDLReference.java
@@ -10,11 +10,11 @@
  *******************************************************************************/
 package org.eclipse.wst.wsi.internal.core.analyzer.config;
 
+import javax.xml.namespace.QName;
+
 import org.eclipse.wst.wsi.internal.core.WSIConstants;
 import org.eclipse.wst.wsi.internal.core.document.DocumentElement;
 
-import javax.xml.namespace.QName;
-
 /**
  * The interface for a reference to a description artifact.  
  * 
diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/config/impl/AnalyzerConfigImpl.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/config/impl/AnalyzerConfigImpl.java
index 531cead21..95ee74a0d 100644
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/config/impl/AnalyzerConfigImpl.java
+++ b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/config/impl/AnalyzerConfigImpl.java
@@ -10,6 +10,10 @@
  *******************************************************************************/
 package org.eclipse.wst.wsi.internal.core.analyzer.config.impl;
 
+import java.io.File;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+
 import org.eclipse.wst.wsi.internal.core.WSIConstants;
 import org.eclipse.wst.wsi.internal.core.WSIException;
 import org.eclipse.wst.wsi.internal.core.analyzer.Analyzer;
@@ -25,10 +29,6 @@ import org.eclipse.wst.wsi.internal.core.common.impl.AddStyleSheetImpl;
 import org.eclipse.wst.wsi.internal.core.util.MessageList;
 import org.eclipse.wst.wsi.internal.core.util.Utils;
 
-import java.io.File;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-
 /**
  * This class is an implementation of the analyzer configuration file interface.
  * 
diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/config/impl/AssertionResultsOptionImpl.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/config/impl/AssertionResultsOptionImpl.java
index 86129fa7d..fbe3d0f74 100644
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/config/impl/AssertionResultsOptionImpl.java
+++ b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/config/impl/AssertionResultsOptionImpl.java
@@ -11,12 +11,13 @@
  *******************************************************************************/
 package org.eclipse.wst.wsi.internal.core.analyzer.config.impl;
 
+import java.io.PrintWriter;
+import java.io.StringWriter;
+
 import org.eclipse.wst.wsi.internal.core.WSIConstants;
 import org.eclipse.wst.wsi.internal.core.analyzer.config.AssertionResultType;
 import org.eclipse.wst.wsi.internal.core.analyzer.config.AssertionResultsOption;
 
-import java.io.*;
-
 /**
  * This class contains the assertion results option definition.
  * 
diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/config/impl/WSDLElementImpl.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/config/impl/WSDLElementImpl.java
index b983011ad..ff14b85d9 100644
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/config/impl/WSDLElementImpl.java
+++ b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/config/impl/WSDLElementImpl.java
@@ -10,13 +10,14 @@
  *******************************************************************************/
 package org.eclipse.wst.wsi.internal.core.analyzer.config.impl;
 
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.analyzer.config.WSDLElement;
-import org.eclipse.wst.wsi.internal.core.util.EntryType;
+import java.io.PrintWriter;
+import java.io.StringWriter;
 
 import javax.xml.namespace.QName;
 
-import java.io.*;
+import org.eclipse.wst.wsi.internal.core.WSIConstants;
+import org.eclipse.wst.wsi.internal.core.analyzer.config.WSDLElement;
+import org.eclipse.wst.wsi.internal.core.util.EntryType;
 
 /**
  * The implementation for WSDL definitions. 
diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/config/impl/WSDLReferenceImpl.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/config/impl/WSDLReferenceImpl.java
index 63ac41f48..64bff4363 100644
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/config/impl/WSDLReferenceImpl.java
+++ b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/analyzer/config/impl/WSDLReferenceImpl.java
@@ -10,13 +10,14 @@
  *******************************************************************************/
 package org.eclipse.wst.wsi.internal.core.analyzer.config.impl;
 
+import java.io.PrintWriter;
+import java.io.StringWriter;
+
 import org.eclipse.wst.wsi.internal.core.WSIConstants;
 import org.eclipse.wst.wsi.internal.core.analyzer.config.WSDLElement;
 import org.eclipse.wst.wsi.internal.core.analyzer.config.WSDLReference;
 import org.eclipse.wst.wsi.internal.core.xml.XMLUtils;
 
-import java.io.*;
-
 /**
  * The implementation for a reference to a description artifact.  
  * 
diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/common/impl/AddStyleSheetImpl.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/common/impl/AddStyleSheetImpl.java
index 5479fda1f..9965d1696 100644
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/common/impl/AddStyleSheetImpl.java
+++ b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/common/impl/AddStyleSheetImpl.java
@@ -10,12 +10,13 @@
  *******************************************************************************/
 package org.eclipse.wst.wsi.internal.core.common.impl;
 
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.util.TreeMap;
+
 import org.eclipse.wst.wsi.internal.core.WSIConstants;
 import org.eclipse.wst.wsi.internal.core.common.AddStyleSheet;
 
-import java.io.*;
-import java.util.TreeMap;
-
 /**
  * The implementation for AddStyleSheet element. 
  * 
diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/document/DocumentWriter.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/document/DocumentWriter.java
index 19c3908c7..9c8892654 100644
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/document/DocumentWriter.java
+++ b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/document/DocumentWriter.java
@@ -10,13 +10,13 @@
  *******************************************************************************/
 package org.eclipse.wst.wsi.internal.core.document;
 
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.w3c.dom.Document;
-
 import java.io.IOException;
 import java.io.Reader;
 import java.io.Writer;
 
+import org.eclipse.wst.wsi.internal.core.WSIException;
+import org.w3c.dom.Document;
+
 /**
  * Defines the interface used to write the Conformance XML documents.
  * 
diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/document/impl/DocumentWriterImpl.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/document/impl/DocumentWriterImpl.java
index 9559e2120..a61e6d1f0 100644
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/document/impl/DocumentWriterImpl.java
+++ b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/document/impl/DocumentWriterImpl.java
@@ -11,12 +11,20 @@
  *******************************************************************************/
 package org.eclipse.wst.wsi.internal.core.document.impl;
 
+import java.io.BufferedReader;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStreamWriter;
+import java.io.PrintWriter;
+import java.io.Reader;
+import java.io.UnsupportedEncodingException;
+import java.io.Writer;
+
 import org.eclipse.wst.wsi.internal.core.WSIException;
 import org.eclipse.wst.wsi.internal.core.document.DocumentWriter;
 import org.w3c.dom.Document;
 
-import java.io.*;
-
 /**
  * Defines the implementation used to write the Conformance XML 
  * documents.
diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/log/Log.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/log/Log.java
index 64eb9dc20..4c586b7e9 100644
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/log/Log.java
+++ b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/log/Log.java
@@ -10,13 +10,13 @@
  *******************************************************************************/
 package org.eclipse.wst.wsi.internal.core.log;
 
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.document.WSIDocument;
+import java.util.Vector;
 
 import javax.xml.namespace.QName;
 
-import java.util.*;
+import org.eclipse.wst.wsi.internal.core.WSIConstants;
+import org.eclipse.wst.wsi.internal.core.WSIException;
+import org.eclipse.wst.wsi.internal.core.document.WSIDocument;
 
 /**
  * The interface for the message log file.
diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/log/LogReader.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/log/LogReader.java
index f1b71ff89..cd6012844 100644
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/log/LogReader.java
+++ b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/log/LogReader.java
@@ -10,11 +10,11 @@
  *******************************************************************************/
 package org.eclipse.wst.wsi.internal.core.log;
 
+import java.io.Reader;
+
 import org.eclipse.wst.wsi.internal.core.WSIException;
 import org.eclipse.wst.wsi.internal.core.document.DocumentReader;
 
-import java.io.*;
-
 /**
  * Defines the interface used to read the Log file.
  * 
diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/log/LogWriter.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/log/LogWriter.java
index 36ee6f36f..e8e33e896 100644
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/log/LogWriter.java
+++ b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/log/LogWriter.java
@@ -10,11 +10,10 @@
  *******************************************************************************/
 package org.eclipse.wst.wsi.internal.core.log;
 
+import java.io.Writer;
+
 import org.eclipse.wst.wsi.internal.core.WSIException;
 import org.eclipse.wst.wsi.internal.core.document.DocumentWriter;
-import org.eclipse.wst.wsi.internal.core.log.Log;
-
-import java.io.Writer;
 
 /**
  * Defines the interface used to write the Log file.
diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/log/impl/LogImpl.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/log/impl/LogImpl.java
index d67687a49..02d78ad98 100644
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/log/impl/LogImpl.java
+++ b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/log/impl/LogImpl.java
@@ -10,6 +10,8 @@
  *******************************************************************************/
 package org.eclipse.wst.wsi.internal.core.log.impl;
 
+import java.io.PrintWriter;
+import java.io.StringWriter;
 import java.util.Vector;
 
 import org.eclipse.wst.wsi.internal.core.WSIConstants;
@@ -19,8 +21,6 @@ import org.eclipse.wst.wsi.internal.core.log.MessageEntry;
 import org.eclipse.wst.wsi.internal.core.util.TestUtils;
 import org.eclipse.wst.wsi.internal.core.util.Utils;
 
-import java.io.*;
-
 /**
  * This class represents the message log file.
  * 
diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/log/impl/LogReaderImpl.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/log/impl/LogReaderImpl.java
index 8fb7efedc..f92971deb 100644
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/log/impl/LogReaderImpl.java
+++ b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/log/impl/LogReaderImpl.java
@@ -10,6 +10,11 @@
  *******************************************************************************/
 package org.eclipse.wst.wsi.internal.core.log.impl;
 
+import java.io.Reader;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Vector;
+
 import org.eclipse.wst.wsi.internal.core.ToolEnvironment;
 import org.eclipse.wst.wsi.internal.core.ToolInfo;
 import org.eclipse.wst.wsi.internal.core.WSIConstants;
@@ -19,8 +24,6 @@ import org.eclipse.wst.wsi.internal.core.log.MessageEntry;
 import org.eclipse.wst.wsi.internal.core.log.MessageEntryHandler;
 import org.eclipse.wst.wsi.internal.core.log.MimePart;
 import org.eclipse.wst.wsi.internal.core.log.MimeParts;
-import org.eclipse.wst.wsi.internal.core.log.impl.MimePartImpl;
-import org.eclipse.wst.wsi.internal.core.log.impl.MimePartsImpl;
 import org.eclipse.wst.wsi.internal.core.monitor.config.Comment;
 import org.eclipse.wst.wsi.internal.core.monitor.config.impl.CommentImpl;
 import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
@@ -32,12 +35,11 @@ import org.eclipse.wst.wsi.internal.core.util.EntryType;
 import org.eclipse.wst.wsi.internal.core.util.Utils;
 import org.eclipse.wst.wsi.internal.core.xml.XMLUtils;
 import org.eclipse.wst.wsi.internal.core.xml.dom.ElementLocation;
-
-import org.xml.sax.*;
-import org.xml.sax.helpers.*;
-
-import java.io.*;
-import java.util.*;
+import org.xml.sax.Attributes;
+import org.xml.sax.InputSource;
+import org.xml.sax.Locator;
+import org.xml.sax.XMLReader;
+import org.xml.sax.helpers.DefaultHandler;
 
 /**
  * Defines the implementation used to read the Log file.
diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/log/impl/MessageEntryImpl.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/log/impl/MessageEntryImpl.java
index e9ce32697..afc7a3f3e 100644
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/log/impl/MessageEntryImpl.java
+++ b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/log/impl/MessageEntryImpl.java
@@ -10,6 +10,11 @@
  *******************************************************************************/
 package org.eclipse.wst.wsi.internal.core.log.impl;
 
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.util.Collection;
+import java.util.Iterator;
+
 import org.eclipse.wst.wsi.internal.core.WSIConstants;
 import org.eclipse.wst.wsi.internal.core.log.MessageEntry;
 import org.eclipse.wst.wsi.internal.core.log.MimePart;
@@ -17,11 +22,6 @@ import org.eclipse.wst.wsi.internal.core.log.MimeParts;
 import org.eclipse.wst.wsi.internal.core.xml.XMLUtils;
 import org.eclipse.wst.wsi.internal.core.xml.dom.ElementLocation;
 
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.util.Collection;
-import java.util.Iterator;
-
 /**
  * Message entry implementation.
  * 
diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/MessageEntryQueue.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/MessageEntryQueue.java
index 4754756b4..49cc049f6 100644
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/MessageEntryQueue.java
+++ b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/MessageEntryQueue.java
@@ -10,14 +10,14 @@
  *******************************************************************************/
 package org.eclipse.wst.wsi.internal.core.monitor;
 
+import java.io.StringReader;
+import java.util.Vector;
+
 import org.eclipse.wst.wsi.internal.core.WSIException;
 import org.eclipse.wst.wsi.internal.core.log.Log;
 import org.eclipse.wst.wsi.internal.core.log.LogWriter;
 import org.eclipse.wst.wsi.internal.core.log.MessageEntry;
 
-import java.io.*;
-import java.util.*;
-
 /**
  * This class is the queue that is used to write request and response messages
  * to the log file in the correct order.
diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/Monitor.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/Monitor.java
index f4976241c..f53a0331b 100644
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/Monitor.java
+++ b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/Monitor.java
@@ -10,6 +10,15 @@
  *******************************************************************************/
 package org.eclipse.wst.wsi.internal.core.monitor;
 
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.InputStreamReader;
+import java.io.PrintWriter;
+import java.io.StringReader;
+import java.io.StringWriter;
+import java.util.Iterator;
+import java.util.Vector;
+
 import org.eclipse.wst.wsi.internal.core.ToolInfo;
 import org.eclipse.wst.wsi.internal.core.WSIConstants;
 import org.eclipse.wst.wsi.internal.core.WSIException;
@@ -17,14 +26,12 @@ import org.eclipse.wst.wsi.internal.core.WSIFileNotFoundException;
 import org.eclipse.wst.wsi.internal.core.document.DocumentFactory;
 import org.eclipse.wst.wsi.internal.core.log.Log;
 import org.eclipse.wst.wsi.internal.core.log.LogWriter;
-import org.eclipse.wst.wsi.internal.core.monitor.config.*;
+import org.eclipse.wst.wsi.internal.core.monitor.config.ManInTheMiddle;
+import org.eclipse.wst.wsi.internal.core.monitor.config.MonitorConfig;
+import org.eclipse.wst.wsi.internal.core.monitor.config.Redirect;
 import org.eclipse.wst.wsi.internal.core.util.MessageList;
 import org.eclipse.wst.wsi.internal.core.util.TestUtils;
 
-import java.io.*;
-import java.util.Iterator;
-import java.util.Vector;
-
 /**
  * Message Monitor.
  *
diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/ServerSocketListener.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/ServerSocketListener.java
index 36d376064..7516c8c0b 100644
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/ServerSocketListener.java
+++ b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/ServerSocketListener.java
@@ -10,13 +10,13 @@
  *******************************************************************************/
 package org.eclipse.wst.wsi.internal.core.monitor;
 
-import org.eclipse.wst.wsi.internal.core.monitor.config.Redirect;
-
 import java.net.ServerSocket;
 import java.net.Socket;
 import java.util.Iterator;
 import java.util.Vector;
 
+import org.eclipse.wst.wsi.internal.core.monitor.config.Redirect;
+
 /**
  * A server socket listener.
  *
diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/SocketConnection.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/SocketConnection.java
index 66b7b9d1e..fe2a0f4cf 100644
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/SocketConnection.java
+++ b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/SocketConnection.java
@@ -10,15 +10,16 @@
  *******************************************************************************/
 package org.eclipse.wst.wsi.internal.core.monitor;
 
+import java.net.Socket;
+import java.util.Iterator;
+import java.util.Vector;
+
 import org.eclipse.wst.wsi.internal.core.WSIException;
 import org.eclipse.wst.wsi.internal.core.log.MessageEntry;
 import org.eclipse.wst.wsi.internal.core.log.MimeParts;
 import org.eclipse.wst.wsi.internal.core.monitor.config.Redirect;
 import org.eclipse.wst.wsi.internal.core.util.Utils;
 
-import java.net.Socket;
-import java.util.*; // SS
-
 /**
  * A socket connection.
  *
diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/SocketHandler.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/SocketHandler.java
index 2a3485c12..b90045389 100644
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/SocketHandler.java
+++ b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/SocketHandler.java
@@ -11,18 +11,17 @@
  *******************************************************************************/
 package org.eclipse.wst.wsi.internal.core.monitor;
 
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.log.MessageEntry;
-import org.eclipse.wst.wsi.internal.core.util.Utils;
-
-import java.net.Socket;
-
+import java.io.IOException;
 import java.io.InputStream;
 import java.io.InterruptedIOException;
-import java.io.IOException;
 import java.io.OutputStream;
 import java.io.UnsupportedEncodingException;
+import java.net.Socket;
+
+import org.eclipse.wst.wsi.internal.core.WSIConstants;
+import org.eclipse.wst.wsi.internal.core.WSIException;
+import org.eclipse.wst.wsi.internal.core.log.MessageEntry;
+import org.eclipse.wst.wsi.internal.core.util.Utils;
 
 /**
  * Socket Handler.
diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/config/Comment.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/config/Comment.java
index 11ad709c1..bde4ad6fe 100644
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/config/Comment.java
+++ b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/config/Comment.java
@@ -10,11 +10,11 @@
  *******************************************************************************/
 package org.eclipse.wst.wsi.internal.core.monitor.config;
 
+import javax.xml.namespace.QName;
+
 import org.eclipse.wst.wsi.internal.core.WSIConstants;
 import org.eclipse.wst.wsi.internal.core.document.DocumentElement;
 
-import javax.xml.namespace.QName;
-
 /**
  * The interface for monitor config Comment element.  
  * 
diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/config/MonitorConfig.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/config/MonitorConfig.java
index 26f0d55d7..11df1ed52 100644
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/config/MonitorConfig.java
+++ b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/config/MonitorConfig.java
@@ -10,14 +10,14 @@
  *******************************************************************************/
 package org.eclipse.wst.wsi.internal.core.monitor.config;
 
+import javax.xml.namespace.QName;
+
 import org.eclipse.wst.wsi.internal.core.WSIConstants;
 import org.eclipse.wst.wsi.internal.core.WSIException;
 import org.eclipse.wst.wsi.internal.core.common.AddStyleSheet;
 import org.eclipse.wst.wsi.internal.core.document.WSIDocument;
 import org.eclipse.wst.wsi.internal.core.util.MessageList;
 
-import javax.xml.namespace.QName;
-
 /**
  * This is the interface for the monitor configuration file.
  * 
diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/config/MonitorConfigReader.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/config/MonitorConfigReader.java
index 526f1a204..38fbd0753 100644
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/config/MonitorConfigReader.java
+++ b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/config/MonitorConfigReader.java
@@ -10,12 +10,12 @@
  *******************************************************************************/
 package org.eclipse.wst.wsi.internal.core.monitor.config;
 
+import java.io.Reader;
+
 import org.eclipse.wst.wsi.internal.core.WSIException;
 import org.eclipse.wst.wsi.internal.core.document.DocumentReader;
 import org.eclipse.wst.wsi.internal.core.util.MessageList;
 
-import java.io.Reader;
-
 /**
  * Defines the interface used to read the monitor config documents.
  * 
diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/config/impl/MonitorConfigImpl.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/config/impl/MonitorConfigImpl.java
index fbf00d03d..586966d83 100644
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/config/impl/MonitorConfigImpl.java
+++ b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/config/impl/MonitorConfigImpl.java
@@ -10,16 +10,21 @@
  *******************************************************************************/
 package org.eclipse.wst.wsi.internal.core.monitor.config.impl;
 
+import java.io.PrintWriter;
+import java.io.StringWriter;
+
 import org.eclipse.wst.wsi.internal.core.WSIConstants;
 import org.eclipse.wst.wsi.internal.core.WSIException;
 import org.eclipse.wst.wsi.internal.core.common.AddStyleSheet;
 import org.eclipse.wst.wsi.internal.core.common.impl.AddStyleSheetImpl;
 import org.eclipse.wst.wsi.internal.core.monitor.Monitor;
-import org.eclipse.wst.wsi.internal.core.monitor.config.*;
+import org.eclipse.wst.wsi.internal.core.monitor.config.Comment;
+import org.eclipse.wst.wsi.internal.core.monitor.config.ManInTheMiddle;
+import org.eclipse.wst.wsi.internal.core.monitor.config.MonitorConfig;
+import org.eclipse.wst.wsi.internal.core.monitor.config.MonitorConfigReader;
+import org.eclipse.wst.wsi.internal.core.monitor.config.Redirect;
 import org.eclipse.wst.wsi.internal.core.util.MessageList;
 
-import java.io.*;
-
 /**
  * This is the implementation for the monitor configuration file.
  * 
diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/config/impl/MonitorConfigReaderImpl.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/config/impl/MonitorConfigReaderImpl.java
index 83abcca01..004abca8e 100644
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/config/impl/MonitorConfigReaderImpl.java
+++ b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/config/impl/MonitorConfigReaderImpl.java
@@ -10,21 +10,26 @@
  *******************************************************************************/
 package org.eclipse.wst.wsi.internal.core.monitor.config.impl;
 
+import java.io.FileNotFoundException;
+import java.io.FileReader;
+import java.io.Reader;
+
 import org.eclipse.wst.wsi.internal.core.WSIConstants;
 import org.eclipse.wst.wsi.internal.core.WSIException;
 import org.eclipse.wst.wsi.internal.core.WSIFileNotFoundException;
 import org.eclipse.wst.wsi.internal.core.common.AddStyleSheet;
 import org.eclipse.wst.wsi.internal.core.common.impl.AddStyleSheetImpl;
-import org.eclipse.wst.wsi.internal.core.monitor.config.*;
+import org.eclipse.wst.wsi.internal.core.monitor.config.Comment;
+import org.eclipse.wst.wsi.internal.core.monitor.config.ManInTheMiddle;
+import org.eclipse.wst.wsi.internal.core.monitor.config.MonitorConfig;
+import org.eclipse.wst.wsi.internal.core.monitor.config.MonitorConfigReader;
+import org.eclipse.wst.wsi.internal.core.monitor.config.Redirect;
 import org.eclipse.wst.wsi.internal.core.util.MessageList;
 import org.eclipse.wst.wsi.internal.core.util.TestUtils;
 import org.eclipse.wst.wsi.internal.core.xml.XMLUtils;
-
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
-import java.io.*;
-
 /**
  * Defines the implementation used to read the monitor config documents.
  * 
diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/config/impl/RedirectImpl.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/config/impl/RedirectImpl.java
index 8ddaa0e99..a1d169ca2 100644
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/config/impl/RedirectImpl.java
+++ b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/monitor/config/impl/RedirectImpl.java
@@ -10,14 +10,16 @@
  *******************************************************************************/
 package org.eclipse.wst.wsi.internal.core.monitor.config.impl;
 
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.net.MalformedURLException;
+import java.net.URL;
+
 import org.eclipse.wst.wsi.internal.core.WSIConstants;
 import org.eclipse.wst.wsi.internal.core.monitor.config.Comment;
 import org.eclipse.wst.wsi.internal.core.monitor.config.Redirect;
 import org.eclipse.wst.wsi.internal.core.xml.XMLUtils;
 
-import java.io.*;
-import java.net.*;
-
 /**
  *  The implementation for monitor config Redirect element.
  * 
diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/ProfileArtifact.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/ProfileArtifact.java
index d4a0b768d..1934f2a87 100644
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/ProfileArtifact.java
+++ b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/ProfileArtifact.java
@@ -10,13 +10,14 @@
  *******************************************************************************/
 package org.eclipse.wst.wsi.internal.core.profile;
 
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.document.DocumentElement;
-import org.eclipse.wst.wsi.internal.core.util.ArtifactType;
+import java.util.LinkedList;
+import java.util.Vector;
 
 import javax.xml.namespace.QName;
 
-import java.util.*;
+import org.eclipse.wst.wsi.internal.core.WSIConstants;
+import org.eclipse.wst.wsi.internal.core.document.DocumentElement;
+import org.eclipse.wst.wsi.internal.core.util.ArtifactType;
 
 /**
  * An artifact contains a set of related test assertions.
diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/ProfileAssertions.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/ProfileAssertions.java
index 1e6231d53..3c6776166 100644
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/ProfileAssertions.java
+++ b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/ProfileAssertions.java
@@ -10,13 +10,13 @@
  *******************************************************************************/
 package org.eclipse.wst.wsi.internal.core.profile;
 
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
-import org.eclipse.wst.wsi.internal.core.document.WSIDocument;
+import java.util.TreeMap;
+import java.util.Vector;
 
 import javax.xml.namespace.QName;
 
-import java.util.TreeMap;
-import java.util.Vector;
+import org.eclipse.wst.wsi.internal.core.WSIConstants;
+import org.eclipse.wst.wsi.internal.core.document.WSIDocument;
 
 /**
  * This interface maintains profile assertions.
diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/ProfileAssertionsReader.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/ProfileAssertionsReader.java
index f0fe871d5..00b0a3de8 100644
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/ProfileAssertionsReader.java
+++ b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/ProfileAssertionsReader.java
@@ -10,11 +10,10 @@
  *******************************************************************************/
 package org.eclipse.wst.wsi.internal.core.profile;
 
+import java.io.Reader;
+
 import org.eclipse.wst.wsi.internal.core.WSIException;
 import org.eclipse.wst.wsi.internal.core.document.DocumentReader;
-import org.eclipse.wst.wsi.internal.core.profile.ProfileAssertions;
-
-import java.io.Reader;
 
 /**
  * Defines the interface used to read a profile assertions documents.
diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/TestAssertion.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/TestAssertion.java
index 0a1b8f638..ef5347554 100644
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/TestAssertion.java
+++ b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/TestAssertion.java
@@ -10,7 +10,7 @@
  *******************************************************************************/
 package org.eclipse.wst.wsi.internal.core.profile;
 
-import java.util.*;
+import java.util.Vector;
 
 /**
  * A test assertion is one assertion in a profile definition.
diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/impl/ProfileArtifactImpl.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/impl/ProfileArtifactImpl.java
index bbc3c40e3..b4ab3be23 100644
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/impl/ProfileArtifactImpl.java
+++ b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/impl/ProfileArtifactImpl.java
@@ -10,16 +10,16 @@
  *******************************************************************************/
 package org.eclipse.wst.wsi.internal.core.profile.impl;
 
-import org.eclipse.wst.wsi.internal.core.profile.ProfileArtifact;
-import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.core.util.ArtifactType;
-
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.util.LinkedList;
 import java.util.TreeMap;
 import java.util.Vector;
 
+import org.eclipse.wst.wsi.internal.core.profile.ProfileArtifact;
+import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
+import org.eclipse.wst.wsi.internal.core.util.ArtifactType;
+
 /**
  * An artifact contains a set of related test assertions.
  * 
diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/impl/ProfileAssertionsImpl.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/impl/ProfileAssertionsImpl.java
index c4d8428dc..2c81419eb 100644
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/impl/ProfileAssertionsImpl.java
+++ b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/impl/ProfileAssertionsImpl.java
@@ -10,6 +10,8 @@
  *******************************************************************************/
 package org.eclipse.wst.wsi.internal.core.profile.impl;
 
+import java.util.Iterator;
+import java.util.TreeMap;
 import java.util.Vector;
 
 import org.eclipse.wst.wsi.internal.core.profile.Profile;
@@ -17,9 +19,6 @@ import org.eclipse.wst.wsi.internal.core.profile.ProfileArtifact;
 import org.eclipse.wst.wsi.internal.core.profile.ProfileAssertions;
 import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
 
-import java.util.Iterator;
-import java.util.TreeMap;
-
 /**
  * This class ...
  * 
diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/impl/TestAssertionImpl.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/impl/TestAssertionImpl.java
index c064f23ae..769757a12 100644
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/impl/TestAssertionImpl.java
+++ b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/impl/TestAssertionImpl.java
@@ -10,11 +10,11 @@
  *******************************************************************************/
 package org.eclipse.wst.wsi.internal.core.profile.impl;
 
+import java.util.Vector;
+
 import org.eclipse.wst.wsi.internal.core.profile.EntryTypeList;
 import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
 
-import java.util.Vector;
-
 /**
  * This class ...
  * 
diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/BaseValidator.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/BaseValidator.java
index e661c1020..7289ed0ee 100644
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/BaseValidator.java
+++ b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/BaseValidator.java
@@ -11,7 +11,6 @@
 package org.eclipse.wst.wsi.internal.core.profile.validator;
 
 import org.eclipse.wst.wsi.internal.core.WSIException;
-
 import org.w3c.dom.Document;
 
 /**
diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/EntryContext.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/EntryContext.java
index 34ce83d1d..08bb99adf 100644
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/EntryContext.java
+++ b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/EntryContext.java
@@ -18,7 +18,6 @@ import org.eclipse.wst.wsi.internal.core.report.Entry;
 import org.eclipse.wst.wsi.internal.core.util.EntryType;
 import org.eclipse.wst.wsi.internal.core.wsdl.WSDLDocument;
 import org.eclipse.wst.wsi.internal.core.xml.XMLUtils;
-
 import org.w3c.dom.Document;
 
 /**
diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/BaseMessageValidator.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/BaseMessageValidator.java
index 11de6a798..a28800322 100644
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/BaseMessageValidator.java
+++ b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/BaseMessageValidator.java
@@ -52,8 +52,7 @@ import org.eclipse.wst.wsi.internal.core.log.MessageEntry;
 import org.eclipse.wst.wsi.internal.core.profile.ProfileArtifact;
 import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
 import org.eclipse.wst.wsi.internal.core.profile.validator.EntryContext;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.BaseValidatorImpl;
-import org.eclipse.wst.wsi.internal.core.profile.validator.impl.wsdl.*;
+import org.eclipse.wst.wsi.internal.core.profile.validator.impl.wsdl.WSDLValidatorImpl;
 import org.eclipse.wst.wsi.internal.core.report.FailureDetail;
 import org.eclipse.wst.wsi.internal.core.report.ReportArtifact;
 import org.eclipse.wst.wsi.internal.core.report.Reporter;
diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/uddi/UDDIValidatorImpl.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/uddi/UDDIValidatorImpl.java
index 23235e9e7..3df554d0c 100644
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/uddi/UDDIValidatorImpl.java
+++ b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/uddi/UDDIValidatorImpl.java
@@ -19,7 +19,7 @@ import java.util.Iterator;
 import java.util.Vector;
 
 import javax.wsdl.Binding;
-import javax.wsdl.*;
+import javax.wsdl.WSDLException;
 
 import org.eclipse.wst.wsi.internal.core.WSIException;
 import org.eclipse.wst.wsi.internal.core.analyzer.AnalyzerContext;
@@ -46,6 +46,7 @@ import org.uddi4j.response.BindingDetail;
 import org.uddi4j.response.TModelDetail;
 import org.uddi4j.util.CategoryBag;
 import org.uddi4j.util.KeyedReference;
+
 import com.ibm.wsdl.util.StringUtils;
 
 /**
diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2018.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2018.java
index 32a01d161..dd467cd89 100644
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2018.java
+++ b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/profile/validator/impl/wsdl/BP2018.java
@@ -11,6 +11,7 @@
 package org.eclipse.wst.wsi.internal.core.profile.validator.impl.wsdl;
 
 import javax.wsdl.Definition;
+
 import org.eclipse.wst.wsi.internal.core.WSIException;
 import org.eclipse.wst.wsi.internal.core.WSITag;
 import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/ArtifactReference.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/ArtifactReference.java
index 28dd51bf2..89899de60 100644
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/ArtifactReference.java
+++ b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/ArtifactReference.java
@@ -10,11 +10,11 @@
  *******************************************************************************/
 package org.eclipse.wst.wsi.internal.core.report;
 
+import javax.xml.namespace.QName;
+
 import org.eclipse.wst.wsi.internal.core.WSIConstants;
 import org.eclipse.wst.wsi.internal.core.document.DocumentElement;
 
-import javax.xml.namespace.QName;
-
 /**
  * An artifact reference.
  * 
diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/FailureDetail.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/FailureDetail.java
index 9bdcf0a0a..4c8acb3ad 100644
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/FailureDetail.java
+++ b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/FailureDetail.java
@@ -10,12 +10,12 @@
  *******************************************************************************/
 package org.eclipse.wst.wsi.internal.core.report;
 
+import javax.xml.namespace.QName;
+
 import org.eclipse.wst.wsi.internal.core.WSIConstants;
 import org.eclipse.wst.wsi.internal.core.document.DocumentElement;
 import org.eclipse.wst.wsi.internal.core.xml.dom.ElementLocation;
 
-import javax.xml.namespace.QName;
-
 /**
  * Failure detail.
  * 
diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/PrereqFailedList.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/PrereqFailedList.java
index a493d51cc..81059d363 100644
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/PrereqFailedList.java
+++ b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/PrereqFailedList.java
@@ -10,11 +10,11 @@
  *******************************************************************************/
 package org.eclipse.wst.wsi.internal.core.report;
 
+import javax.xml.namespace.QName;
+
 import org.eclipse.wst.wsi.internal.core.WSIConstants;
 import org.eclipse.wst.wsi.internal.core.document.DocumentElement;
 
-import javax.xml.namespace.QName;
-
 /**
  * This interface is used to maintain and access the Prerequisite Failed List.
  * 
diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/impl/ArtifactReferenceImpl.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/impl/ArtifactReferenceImpl.java
index 0b4fc1490..d4b46ba3a 100644
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/impl/ArtifactReferenceImpl.java
+++ b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/impl/ArtifactReferenceImpl.java
@@ -10,12 +10,13 @@
  *******************************************************************************/
 package org.eclipse.wst.wsi.internal.core.report.impl;
 
+import java.io.PrintWriter;
+import java.io.StringWriter;
+
 import org.eclipse.wst.wsi.internal.core.WSIConstants;
 import org.eclipse.wst.wsi.internal.core.document.DocumentElement;
 import org.eclipse.wst.wsi.internal.core.report.ArtifactReference;
 
-import java.io.*;
-
 /**
  * An artifact reference.
  * 
diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/impl/EntryResultImpl.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/impl/EntryResultImpl.java
index 15ea54567..61ffb72d9 100644
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/impl/EntryResultImpl.java
+++ b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/impl/EntryResultImpl.java
@@ -10,11 +10,11 @@
  *******************************************************************************/
 package org.eclipse.wst.wsi.internal.core.report.impl;
 
+import java.util.TreeMap;
+
 import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
 import org.eclipse.wst.wsi.internal.core.report.EntryResult;
 
-import java.util.TreeMap;
-
 /**
  * Result for a specific test assertion.
  * 
diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/impl/FailureDetailImpl.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/impl/FailureDetailImpl.java
index 71d070bc0..dc7dc5143 100644
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/impl/FailureDetailImpl.java
+++ b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/impl/FailureDetailImpl.java
@@ -10,14 +10,15 @@
  *******************************************************************************/
 package org.eclipse.wst.wsi.internal.core.report.impl;
 
+import java.io.PrintWriter;
+import java.io.StringWriter;
+
 import org.eclipse.wst.wsi.internal.core.WSIConstants;
 import org.eclipse.wst.wsi.internal.core.report.FailureDetail;
 import org.eclipse.wst.wsi.internal.core.xml.dom.ElementLocation;
 
 import com.ibm.wsdl.util.xml.DOMUtils;
 
-import java.io.*;
-
 /**
  * This class will ...
  * 
diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/impl/PrereqFailedListImpl.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/impl/PrereqFailedListImpl.java
index 5d3e19a50..eb1de2051 100644
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/impl/PrereqFailedListImpl.java
+++ b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/report/impl/PrereqFailedListImpl.java
@@ -10,12 +10,14 @@
  *******************************************************************************/
 package org.eclipse.wst.wsi.internal.core.report.impl;
 
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.util.Iterator;
+import java.util.Vector;
+
 import org.eclipse.wst.wsi.internal.core.WSIConstants;
 import org.eclipse.wst.wsi.internal.core.report.PrereqFailedList;
 
-import java.io.*;
-import java.util.*;
-
 /**
  * This interface is used to maintain and access the Prerequisite Failed List.
  * 
diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/OperationSignature.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/OperationSignature.java
index 1c40e2cb1..639a3f209 100644
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/OperationSignature.java
+++ b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/OperationSignature.java
@@ -15,12 +15,28 @@ import java.util.LinkedList;
 import java.util.List;
 
 import javax.wsdl.Binding;
+import javax.wsdl.BindingFault;
+import javax.wsdl.BindingInput;
 import javax.wsdl.BindingOperation;
+import javax.wsdl.BindingOutput;
+import javax.wsdl.Definition;
+import javax.wsdl.Fault;
+import javax.wsdl.Import;
+import javax.wsdl.Input;
 import javax.wsdl.Message;
-import javax.wsdl.*;
+import javax.wsdl.Operation;
+import javax.wsdl.Output;
+import javax.wsdl.Part;
+import javax.wsdl.Port;
+import javax.wsdl.PortType;
+import javax.wsdl.Service;
+import javax.wsdl.Types;
 import javax.wsdl.extensions.ExtensibilityElement;
-import javax.wsdl.extensions.soap.*;
+import javax.wsdl.extensions.soap.SOAPBinding;
 import javax.wsdl.extensions.soap.SOAPBody;
+import javax.wsdl.extensions.soap.SOAPFault;
+import javax.wsdl.extensions.soap.SOAPHeader;
+import javax.wsdl.extensions.soap.SOAPHeaderFault;
 import javax.wsdl.extensions.soap.SOAPOperation;
 import javax.xml.namespace.QName;
 
diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/TestUtils.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/TestUtils.java
index 46584360d..c0ae9459e 100644
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/TestUtils.java
+++ b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/TestUtils.java
@@ -10,15 +10,15 @@
  *******************************************************************************/
 package org.eclipse.wst.wsi.internal.core.util;
 
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+
 import org.eclipse.wst.wsi.internal.core.ToolInfo;
 import org.eclipse.wst.wsi.internal.core.WSIConstants;
 import org.eclipse.wst.wsi.internal.core.common.AddStyleSheet;
 import org.eclipse.wst.wsi.internal.core.xml.XMLUtils;
-
 import org.w3c.dom.Element;
 
-import java.io.*;
-
 /**
  * Test Utility class.
  * 
diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/TypesRegistry.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/TypesRegistry.java
index 01a389e15..c73d05ee5 100644
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/TypesRegistry.java
+++ b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/TypesRegistry.java
@@ -18,12 +18,31 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import javax.wsdl.*;
+import javax.wsdl.Binding;
+import javax.wsdl.BindingFault;
+import javax.wsdl.BindingInput;
+import javax.wsdl.BindingOperation;
+import javax.wsdl.BindingOutput;
+import javax.wsdl.Definition;
+import javax.wsdl.Fault;
 import javax.wsdl.Import;
+import javax.wsdl.Input;
+import javax.wsdl.Message;
+import javax.wsdl.Operation;
+import javax.wsdl.Output;
+import javax.wsdl.Part;
+import javax.wsdl.Port;
+import javax.wsdl.PortType;
+import javax.wsdl.Service;
 import javax.wsdl.Types;
 import javax.wsdl.extensions.ExtensibilityElement;
 import javax.wsdl.extensions.UnknownExtensibilityElement;
-import javax.wsdl.extensions.soap.*;
+import javax.wsdl.extensions.soap.SOAPBinding;
+import javax.wsdl.extensions.soap.SOAPBody;
+import javax.wsdl.extensions.soap.SOAPFault;
+import javax.wsdl.extensions.soap.SOAPHeader;
+import javax.wsdl.extensions.soap.SOAPHeaderFault;
+import javax.wsdl.extensions.soap.SOAPOperation;
 import javax.xml.namespace.QName;
 
 import org.eclipse.wst.wsi.internal.core.WSITag;
diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/Utils.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/Utils.java
index b02255801..ce366267e 100644
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/Utils.java
+++ b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/Utils.java
@@ -31,9 +31,9 @@ import java.util.Collection;
 import java.util.Date;
 import java.util.Iterator;
 import java.util.ResourceBundle;
+import java.util.StringTokenizer;
 import java.util.TimeZone;
 import java.util.Vector;
-import java.util.StringTokenizer;
 
 import org.eclipse.wst.wsi.internal.core.WSIConstants;
 import org.eclipse.wst.wsi.internal.core.WSIException;
diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/WSIProperties.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/WSIProperties.java
index ebfb29c23..ba1403362 100644
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/WSIProperties.java
+++ b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/util/WSIProperties.java
@@ -10,9 +10,12 @@
  *******************************************************************************/
 package org.eclipse.wst.wsi.internal.core.util;
 
-import org.uddi4j.transport.TransportFactory;
+import java.util.Enumeration;
+import java.util.MissingResourceException;
+import java.util.Properties;
+import java.util.ResourceBundle;
 
-import java.util.*;
+import org.uddi4j.transport.TransportFactory;
 
 /**
  * The WSI properties can be defined in one of three locations.  
diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/WSDLElementList.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/WSDLElementList.java
index 9abed4946..75a77d895 100644
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/WSDLElementList.java
+++ b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/WSDLElementList.java
@@ -10,9 +10,10 @@
  *******************************************************************************/
 package org.eclipse.wst.wsi.internal.core.wsdl;
 
-import org.eclipse.wst.wsi.internal.core.xml.dom.ElementLocation;
+import java.util.HashMap;
+import java.util.Iterator;
 
-import java.util.*;
+import org.eclipse.wst.wsi.internal.core.xml.dom.ElementLocation;
 
 /**
  * This class maintains a WSDL element list.
diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/WSDLReaderImpl.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/WSDLReaderImpl.java
index 45b590a74..8325dca44 100644
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/WSDLReaderImpl.java
+++ b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/WSDLReaderImpl.java
@@ -10,28 +10,47 @@
  *******************************************************************************/
 package org.eclipse.wst.wsi.internal.core.wsdl;
 
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.util.Iterator;
+import java.util.Map;
+
+import javax.wsdl.Binding;
+import javax.wsdl.BindingFault;
+import javax.wsdl.BindingInput;
+import javax.wsdl.BindingOperation;
+import javax.wsdl.BindingOutput;
+import javax.wsdl.Definition;
+import javax.wsdl.Fault;
+import javax.wsdl.Import;
+import javax.wsdl.Input;
+import javax.wsdl.Message;
+import javax.wsdl.Operation;
+import javax.wsdl.Output;
+import javax.wsdl.Part;
+import javax.wsdl.Port;
+import javax.wsdl.PortType;
+import javax.wsdl.Service;
+import javax.wsdl.Types;
+import javax.wsdl.WSDLException;
+import javax.wsdl.extensions.ExtensibilityElement;
+import javax.wsdl.factory.WSDLFactory;
+import javax.xml.namespace.QName;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+
 import org.apache.xerces.dom.ElementImpl;
-import org.eclipse.wst.wsi.internal.core.WSIException;
-import org.eclipse.wst.wsi.internal.core.xml.XMLUtils;
 import org.eclipse.wst.wsi.internal.core.xml.dom.ElementLocation;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.xml.sax.InputSource;
 
-import com.ibm.wsdl.*;
+import com.ibm.wsdl.Constants;
 import com.ibm.wsdl.util.StringUtils;
-import com.ibm.wsdl.util.xml.*;
-
-import org.w3c.dom.*;
-import org.xml.sax.*;
-
-import javax.wsdl.*;
-import javax.wsdl.extensions.*;
-import javax.wsdl.factory.*;
-import javax.xml.namespace.*;
-import javax.xml.parsers.*;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-import java.util.*;
+import com.ibm.wsdl.util.xml.DOMUtils;
+import com.ibm.wsdl.util.xml.QNameUtils;
+import com.ibm.wsdl.util.xml.XPathUtils;
 
 /**
  * This class is a specialization of com.ibm.wsdl.xml.WSDLReaderImpl in WSDL4J.
diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/WSDLUtils.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/WSDLUtils.java
index 2699390cd..9b408ff61 100644
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/WSDLUtils.java
+++ b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/WSDLUtils.java
@@ -10,7 +10,9 @@
  *******************************************************************************/
 package org.eclipse.wst.wsi.internal.core.wsdl;
 
-import org.eclipse.wst.wsi.internal.core.WSIConstants;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
 
 import javax.wsdl.Binding;
 import javax.wsdl.BindingOperation;
@@ -27,7 +29,7 @@ import javax.wsdl.extensions.soap.SOAPHeaderFault;
 import javax.wsdl.extensions.soap.SOAPOperation;
 import javax.xml.namespace.QName;
 
-import java.util.*;
+import org.eclipse.wst.wsi.internal.core.WSIConstants;
 
 /**
  * Set of XML related utilities.
diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/traversal/WSDLTraversal.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/traversal/WSDLTraversal.java
index b0a379797..4a3569a77 100644
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/traversal/WSDLTraversal.java
+++ b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/traversal/WSDLTraversal.java
@@ -9,24 +9,27 @@
  *   IBM - Initial API and implementation
  *******************************************************************************/
 package org.eclipse.wst.wsi.internal.core.wsdl.traversal;
-import javax.wsdl.Part;
-import javax.wsdl.Service;
-import javax.wsdl.Types;
-import javax.wsdl.Operation;
-import javax.wsdl.Input;
-import javax.wsdl.Output;
-import javax.wsdl.Fault;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Vector;
+
 import javax.wsdl.Binding;
-import javax.wsdl.BindingOperation;
+import javax.wsdl.BindingFault;
 import javax.wsdl.BindingInput;
+import javax.wsdl.BindingOperation;
 import javax.wsdl.BindingOutput;
-import javax.wsdl.BindingFault;
+import javax.wsdl.Definition;
+import javax.wsdl.Fault;
 import javax.wsdl.Import;
-import org.w3c.dom.Element;
+import javax.wsdl.Input;
 import javax.wsdl.Message;
+import javax.wsdl.Operation;
+import javax.wsdl.Output;
+import javax.wsdl.Part;
 import javax.wsdl.Port;
 import javax.wsdl.PortType;
-import javax.wsdl.Definition;
+import javax.wsdl.Service;
+import javax.wsdl.Types;
 import javax.wsdl.extensions.ExtensibilityElement;
 import javax.wsdl.extensions.soap.SOAPBinding;
 import javax.wsdl.extensions.soap.SOAPBody;
@@ -35,9 +38,7 @@ import javax.wsdl.extensions.soap.SOAPHeader;
 import javax.wsdl.extensions.soap.SOAPHeaderFault;
 import javax.wsdl.extensions.soap.SOAPOperation;
 
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Vector;
+import org.w3c.dom.Element;
 
 /**
  * The class implements plain traverse over WSDL artifacts.
diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/traversal/WSDLTraversalContext.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/traversal/WSDLTraversalContext.java
index aed01c0e4..cd4dbe78f 100644
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/traversal/WSDLTraversalContext.java
+++ b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/traversal/WSDLTraversalContext.java
@@ -13,32 +13,33 @@ package org.eclipse.wst.wsi.internal.core.wsdl.traversal;
 import java.util.Map;
 import java.util.TreeMap;
 
-import javax.wsdl.Part;
-import javax.wsdl.Service;
-import javax.wsdl.Types;
-import javax.wsdl.Operation;
-import javax.wsdl.Input;
-import javax.wsdl.Output;
-import javax.wsdl.Fault;
 import javax.wsdl.Binding;
-import javax.wsdl.BindingOperation;
+import javax.wsdl.BindingFault;
 import javax.wsdl.BindingInput;
+import javax.wsdl.BindingOperation;
 import javax.wsdl.BindingOutput;
-import javax.wsdl.BindingFault;
+import javax.wsdl.Definition;
+import javax.wsdl.Fault;
 import javax.wsdl.Import;
-import org.w3c.dom.Element;
+import javax.wsdl.Input;
 import javax.wsdl.Message;
+import javax.wsdl.Operation;
+import javax.wsdl.Output;
+import javax.wsdl.Part;
 import javax.wsdl.Port;
 import javax.wsdl.PortType;
-import javax.wsdl.Definition;
+import javax.wsdl.Service;
+import javax.wsdl.Types;
 import javax.wsdl.extensions.ExtensibilityElement;
 import javax.wsdl.extensions.soap.SOAPBinding;
 import javax.wsdl.extensions.soap.SOAPBody;
+import javax.wsdl.extensions.soap.SOAPFault;
 import javax.wsdl.extensions.soap.SOAPHeader;
 import javax.wsdl.extensions.soap.SOAPHeaderFault;
-import javax.wsdl.extensions.soap.SOAPFault;
 import javax.wsdl.extensions.soap.SOAPOperation;
 
+import org.w3c.dom.Element;
+
 /**
  * The class represents runtime context for the traversal process.
  * Context stores artifacts being processed.
diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/traversal/WSDLVisitor.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/traversal/WSDLVisitor.java
index 0e8161cd2..ab95d7ad7 100644
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/traversal/WSDLVisitor.java
+++ b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/wsdl/traversal/WSDLVisitor.java
@@ -10,24 +10,23 @@
  *******************************************************************************/
 package org.eclipse.wst.wsi.internal.core.wsdl.traversal;
 
-import javax.wsdl.Part;
-import javax.wsdl.Service;
-import javax.wsdl.Types;
-import javax.wsdl.Operation;
-import javax.wsdl.Input;
-import javax.wsdl.Output;
-import javax.wsdl.Fault;
 import javax.wsdl.Binding;
-import javax.wsdl.BindingOperation;
+import javax.wsdl.BindingFault;
 import javax.wsdl.BindingInput;
+import javax.wsdl.BindingOperation;
 import javax.wsdl.BindingOutput;
-import javax.wsdl.BindingFault;
+import javax.wsdl.Definition;
+import javax.wsdl.Fault;
 import javax.wsdl.Import;
-import org.w3c.dom.Element;
+import javax.wsdl.Input;
 import javax.wsdl.Message;
+import javax.wsdl.Operation;
+import javax.wsdl.Output;
+import javax.wsdl.Part;
 import javax.wsdl.Port;
 import javax.wsdl.PortType;
-import javax.wsdl.Definition;
+import javax.wsdl.Service;
+import javax.wsdl.Types;
 import javax.wsdl.extensions.ExtensibilityElement;
 import javax.wsdl.extensions.soap.SOAPBinding;
 import javax.wsdl.extensions.soap.SOAPBody;
@@ -36,6 +35,8 @@ import javax.wsdl.extensions.soap.SOAPHeader;
 import javax.wsdl.extensions.soap.SOAPHeaderFault;
 import javax.wsdl.extensions.soap.SOAPOperation;
 
+import org.w3c.dom.Element;
+
 /**
  * The interface defines callback methods during traverse WSDL.
  * WSDLVisitor could cancel artifact processing by using traversal context
diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/XMLDocumentCacheUser.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/XMLDocumentCacheUser.java
index 5a00135c4..7b1df4807 100644
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/XMLDocumentCacheUser.java
+++ b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/XMLDocumentCacheUser.java
@@ -10,11 +10,11 @@
  *******************************************************************************/
 package org.eclipse.wst.wsi.internal.core.xml;
 
+import java.net.URL;
+
 import org.eclipse.wst.wsi.internal.core.WSIException;
 import org.w3c.dom.Document;
 
-import java.net.URL;
-
 /**
  * This is an abstract class that takes advantage of cached XML documents.
  * @author Peter  Brittenham (peterbr@us.ibm.com)
diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/XMLUtils.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/XMLUtils.java
index 2b2fe1eaa..2815a8890 100644
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/XMLUtils.java
+++ b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/XMLUtils.java
@@ -28,6 +28,7 @@ import java.util.Vector;
 import javax.xml.namespace.QName;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
+
 import org.apache.xml.serialize.OutputFormat;
 import org.apache.xml.serialize.XMLSerializer;
 import org.eclipse.wst.wsi.internal.core.WSIException;
diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/XMLVisitor.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/XMLVisitor.java
index cb5f90e9f..fc9ea3653 100644
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/XMLVisitor.java
+++ b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/XMLVisitor.java
@@ -10,7 +10,18 @@
  *******************************************************************************/
 package org.eclipse.wst.wsi.internal.core.xml;
 
-import org.w3c.dom.*;
+import org.w3c.dom.Attr;
+import org.w3c.dom.CDATASection;
+import org.w3c.dom.Comment;
+import org.w3c.dom.Document;
+import org.w3c.dom.DocumentType;
+import org.w3c.dom.Element;
+import org.w3c.dom.Entity;
+import org.w3c.dom.EntityReference;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Notation;
+import org.w3c.dom.ProcessingInstruction;
+import org.w3c.dom.Text;
 
 /**
  * We don't have access to the node source code, so this does
diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/dom/DOMParser.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/dom/DOMParser.java
index e62a06ce0..420b65d4a 100644
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/dom/DOMParser.java
+++ b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/dom/DOMParser.java
@@ -10,18 +10,16 @@
  *******************************************************************************/
 package org.eclipse.wst.wsi.internal.core.xml.dom;
 
-import org.w3c.dom.Element;
-
-import org.xml.sax.SAXNotSupportedException;
-import org.xml.sax.SAXNotRecognizedException;
-
 import org.apache.xerces.dom.ElementImpl;
 import org.apache.xerces.xni.Augmentations;
 import org.apache.xerces.xni.NamespaceContext;
 import org.apache.xerces.xni.QName;
-import org.apache.xerces.xni.XMLLocator;
 import org.apache.xerces.xni.XMLAttributes;
+import org.apache.xerces.xni.XMLLocator;
 import org.apache.xerces.xni.XNIException;
+import org.w3c.dom.Element;
+import org.xml.sax.SAXNotRecognizedException;
+import org.xml.sax.SAXNotSupportedException;
 
 /**
  * This class specializes org.apache.xerces.parsers.DOMParser.
diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/dom/ElementLocation.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/dom/ElementLocation.java
index 00cc74570..fa9053363 100644
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/dom/ElementLocation.java
+++ b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/dom/ElementLocation.java
@@ -11,7 +11,6 @@
 package org.eclipse.wst.wsi.internal.core.xml.dom;
 
 import org.eclipse.wst.wsi.internal.core.WSIConstants;
-
 import org.xml.sax.Locator;
 
 /**
diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/jaxp/DocumentBuilderFactoryImpl.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/jaxp/DocumentBuilderFactoryImpl.java
index 6806cea5a..cc519414c 100644
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/jaxp/DocumentBuilderFactoryImpl.java
+++ b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/jaxp/DocumentBuilderFactoryImpl.java
@@ -10,12 +10,12 @@
  *******************************************************************************/
 package org.eclipse.wst.wsi.internal.core.xml.jaxp;
 
+import java.util.Hashtable;
+
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
 
-import java.util.Hashtable;
-
 /**
  * This class defines a factory API that enables us to obtain a parser
  * that produces DOM object trees from XML documents. Note this class 
diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/jaxp/DocumentBuilderImpl.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/jaxp/DocumentBuilderImpl.java
index 997606f1a..2858dd7cd 100644
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/jaxp/DocumentBuilderImpl.java
+++ b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/jaxp/DocumentBuilderImpl.java
@@ -11,12 +11,18 @@
 package org.eclipse.wst.wsi.internal.core.xml.jaxp;
 
 
-import org.apache.xerces.impl.Constants;
-import org.apache.xerces.dom.DocumentImpl;
+import java.io.IOException;
+import java.util.Enumeration;
+import java.util.Hashtable;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+
 import org.apache.xerces.dom.DOMImplementationImpl;
+import org.apache.xerces.dom.DocumentImpl;
+import org.apache.xerces.impl.Constants;
 import org.eclipse.wst.wsi.internal.core.xml.XMLUtils;
 import org.eclipse.wst.wsi.internal.core.xml.dom.DOMParser;
-
 import org.w3c.dom.DOMImplementation;
 import org.w3c.dom.Document;
 import org.xml.sax.EntityResolver;
@@ -25,13 +31,6 @@ import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
 import org.xml.sax.helpers.DefaultHandler;
 
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-
-import java.io.IOException;
-import java.util.Hashtable;
-import java.util.Enumeration;
-
 /**
  * Using this class, we can obtain a Document from XML. This class is a 
  * specialization of javax.xml.parsers.DocumentBuilder.
diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/schema/TargetNamespaceProcessor.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/schema/TargetNamespaceProcessor.java
index 26e2d62ee..0879aa301 100644
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/schema/TargetNamespaceProcessor.java
+++ b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/schema/TargetNamespaceProcessor.java
@@ -16,7 +16,6 @@ import org.eclipse.wst.wsi.internal.core.WSIException;
 import org.eclipse.wst.wsi.internal.core.util.TestUtils;
 import org.eclipse.wst.wsi.internal.core.xml.XMLDocumentCache;
 import org.eclipse.wst.wsi.internal.core.xml.XMLUtils;
-
 import org.w3c.dom.Attr;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/schema/XMLSchemaProcessor.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/schema/XMLSchemaProcessor.java
index 90fb71ca6..cfa42a81c 100644
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/schema/XMLSchemaProcessor.java
+++ b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/schema/XMLSchemaProcessor.java
@@ -10,21 +10,20 @@
  *******************************************************************************/
 package org.eclipse.wst.wsi.internal.core.xml.schema;
 
+import java.util.List;
+import java.util.Vector;
+
 import org.eclipse.wst.wsi.internal.core.WSIException;
 import org.eclipse.wst.wsi.internal.core.util.TestUtils;
 import org.eclipse.wst.wsi.internal.core.xml.XMLDocumentCache;
 import org.eclipse.wst.wsi.internal.core.xml.XMLDocumentCacheUser;
 import org.eclipse.wst.wsi.internal.core.xml.XMLTags;
 import org.eclipse.wst.wsi.internal.core.xml.XMLUtils;
-
 import org.w3c.dom.Attr;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 
-import java.util.List;
-import java.util.Vector;
-
 /**
  * This abstract class is used to process an XML Schema.
  * 
diff --git a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/schema/XMLSchemaValidator.java b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/schema/XMLSchemaValidator.java
index 865e51cea..d235d9680 100644
--- a/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/schema/XMLSchemaValidator.java
+++ b/bundles/org.eclipse.wst.wsi/wsicore/org/eclipse/wst/wsi/internal/core/xml/schema/XMLSchemaValidator.java
@@ -10,20 +10,20 @@
  *******************************************************************************/
 package org.eclipse.wst.wsi.internal.core.xml.schema;
 
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
 import org.eclipse.wst.wsi.internal.core.WSIException;
 import org.eclipse.wst.wsi.internal.core.util.TestUtils;
 import org.eclipse.wst.wsi.internal.core.xml.XMLDocumentCache;
 import org.eclipse.wst.wsi.internal.core.xml.XMLUtils;
-
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
-import com.ibm.wsdl.util.xml.DOM2Writer;
 
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
+import com.ibm.wsdl.util.xml.DOM2Writer;
 
 /**
  * This class is used to validate an XML Schema.
diff --git a/bundles/org.eclipse.wst.wsi/wsivalidate/org/eclipse/wst/wsi/internal/URIEncoder.java b/bundles/org.eclipse.wst.wsi/wsivalidate/org/eclipse/wst/wsi/internal/URIEncoder.java
index a389ed1e8..a18af8037 100644
--- a/bundles/org.eclipse.wst.wsi/wsivalidate/org/eclipse/wst/wsi/internal/URIEncoder.java
+++ b/bundles/org.eclipse.wst.wsi/wsivalidate/org/eclipse/wst/wsi/internal/URIEncoder.java
@@ -11,11 +11,12 @@
 
 package org.eclipse.wst.wsi.internal;
 
-import java.io.ByteArrayOutputStream;
 import java.io.BufferedWriter;
-import java.io.OutputStreamWriter;
+import java.io.ByteArrayOutputStream;
 import java.io.IOException;
+import java.io.OutputStreamWriter;
 import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
 import java.util.BitSet;
 
 /**
diff --git a/bundles/org.eclipse.wst.wsi/wsivalidate/org/eclipse/wst/wsi/internal/WSITestToolsProperties.java b/bundles/org.eclipse.wst.wsi/wsivalidate/org/eclipse/wst/wsi/internal/WSITestToolsProperties.java
index a33e5de0a..9af73940e 100644
--- a/bundles/org.eclipse.wst.wsi/wsivalidate/org/eclipse/wst/wsi/internal/WSITestToolsProperties.java
+++ b/bundles/org.eclipse.wst.wsi/wsivalidate/org/eclipse/wst/wsi/internal/WSITestToolsProperties.java
@@ -17,10 +17,9 @@ import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.Path;
-import org.eclipse.wst.wsi.internal.core.util.WSIProperties;
-
 import org.eclipse.wst.ws.internal.ui.plugin.WSUIPlugin;
 import org.eclipse.wst.ws.internal.ui.wsi.preferences.PersistentWSIContext;
+import org.eclipse.wst.wsi.internal.core.util.WSIProperties;
 
 /**
  * WS-I test tools property.
diff --git a/bundles/org.eclipse.wst.wsi/wsivalidate/org/eclipse/wst/wsi/internal/analyzer/MessageAnalyzer.java b/bundles/org.eclipse.wst.wsi/wsivalidate/org/eclipse/wst/wsi/internal/analyzer/MessageAnalyzer.java
index 653e318f2..141dd2bbb 100644
--- a/bundles/org.eclipse.wst.wsi/wsivalidate/org/eclipse/wst/wsi/internal/analyzer/MessageAnalyzer.java
+++ b/bundles/org.eclipse.wst.wsi/wsivalidate/org/eclipse/wst/wsi/internal/analyzer/MessageAnalyzer.java
@@ -17,10 +17,9 @@ import java.util.Map;
 import java.util.Vector;
 
 import org.eclipse.wst.wsi.internal.URIEncoder;
-import org.eclipse.wst.wsi.internal.core.WSIException;
 import org.eclipse.wst.wsi.internal.WSIPreferences;
 import org.eclipse.wst.wsi.internal.WSITestToolsProperties;
-import org.eclipse.wst.wsi.internal.analyzer.WSIAnalyzerException;
+import org.eclipse.wst.wsi.internal.core.WSIException;
 import org.eclipse.wst.wsi.internal.core.analyzer.config.AnalyzerConfig;
 import org.eclipse.wst.wsi.internal.core.analyzer.config.AssertionResultType;
 import org.eclipse.wst.wsi.internal.core.analyzer.config.AssertionResultsOption;
@@ -33,12 +32,12 @@ import org.eclipse.wst.wsi.internal.core.common.AddStyleSheet;
 import org.eclipse.wst.wsi.internal.core.common.impl.AddStyleSheetImpl;
 import org.eclipse.wst.wsi.internal.core.document.DocumentFactory;
 import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.report.AssertionError;
 import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
 import org.eclipse.wst.wsi.internal.core.report.Entry;
 import org.eclipse.wst.wsi.internal.core.report.impl.FailureDetailImpl;
 import org.eclipse.wst.wsi.internal.core.report.impl.ReportImpl;
 import org.eclipse.wst.wsi.internal.core.xml.dom.ElementLocation;
+import org.eclipse.wst.wsi.internal.report.AssertionError;
 
 /**
  * MessageAnalyzer
diff --git a/bundles/org.eclipse.wst.wsi/wsivalidate/org/eclipse/wst/wsi/internal/analyzer/WSDLAnalyzer.java b/bundles/org.eclipse.wst.wsi/wsivalidate/org/eclipse/wst/wsi/internal/analyzer/WSDLAnalyzer.java
index 5c6d408f9..2652f0ac1 100644
--- a/bundles/org.eclipse.wst.wsi/wsivalidate/org/eclipse/wst/wsi/internal/analyzer/WSDLAnalyzer.java
+++ b/bundles/org.eclipse.wst.wsi/wsivalidate/org/eclipse/wst/wsi/internal/analyzer/WSDLAnalyzer.java
@@ -19,7 +19,6 @@ import java.util.Vector;
 import org.eclipse.wst.wsi.internal.URIEncoder;
 import org.eclipse.wst.wsi.internal.WSIPreferences;
 import org.eclipse.wst.wsi.internal.WSITestToolsProperties;
-import org.eclipse.wst.wsi.internal.analyzer.WSIAnalyzerException;
 import org.eclipse.wst.wsi.internal.core.analyzer.config.AnalyzerConfig;
 import org.eclipse.wst.wsi.internal.core.analyzer.config.AssertionResultType;
 import org.eclipse.wst.wsi.internal.core.analyzer.config.AssertionResultsOption;
@@ -32,12 +31,12 @@ import org.eclipse.wst.wsi.internal.core.common.AddStyleSheet;
 import org.eclipse.wst.wsi.internal.core.common.impl.AddStyleSheetImpl;
 import org.eclipse.wst.wsi.internal.core.document.DocumentFactory;
 import org.eclipse.wst.wsi.internal.core.profile.TestAssertion;
-import org.eclipse.wst.wsi.internal.report.AssertionError;
 import org.eclipse.wst.wsi.internal.core.report.AssertionResult;
 import org.eclipse.wst.wsi.internal.core.report.Entry;
 import org.eclipse.wst.wsi.internal.core.report.impl.FailureDetailImpl;
 import org.eclipse.wst.wsi.internal.core.report.impl.ReportImpl;
 import org.eclipse.wst.wsi.internal.core.xml.dom.ElementLocation;
+import org.eclipse.wst.wsi.internal.report.AssertionError;
 
 /**
  * WSDLAnalyzer
diff --git a/bundles/org.eclipse.wst.wsi/wsivalidate/org/eclipse/wst/wsi/internal/analyzer/WSIBasicProfileAnalyzer.java b/bundles/org.eclipse.wst.wsi/wsivalidate/org/eclipse/wst/wsi/internal/analyzer/WSIBasicProfileAnalyzer.java
index 4d4074c10..fb9b92800 100644
--- a/bundles/org.eclipse.wst.wsi/wsivalidate/org/eclipse/wst/wsi/internal/analyzer/WSIBasicProfileAnalyzer.java
+++ b/bundles/org.eclipse.wst.wsi/wsivalidate/org/eclipse/wst/wsi/internal/analyzer/WSIBasicProfileAnalyzer.java
@@ -15,10 +15,10 @@ import java.util.List;
 import org.eclipse.wst.wsi.internal.core.ToolInfo;
 import org.eclipse.wst.wsi.internal.core.WSIException;
 import org.eclipse.wst.wsi.internal.core.analyzer.BasicProfileAnalyzer;
-import org.eclipse.wst.wsi.internal.document.DocumentFactoryImpl;
 import org.eclipse.wst.wsi.internal.core.profile.validator.ProfileValidatorFactory;
 import org.eclipse.wst.wsi.internal.core.report.Report;
 import org.eclipse.wst.wsi.internal.core.util.MessageList;
+import org.eclipse.wst.wsi.internal.document.DocumentFactoryImpl;
 
 /**
  * WSIBasicProfileAnalyzer
diff --git a/bundles/org.eclipse.wst.wsi/wsivalidate/org/eclipse/wst/wsi/internal/validate/wsdl/WSDLValidator.java b/bundles/org.eclipse.wst.wsi/wsivalidate/org/eclipse/wst/wsi/internal/validate/wsdl/WSDLValidator.java
index b86b422a2..d59c020d4 100644
--- a/bundles/org.eclipse.wst.wsi/wsivalidate/org/eclipse/wst/wsi/internal/validate/wsdl/WSDLValidator.java
+++ b/bundles/org.eclipse.wst.wsi/wsivalidate/org/eclipse/wst/wsi/internal/validate/wsdl/WSDLValidator.java
@@ -32,7 +32,6 @@ import org.eclipse.wst.wsdl.validation.internal.wsdl11.WSDL11ValidationInfoImpl;
 import org.eclipse.wst.wsdl.validation.internal.wsdl11.WSDLDocument;
 import org.eclipse.wst.wsdl.validation.internal.wsdl11.WSDLReaderImpl;
 import org.eclipse.wst.wsi.internal.WSIPreferences;
-import org.eclipse.wst.wsi.internal.WSITestToolsPlugin;
 import org.eclipse.wst.wsi.internal.WSITestToolsProperties;
 import org.eclipse.wst.wsi.internal.analyzer.WSDLAnalyzer;
 import org.eclipse.wst.wsi.internal.analyzer.WSIAnalyzerException;