svn commit: r961914 [1/2] - in /incubator/wink/trunk: wink-client-apache-httpclient/src/main/java/org/apache/wink/client/ wink-client/src/main/java/org/apache/wink/client/ wink-client/src/main/java/org/apache/wink/client/handlers/ wink-client/src/test/...

[ro...@apache.org]

Author: rott
Date: Thu Jul  8 20:06:08 2010
New Revision: 961914

URL: http://svn.apache.org/viewvc?rev=961914&view=rev
Log:
use Eclipse organize imports to clean up imports in all .java files.  This may help performance, and certainly helps clean up the code within IDEs.

Modified:
    incubator/wink/trunk/wink-client-apache-httpclient/src/main/java/org/apache/wink/client/ApacheHttpClientConfig.java
    incubator/wink/trunk/wink-client/src/main/java/org/apache/wink/client/RestClient.java
    incubator/wink/trunk/wink-client/src/main/java/org/apache/wink/client/handlers/ClientHandler.java
    incubator/wink/trunk/wink-client/src/test/java/org/apache/wink/client/ClientTest.java
    incubator/wink/trunk/wink-client/src/test/java/org/apache/wink/client/HandlersTest.java
    incubator/wink/trunk/wink-client/src/test/java/org/apache/wink/client/utils/DiffIgnoreUpdateWithAttributeQualifier.java
    incubator/wink/trunk/wink-client/src/test/java/org/apache/wink/client/utils/DiffWithAttributeQualifier.java
    incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/ResponseImpl.java
    incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/application/ApplicationFileLoader.java
    incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/application/ApplicationValidator.java
    incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/application/SimpleWinkApplication.java
    incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/lifecycle/DefaultLifecycleManager.java
    incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/model/admin/AcceptMediaTypes.java
    incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/model/admin/MatrixParameters.java
    incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/model/admin/Methods.java
    incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/model/admin/ProducedMediaTypes.java
    incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/model/admin/QueryParameters.java
    incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/model/admin/Resource.java
    incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/model/admin/Resources.java
    incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/model/admin/SubResources.java
    incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/AssetProvider.java
    incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/registry/metadata/ResourceMetadataCollector.java
    incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/utils/DomHelper.java
    incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/model/atom/AtomCommonAttributes.java
    incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/model/atom/AtomCommonAttributesSimpleContent.java
    incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/model/opensearch/ObjectFactory.java
    incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/model/opensearch/OpenSearchQuery.java
    incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/model/rss/RssSkipDays.java
    incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/model/rss/RssSkipHours.java
    incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/http/HttpStatusTest.java
    incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/MultivaluedMapImplTest.java
    incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/PathSegmentImplTest.java
    incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/ResponseImplTest.java
    incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/VariantListBuilderImplTest.java
    incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/application/ApplicationFileLoaderTest.java
    incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/application/ApplicationValidatorTest.java
    incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/application/SimpleWinkApplicationTest.java
    incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/http/AcceptHeaderTest.java
    incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/http/AcceptLanguageHeaderTest.java
    incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/lifecycle/DefaultOFFactoryTest.java
    incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/lifecycle/OFFactoryTest.java
    incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/lifecycle/ScopableOFFactoryTest.java
    incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/providers/ProvidersContextResolverTest.java
    incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/providers/ProvidersErrorMapperTest.java
    incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/providers/entity/CsvProvidersTest.java
    incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/providers/entity/DataSourceProviderTest.java
    incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/providers/entity/FileProviderTest.java
    incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/providers/entity/ProvidersMessageBodyTest.java
    incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/providers/entity/ReaderProviderTest.java
    incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/providers/header/AcceptCharsetHeaderDelegateTest.java
    incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/providers/header/CacheControlHeaderDelegateTest.java
    incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/providers/header/ContentDispositionHeaderDelegateTest.java
    incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/providers/header/DateHeaderDelegateTest.java
    incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/providers/header/EntityTagHeaderDelegateTest.java
    incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/providers/multipart/TestMultiPartParser.java
    incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/registry/ProvidersRegistryTest.java
    incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/utils/ExceptionHelperTest.java
    incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/utils/GenericsUtilsTest.java
    incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/utils/StringUtilsTest.java
    incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/utils/UriHelperTest.java
    incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/uri/BitWorkingUriTemplateProcessorTest.java
    incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/uri/JaxRsUriTemplateProcessorTest.java
    incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/uri/UriEncoderTest.java
    incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/uri/UriPathNormalizerTest.java
    incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/utils/ProviderUtilsTest.java
    incubator/wink/trunk/wink-component-test-support/src/main/java/org/apache/wink/test/diff/DiffWithAttributeQualifier.java
    incubator/wink/trunk/wink-examples/apps/Bookmarks/src/main/java/org/apache/wink/example/bookmarks/BookmarkStore.java
    incubator/wink/trunk/wink-examples/apps/QADefect/src/main/java/org/apache/wink/example/qadefect/legacy/DataStore.java
    incubator/wink/trunk/wink-examples/apps/QADefect/src/main/java/org/apache/wink/example/qadefect/resources/DefectTestsResource.java
    incubator/wink/trunk/wink-examples/apps/QADefect/src/main/java/org/apache/wink/example/qadefect/resources/DefectsResource.java
    incubator/wink/trunk/wink-examples/apps/QADefect/src/main/java/org/apache/wink/example/qadefect/resources/TestsResource.java
    incubator/wink/trunk/wink-examples/apps/SimpleDefects/src/main/java/org/apache/wink/example/simpledefects/resources/DefectsResource.java
    incubator/wink/trunk/wink-examples/client/ReadRSS-client/src/main/java/org/apache/wink/example/ReadRSSClient.java
    incubator/wink/trunk/wink-examples/core/Preconditions/src/main/java/org/apache/wink/example/locking/store/DataStore.java
    incubator/wink/trunk/wink-examples/ext/DynamicResource/src/main/java/org/apache/wink/example/dynamicresource/BookmarkStore.java
    incubator/wink/trunk/wink-examples/ext/MultiPart/src/test/java/org/apache/wink/example/multipart/MultiPartTest.java
    incubator/wink/trunk/wink-examples/ext/Spring/src/main/java/org/apache/wink/example/bookmarks/BookmarkStore.java
    incubator/wink/trunk/wink-examples/ext/WebDAV/src/main/java/org/apache/wink/example/webdav/WebDAVDefectsResource.java
    incubator/wink/trunk/wink-itests/wink-itest/wink-example-helloworld/src/test/java/org/apache/wink/example/helloworld/HelloWorldTest.java
    incubator/wink/trunk/wink-itests/wink-itest/wink-itest-client/src/test/java/org/apache/wink/itest/client/NoAcceptHeaderHandlerTest.java
    incubator/wink/trunk/wink-itests/wink-itest/wink-itest-context/src/main/java/org/apache/wink/itest/request/RequestResource.java
    incubator/wink/trunk/wink-itests/wink-itest/wink-itest-context/src/test/java/org/apache/wink/itest/uriinfo/URIInfoDetailedMethodTest.java
    incubator/wink/trunk/wink-itests/wink-itest/wink-itest-extra-providers/src/main/java/org/apache/wink/jaxrs/test/atom/Blog.java
    incubator/wink/trunk/wink-itests/wink-itest/wink-itest-extra-providers/src/main/java/org/apache/wink/jaxrs/test/atom/Comment.java
    incubator/wink/trunk/wink-itests/wink-itest/wink-itest-params/src/test/java/org/apache/wink/itest/HeaderParamTest.java
    incubator/wink/trunk/wink-itests/wink-itest/wink-itest-params/src/test/java/org/apache/wink/itest/QueryParamTest.java
    incubator/wink/trunk/wink-itests/wink-itest/wink-itest-providers/src/main/java/org/apache/wink/itest/exceptionmappers/nomapper/Guestbook.java
    incubator/wink/trunk/wink-itests/wink-itest/wink-itest-providers/src/test/java/org/apache/wink/itest/contextresolver/ContextTest.java
    incubator/wink/trunk/wink-itests/wink-itest/wink-itest-providers/src/test/java/org/apache/wink/itest/contextresolver/DepartmentTest.java
    incubator/wink/trunk/wink-itests/wink-itest/wink-itest-providers/src/test/java/org/apache/wink/itest/readerexceptions/JAXRSMessageBodyReaderExceptionsTest.java
    incubator/wink/trunk/wink-itests/wink-itest/wink-itest-providers/src/test/java/org/apache/wink/itest/standard/JAXRSMultivaluedMapTest.java
    incubator/wink/trunk/wink-itests/wink-itest/wink-itest-providers/src/test/java/org/apache/wink/itest/standard/JAXRSReaderTest.java
    incubator/wink/trunk/wink-itests/wink-itest/wink-itest-providers/src/test/java/org/apache/wink/itest/writerexceptions/JAXRSMessageBodyWriterExceptionThrownTest.java
    incubator/wink/trunk/wink-itests/wink-itest/wink-itest-targeting/src/main/java/org/apache/wink/itest/cache/Application.java
    incubator/wink/trunk/wink-itests/wink-itest/wink-itest-targeting/src/test/java/org/apache/wink/itest/cachetest/NewsWinkClient.java
    incubator/wink/trunk/wink-itests/wink-itest/wink-itest-validation/src/test/java/org/apache/wink/itest/constructors/ConstructorTest.java
    incubator/wink/trunk/wink-providers/wink-json-provider/src/main/java/org/apache/wink/providers/json/JSONUtils.java
    incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/application/ApplicationProcessor.java
    incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/handlers/PopulateErrorResponseHandler.java
    incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/handlers/PopulateResponseMediaTypeHandler.java
    incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/servlet/WebSphereParametersFilter.java
    incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/utils/LinkBuildersImpl.java
    incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/utils/ServletFileLoader.java
    incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/utils/SystemLinksBuilderImpl.java
    incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/MethodOverrideTest.java
    incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/WebSphereParametersTest.java
    incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/application/ApplicationProcessorTest.java
    incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/application/ServletWinkApplicationTest.java
    incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/handlers/HandlersChainTest.java
    incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/providers/entity/JAXBCollectionXMLProviderTest.java
    incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/providers/entity/JAXBElementProviderTest.java
    incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/providers/entity/JAXBUnmarshalNoOptionsTest.java
    incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/providers/entity/html/HtmlMockRequestDispatcher.java
    incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/registry/ResourceRecordFactoryTest.java
    incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/servlet/RestServletTest.java
    incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/utils/LinksBuilderTest.java
    incubator/wink/trunk/wink-spring-support/src/main/java/org/apache/wink/spring/internal/DependenciesInjectionPostProcessor.java
    incubator/wink/trunk/wink-spring-support/src/main/java/org/apache/wink/spring/internal/SpringLifecycleManager.java
    incubator/wink/trunk/wink-webdav/src/main/java/org/apache/wink/webdav/model/Creationdate.java
    incubator/wink/trunk/wink-webdav/src/main/java/org/apache/wink/webdav/model/Displayname.java
    incubator/wink/trunk/wink-webdav/src/main/java/org/apache/wink/webdav/model/Getcontentlanguage.java
    incubator/wink/trunk/wink-webdav/src/main/java/org/apache/wink/webdav/model/Getcontentlength.java
    incubator/wink/trunk/wink-webdav/src/main/java/org/apache/wink/webdav/model/Getcontenttype.java
    incubator/wink/trunk/wink-webdav/src/main/java/org/apache/wink/webdav/model/Getetag.java
    incubator/wink/trunk/wink-webdav/src/main/java/org/apache/wink/webdav/model/Keepalive.java
    incubator/wink/trunk/wink-webdav/src/main/java/org/apache/wink/webdav/model/Link.java
    incubator/wink/trunk/wink-webdav/src/main/java/org/apache/wink/webdav/model/Lockdiscovery.java
    incubator/wink/trunk/wink-webdav/src/main/java/org/apache/wink/webdav/model/Locktoken.java
    incubator/wink/trunk/wink-webdav/src/main/java/org/apache/wink/webdav/model/Owner.java
    incubator/wink/trunk/wink-webdav/src/main/java/org/apache/wink/webdav/model/Resourcetype.java
    incubator/wink/trunk/wink-webdav/src/main/java/org/apache/wink/webdav/model/Source.java
    incubator/wink/trunk/wink-webdav/src/main/java/org/apache/wink/webdav/model/Supportedlock.java
    incubator/wink/trunk/wink-webdav/src/main/java/org/apache/wink/webdav/server/WebDAVResponseBuilder.java
    incubator/wink/trunk/wink-webdav/src/test/java/org/apache/wink/webdav/model/WebDAVMultistatusTest.java
    incubator/wink/trunk/wink-webdav/src/test/java/org/apache/wink/webdav/model/WebDAVPropfindTest.java
    incubator/wink/trunk/wink-webdav/src/test/java/org/apache/wink/webdav/model/WebDAVProppatchTest.java
    incubator/wink/trunk/wink-webdav/src/test/java/org/apache/wink/webdav/server/WebDAVCollectionResource.java
    incubator/wink/trunk/wink-webdav/src/test/java/org/apache/wink/webdav/server/WebDAVDocumentResource.java
    incubator/wink/trunk/wink-webdav/src/test/java/org/apache/wink/webdav/server/WebDAVRootResourceTest.java
    incubator/wink/trunk/wink-webdav/src/test/java/org/apache/wink/webdav/server/WebDAVTestCollectionResource.java
    incubator/wink/trunk/wink-webdav/src/test/java/org/apache/wink/webdav/server/WebDAVTestDocumentResource.java

Modified: incubator/wink/trunk/wink-client-apache-httpclient/src/main/java/org/apache/wink/client/ApacheHttpClientConfig.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-client-apache-httpclient/src/main/java/org/apache/wink/client/ApacheHttpClientConfig.java?rev=961914&r1=961913&r2=961914&view=diff
==============================================================================
--- incubator/wink/trunk/wink-client-apache-httpclient/src/main/java/org/apache/wink/client/ApacheHttpClientConfig.java (original)
+++ incubator/wink/trunk/wink-client-apache-httpclient/src/main/java/org/apache/wink/client/ApacheHttpClientConfig.java Thu Jul  8 20:06:08 2010
@@ -21,8 +21,6 @@
 package org.apache.wink.client;
 
 import org.apache.http.client.HttpClient;
-
-import org.apache.wink.client.ClientConfig;
 import org.apache.wink.client.handlers.ConnectionHandler;
 import org.apache.wink.client.internal.handlers.ApacheHttpClientConnectionHandler;
 

Modified: incubator/wink/trunk/wink-client/src/main/java/org/apache/wink/client/RestClient.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-client/src/main/java/org/apache/wink/client/RestClient.java?rev=961914&r1=961913&r2=961914&view=diff
==============================================================================
--- incubator/wink/trunk/wink-client/src/main/java/org/apache/wink/client/RestClient.java (original)
+++ incubator/wink/trunk/wink-client/src/main/java/org/apache/wink/client/RestClient.java Thu Jul  8 20:06:08 2010
@@ -25,8 +25,6 @@ import java.util.Set;
 
 import javax.ws.rs.core.Application;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.apache.wink.client.internal.ResourceImpl;
 import org.apache.wink.common.WinkApplication;
 import org.apache.wink.common.internal.application.ApplicationValidator;
@@ -35,6 +33,8 @@ import org.apache.wink.common.internal.l
 import org.apache.wink.common.internal.lifecycle.ScopeLifecycleManager;
 import org.apache.wink.common.internal.registry.ProvidersRegistry;
 import org.apache.wink.common.internal.registry.metadata.ProviderMetadataCollector;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * The RestClient is the entry point for all rest service operations. The

Modified: incubator/wink/trunk/wink-client/src/main/java/org/apache/wink/client/handlers/ClientHandler.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-client/src/main/java/org/apache/wink/client/handlers/ClientHandler.java?rev=961914&r1=961913&r2=961914&view=diff
==============================================================================
--- incubator/wink/trunk/wink-client/src/main/java/org/apache/wink/client/handlers/ClientHandler.java (original)
+++ incubator/wink/trunk/wink-client/src/main/java/org/apache/wink/client/handlers/ClientHandler.java Thu Jul  8 20:06:08 2010
@@ -22,6 +22,7 @@ package org.apache.wink.client.handlers;
 
 import org.apache.wink.client.ClientRequest;
 import org.apache.wink.client.ClientResponse;
+import org.apache.wink.client.ClientRuntimeException;
 
 /**
  * Interface that all client handlers must implement

Modified: incubator/wink/trunk/wink-client/src/test/java/org/apache/wink/client/ClientTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-client/src/test/java/org/apache/wink/client/ClientTest.java?rev=961914&r1=961913&r2=961914&view=diff
==============================================================================
--- incubator/wink/trunk/wink-client/src/test/java/org/apache/wink/client/ClientTest.java (original)
+++ incubator/wink/trunk/wink-client/src/test/java/org/apache/wink/client/ClientTest.java Thu Jul  8 20:06:08 2010
@@ -39,12 +39,6 @@ import javax.ws.rs.ext.MessageBodyReader
 import javax.ws.rs.ext.MessageBodyWriter;
 import javax.ws.rs.ext.Provider;
 
-import org.apache.wink.client.ClientConfig;
-import org.apache.wink.client.ClientResponse;
-import org.apache.wink.client.ClientWebException;
-import org.apache.wink.client.EntityType;
-import org.apache.wink.client.Resource;
-import org.apache.wink.client.RestClient;
 import org.apache.wink.common.utils.ProviderUtils;
 
 public class ClientTest extends BaseTest {

Modified: incubator/wink/trunk/wink-client/src/test/java/org/apache/wink/client/HandlersTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-client/src/test/java/org/apache/wink/client/HandlersTest.java?rev=961914&r1=961913&r2=961914&view=diff
==============================================================================
--- incubator/wink/trunk/wink-client/src/test/java/org/apache/wink/client/HandlersTest.java (original)
+++ incubator/wink/trunk/wink-client/src/test/java/org/apache/wink/client/HandlersTest.java Thu Jul  8 20:06:08 2010
@@ -25,11 +25,6 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 
-import org.apache.wink.client.ClientConfig;
-import org.apache.wink.client.ClientRequest;
-import org.apache.wink.client.ClientResponse;
-import org.apache.wink.client.Resource;
-import org.apache.wink.client.RestClient;
 import org.apache.wink.client.handlers.ClientHandler;
 import org.apache.wink.client.handlers.HandlerContext;
 import org.apache.wink.client.handlers.InputStreamAdapter;

Modified: incubator/wink/trunk/wink-client/src/test/java/org/apache/wink/client/utils/DiffIgnoreUpdateWithAttributeQualifier.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-client/src/test/java/org/apache/wink/client/utils/DiffIgnoreUpdateWithAttributeQualifier.java?rev=961914&r1=961913&r2=961914&view=diff
==============================================================================
--- incubator/wink/trunk/wink-client/src/test/java/org/apache/wink/client/utils/DiffIgnoreUpdateWithAttributeQualifier.java (original)
+++ incubator/wink/trunk/wink-client/src/test/java/org/apache/wink/client/utils/DiffIgnoreUpdateWithAttributeQualifier.java Thu Jul  8 20:06:08 2010
@@ -20,13 +20,6 @@
 
 package org.apache.wink.client.utils;
 
-import org.custommonkey.xmlunit.Difference;
-import org.custommonkey.xmlunit.DifferenceListener;
-import org.custommonkey.xmlunit.NodeDetail;
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-import org.xml.sax.SAXException;
-
 import java.io.IOException;
 import java.util.HashSet;
 import java.util.Set;
@@ -35,6 +28,13 @@ import javax.xml.datatype.DatatypeConfig
 import javax.xml.datatype.DatatypeFactory;
 import javax.xml.datatype.XMLGregorianCalendar;
 
+import org.custommonkey.xmlunit.Difference;
+import org.custommonkey.xmlunit.DifferenceListener;
+import org.custommonkey.xmlunit.NodeDetail;
+import org.w3c.dom.Document;
+import org.w3c.dom.Node;
+import org.xml.sax.SAXException;
+
 /**
  * Class that overrides XmlUnit DiffWithAttributeQualifier class. It is
  * designated to ignore fields with time values, like "updated".

Modified: incubator/wink/trunk/wink-client/src/test/java/org/apache/wink/client/utils/DiffWithAttributeQualifier.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-client/src/test/java/org/apache/wink/client/utils/DiffWithAttributeQualifier.java?rev=961914&r1=961913&r2=961914&view=diff
==============================================================================
--- incubator/wink/trunk/wink-client/src/test/java/org/apache/wink/client/utils/DiffWithAttributeQualifier.java (original)
+++ incubator/wink/trunk/wink-client/src/test/java/org/apache/wink/client/utils/DiffWithAttributeQualifier.java Thu Jul  8 20:06:08 2010
@@ -20,13 +20,13 @@
 
 package org.apache.wink.client.utils;
 
+import java.io.IOException;
+
 import org.custommonkey.xmlunit.Diff;
 import org.custommonkey.xmlunit.ElementNameAndAttributeQualifier;
 import org.w3c.dom.Document;
 import org.xml.sax.SAXException;
 
-import java.io.IOException;
-
 /**
  * Class that overrides XmlUnit Diff class. Only Elements with the same name as
  * well as the same values for all attributes qualify. The order of elements is

Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/ResponseImpl.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/ResponseImpl.java?rev=961914&r1=961913&r2=961914&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/ResponseImpl.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/ResponseImpl.java Thu Jul  8 20:06:08 2010
@@ -37,7 +37,6 @@ import javax.ws.rs.core.Variant;
 
 import org.apache.wink.common.RuntimeContext;
 import org.apache.wink.common.internal.runtime.RuntimeContextTLS;
-import org.apache.wink.common.internal.utils.HeaderUtils;
 
 public class ResponseImpl extends Response {
 

Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/application/ApplicationFileLoader.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/application/ApplicationFileLoader.java?rev=961914&r1=961913&r2=961914&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/application/ApplicationFileLoader.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/application/ApplicationFileLoader.java Thu Jul  8 20:06:08 2010
@@ -31,13 +31,13 @@ import java.util.Set;
 
 import javax.ws.rs.WebApplicationException;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.apache.wink.common.internal.i18n.Messages;
 import org.apache.wink.common.internal.registry.metadata.ProviderMetadataCollector;
 import org.apache.wink.common.internal.registry.metadata.ResourceMetadataCollector;
 import org.apache.wink.common.internal.utils.ClassUtils;
 import org.apache.wink.common.internal.utils.FileLoader;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * <p>

Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/application/ApplicationValidator.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/application/ApplicationValidator.java?rev=961914&r1=961913&r2=961914&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/application/ApplicationValidator.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/application/ApplicationValidator.java Thu Jul  8 20:06:08 2010
@@ -25,12 +25,12 @@ import java.util.Set;
 import javax.ws.rs.Path;
 import javax.ws.rs.ext.Provider;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.apache.wink.common.DynamicResource;
 import org.apache.wink.common.internal.i18n.Messages;
 import org.apache.wink.common.internal.registry.metadata.ProviderMetadataCollector;
 import org.apache.wink.common.internal.registry.metadata.ResourceMetadataCollector;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Used to validate classes and objects returned by the Application.

Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/application/SimpleWinkApplication.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/application/SimpleWinkApplication.java?rev=961914&r1=961913&r2=961914&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/application/SimpleWinkApplication.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/application/SimpleWinkApplication.java Thu Jul  8 20:06:08 2010
@@ -24,11 +24,11 @@ import java.io.InputStream;
 import java.util.LinkedHashSet;
 import java.util.Set;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.apache.wink.common.WinkApplication;
 import org.apache.wink.common.internal.i18n.Messages;
 import org.apache.wink.common.internal.utils.FileLoader;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * <p>

Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/lifecycle/DefaultLifecycleManager.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/lifecycle/DefaultLifecycleManager.java?rev=961914&r1=961913&r2=961914&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/lifecycle/DefaultLifecycleManager.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/lifecycle/DefaultLifecycleManager.java Thu Jul  8 20:06:08 2010
@@ -19,12 +19,12 @@
  *******************************************************************************/
 package org.apache.wink.common.internal.lifecycle;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.apache.wink.common.internal.i18n.Messages;
 import org.apache.wink.common.internal.registry.metadata.ApplicationMetadataCollector;
 import org.apache.wink.common.internal.registry.metadata.ProviderMetadataCollector;
 import org.apache.wink.common.internal.registry.metadata.ResourceMetadataCollector;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * <p>

Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/model/admin/AcceptMediaTypes.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/model/admin/AcceptMediaTypes.java?rev=961914&r1=961913&r2=961914&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/model/admin/AcceptMediaTypes.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/model/admin/AcceptMediaTypes.java Thu Jul  8 20:06:08 2010
@@ -28,6 +28,7 @@ package org.apache.wink.common.internal.
 
 import java.util.ArrayList;
 import java.util.List;
+
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;

Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/model/admin/MatrixParameters.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/model/admin/MatrixParameters.java?rev=961914&r1=961913&r2=961914&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/model/admin/MatrixParameters.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/model/admin/MatrixParameters.java Thu Jul  8 20:06:08 2010
@@ -28,6 +28,7 @@ package org.apache.wink.common.internal.
 
 import java.util.ArrayList;
 import java.util.List;
+
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlRootElement;

Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/model/admin/Methods.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/model/admin/Methods.java?rev=961914&r1=961913&r2=961914&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/model/admin/Methods.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/model/admin/Methods.java Thu Jul  8 20:06:08 2010
@@ -28,6 +28,7 @@ package org.apache.wink.common.internal.
 
 import java.util.ArrayList;
 import java.util.List;
+
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;

Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/model/admin/ProducedMediaTypes.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/model/admin/ProducedMediaTypes.java?rev=961914&r1=961913&r2=961914&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/model/admin/ProducedMediaTypes.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/model/admin/ProducedMediaTypes.java Thu Jul  8 20:06:08 2010
@@ -28,6 +28,7 @@ package org.apache.wink.common.internal.
 
 import java.util.ArrayList;
 import java.util.List;
+
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;

Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/model/admin/QueryParameters.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/model/admin/QueryParameters.java?rev=961914&r1=961913&r2=961914&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/model/admin/QueryParameters.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/model/admin/QueryParameters.java Thu Jul  8 20:06:08 2010
@@ -28,6 +28,7 @@ package org.apache.wink.common.internal.
 
 import java.util.ArrayList;
 import java.util.List;
+
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlRootElement;

Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/model/admin/Resource.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/model/admin/Resource.java?rev=961914&r1=961913&r2=961914&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/model/admin/Resource.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/model/admin/Resource.java Thu Jul  8 20:06:08 2010
@@ -27,6 +27,7 @@
 package org.apache.wink.common.internal.model.admin;
 
 import java.math.BigDecimal;
+
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;

Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/model/admin/Resources.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/model/admin/Resources.java?rev=961914&r1=961913&r2=961914&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/model/admin/Resources.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/model/admin/Resources.java Thu Jul  8 20:06:08 2010
@@ -28,6 +28,7 @@ package org.apache.wink.common.internal.
 
 import java.util.ArrayList;
 import java.util.List;
+
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlRootElement;

Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/model/admin/SubResources.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/model/admin/SubResources.java?rev=961914&r1=961913&r2=961914&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/model/admin/SubResources.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/model/admin/SubResources.java Thu Jul  8 20:06:08 2010
@@ -28,6 +28,7 @@ package org.apache.wink.common.internal.
 
 import java.util.ArrayList;
 import java.util.List;
+
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;

Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/AssetProvider.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/AssetProvider.java?rev=961914&r1=961913&r2=961914&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/AssetProvider.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/AssetProvider.java Thu Jul  8 20:06:08 2010
@@ -43,8 +43,6 @@ import javax.ws.rs.ext.MessageBodyWriter
 import javax.ws.rs.ext.Provider;
 import javax.ws.rs.ext.Providers;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.apache.wink.common.RuntimeContext;
 import org.apache.wink.common.annotations.Asset;
 import org.apache.wink.common.annotations.Scope;
@@ -57,6 +55,8 @@ import org.apache.wink.common.internal.r
 import org.apache.wink.common.internal.utils.AnnotationUtils;
 import org.apache.wink.common.internal.utils.GenericsUtils;
 import org.apache.wink.common.internal.utils.MediaTypeUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 @Scope(ScopeType.PROTOTYPE)
 @Provider

Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/registry/metadata/ResourceMetadataCollector.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/registry/metadata/ResourceMetadataCollector.java?rev=961914&r1=961913&r2=961914&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/registry/metadata/ResourceMetadataCollector.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/registry/metadata/ResourceMetadataCollector.java Thu Jul  8 20:06:08 2010
@@ -36,8 +36,6 @@ import javax.ws.rs.Path;
 import javax.ws.rs.Produces;
 import javax.ws.rs.core.MediaType;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.apache.wink.common.DynamicResource;
 import org.apache.wink.common.annotations.Parent;
 import org.apache.wink.common.annotations.Workspace;
@@ -45,6 +43,8 @@ import org.apache.wink.common.internal.i
 import org.apache.wink.common.internal.registry.Injectable;
 import org.apache.wink.common.internal.registry.InjectableFactory;
 import org.apache.wink.common.internal.utils.AnnotationUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Collects ClassMetadata from JAX-RS Resource classes

Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/utils/DomHelper.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/utils/DomHelper.java?rev=961914&r1=961913&r2=961914&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/utils/DomHelper.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/utils/DomHelper.java Thu Jul  8 20:06:08 2010
@@ -20,20 +20,21 @@
 
 package org.apache.wink.common.internal.utils;
 
-import org.w3c.dom.Attr;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.Text;
-import org.w3c.dom.CharacterData;
-
-import javax.xml.namespace.QName;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
 
+import javax.xml.namespace.QName;
+
+import org.w3c.dom.Attr;
+import org.w3c.dom.CharacterData;
+import org.w3c.dom.Element;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+import org.w3c.dom.Text;
+
 public final class DomHelper {
 
     private static final String XMLNS_PREFIX              = "xmlns"; //$NON-NLS-1$

Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/model/atom/AtomCommonAttributes.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/model/atom/AtomCommonAttributes.java?rev=961914&r1=961913&r2=961914&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/model/atom/AtomCommonAttributes.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/model/atom/AtomCommonAttributes.java Thu Jul  8 20:06:08 2010
@@ -28,6 +28,7 @@ package org.apache.wink.common.model.ato
 
 import java.util.HashMap;
 import java.util.Map;
+
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAnyAttribute;

Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/model/atom/AtomCommonAttributesSimpleContent.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/model/atom/AtomCommonAttributesSimpleContent.java?rev=961914&r1=961913&r2=961914&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/model/atom/AtomCommonAttributesSimpleContent.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/model/atom/AtomCommonAttributesSimpleContent.java Thu Jul  8 20:06:08 2010
@@ -28,6 +28,7 @@ package org.apache.wink.common.model.ato
 
 import java.util.HashMap;
 import java.util.Map;
+
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAnyAttribute;

Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/model/opensearch/ObjectFactory.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/model/opensearch/ObjectFactory.java?rev=961914&r1=961913&r2=961914&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/model/opensearch/ObjectFactory.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/model/opensearch/ObjectFactory.java Thu Jul  8 20:06:08 2010
@@ -27,6 +27,7 @@
 package org.apache.wink.common.model.opensearch;
 
 import java.math.BigInteger;
+
 import javax.xml.bind.JAXBElement;
 import javax.xml.bind.annotation.XmlElementDecl;
 import javax.xml.bind.annotation.XmlRegistry;

Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/model/opensearch/OpenSearchQuery.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/model/opensearch/OpenSearchQuery.java?rev=961914&r1=961913&r2=961914&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/model/opensearch/OpenSearchQuery.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/model/opensearch/OpenSearchQuery.java Thu Jul  8 20:06:08 2010
@@ -29,6 +29,7 @@ package org.apache.wink.common.model.ope
 import java.math.BigInteger;
 import java.util.HashMap;
 import java.util.Map;
+
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAnyAttribute;

Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/model/rss/RssSkipDays.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/model/rss/RssSkipDays.java?rev=961914&r1=961913&r2=961914&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/model/rss/RssSkipDays.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/model/rss/RssSkipDays.java Thu Jul  8 20:06:08 2010
@@ -28,6 +28,7 @@ package org.apache.wink.common.model.rss
 
 import java.util.ArrayList;
 import java.util.List;
+
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlType;

Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/model/rss/RssSkipHours.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/model/rss/RssSkipHours.java?rev=961914&r1=961913&r2=961914&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/model/rss/RssSkipHours.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/model/rss/RssSkipHours.java Thu Jul  8 20:06:08 2010
@@ -28,6 +28,7 @@ package org.apache.wink.common.model.rss
 
 import java.util.ArrayList;
 import java.util.List;
+
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlType;

Modified: incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/http/HttpStatusTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/http/HttpStatusTest.java?rev=961914&r1=961913&r2=961914&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/http/HttpStatusTest.java (original)
+++ incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/http/HttpStatusTest.java Thu Jul  8 20:06:08 2010
@@ -22,9 +22,10 @@
  */
 package org.apache.wink.common.http;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
-import org.apache.wink.common.http.HttpStatus;
 import org.junit.Test;
 
 /**

Modified: incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/MultivaluedMapImplTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/MultivaluedMapImplTest.java?rev=961914&r1=961913&r2=961914&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/MultivaluedMapImplTest.java (original)
+++ incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/MultivaluedMapImplTest.java Thu Jul  8 20:06:08 2010
@@ -23,8 +23,6 @@ import java.util.List;
 
 import javax.ws.rs.core.MultivaluedMap;
 
-import org.apache.wink.common.internal.MultivaluedMapImpl;
-
 import junit.framework.TestCase;
 
 public class MultivaluedMapImplTest extends TestCase {

Modified: incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/PathSegmentImplTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/PathSegmentImplTest.java?rev=961914&r1=961913&r2=961914&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/PathSegmentImplTest.java (original)
+++ incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/PathSegmentImplTest.java Thu Jul  8 20:06:08 2010
@@ -23,8 +23,6 @@ package org.apache.wink.common.internal;
 import javax.ws.rs.core.MultivaluedMap;
 import javax.ws.rs.core.PathSegment;
 
-import org.apache.wink.common.internal.PathSegmentImpl;
-
 import junit.framework.TestCase;
 
 public class PathSegmentImplTest extends TestCase {

Modified: incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/ResponseImplTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/ResponseImplTest.java?rev=961914&r1=961913&r2=961914&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/ResponseImplTest.java (original)
+++ incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/ResponseImplTest.java Thu Jul  8 20:06:08 2010
@@ -19,7 +19,10 @@
  *******************************************************************************/
 package org.apache.wink.common.internal;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
 
 import java.net.URI;
 import java.util.Date;

Modified: incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/VariantListBuilderImplTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/VariantListBuilderImplTest.java?rev=961914&r1=961913&r2=961914&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/VariantListBuilderImplTest.java (original)
+++ incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/VariantListBuilderImplTest.java Thu Jul  8 20:06:08 2010
@@ -20,17 +20,15 @@
 
 package org.apache.wink.common.internal;
 
+import static org.junit.Assert.assertArrayEquals;
+
 import java.util.List;
 import java.util.Locale;
 
-import static org.junit.Assert.assertArrayEquals;
-
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Variant;
 import javax.ws.rs.core.Variant.VariantListBuilder;
 
-import org.apache.wink.common.internal.VariantListBuilderImpl;
-
 import junit.framework.TestCase;
 
 public class VariantListBuilderImplTest extends TestCase {

Modified: incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/application/ApplicationFileLoaderTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/application/ApplicationFileLoaderTest.java?rev=961914&r1=961913&r2=961914&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/application/ApplicationFileLoaderTest.java (original)
+++ incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/application/ApplicationFileLoaderTest.java Thu Jul  8 20:06:08 2010
@@ -21,15 +21,11 @@ package org.apache.wink.common.internal.
 
 import java.io.FileNotFoundException;
 import java.io.IOException;
-import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.Set;
-import java.util.logging.LogRecord;
 
 import junit.framework.TestCase;
 
-import org.apache.wink.logging.WinkLogHandler;
-
 public class ApplicationFileLoaderTest extends TestCase {
 
     public void testDefault() throws IOException {

Modified: incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/application/ApplicationValidatorTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/application/ApplicationValidatorTest.java?rev=961914&r1=961913&r2=961914&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/application/ApplicationValidatorTest.java (original)
+++ incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/application/ApplicationValidatorTest.java Thu Jul  8 20:06:08 2010
@@ -22,12 +22,11 @@ package org.apache.wink.common.internal.
 import javax.ws.rs.Path;
 import javax.ws.rs.ext.Provider;
 
+import junit.framework.TestCase;
+
 import org.apache.wink.common.AbstractDynamicResource;
-import org.apache.wink.common.internal.application.ApplicationValidator;
 import org.apache.wink.common.internal.providers.entity.FileProvider;
 
-import junit.framework.TestCase;
-
 public class ApplicationValidatorTest extends TestCase {
 
     @Path("/")

Modified: incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/application/SimpleWinkApplicationTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/application/SimpleWinkApplicationTest.java?rev=961914&r1=961913&r2=961914&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/application/SimpleWinkApplicationTest.java (original)
+++ incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/application/SimpleWinkApplicationTest.java Thu Jul  8 20:06:08 2010
@@ -21,12 +21,11 @@ package org.apache.wink.common.internal.
 
 import java.util.Set;
 
-import org.apache.wink.common.internal.application.SimpleWinkApplication;
+import junit.framework.TestCase;
+
 import org.apache.wink.common.internal.providers.entity.FileProvider;
 import org.apache.wink.common.internal.providers.entity.SourceProvider;
 
-import junit.framework.TestCase;
-
 public class SimpleWinkApplicationTest extends TestCase {
 
     public void testSimpleWinkApplication() {

Modified: incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/http/AcceptHeaderTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/http/AcceptHeaderTest.java?rev=961914&r1=961913&r2=961914&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/http/AcceptHeaderTest.java (original)
+++ incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/http/AcceptHeaderTest.java Thu Jul  8 20:06:08 2010
@@ -20,16 +20,15 @@
 
 package org.apache.wink.common.internal.http;
 
-import javax.ws.rs.core.MediaType;
+import java.util.ArrayList;
+import java.util.List;
 
-import org.apache.wink.common.internal.http.Accept;
-import org.apache.wink.common.internal.http.Accept.ValuedMediaType;
-import org.apache.wink.common.internal.utils.MediaTypeUtils;
+import javax.ws.rs.core.MediaType;
 
 import junit.framework.TestCase;
 
-import java.util.ArrayList;
-import java.util.List;
+import org.apache.wink.common.internal.http.Accept.ValuedMediaType;
+import org.apache.wink.common.internal.utils.MediaTypeUtils;
 
 /**
  * Unit test of accept header.

Modified: incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/http/AcceptLanguageHeaderTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/http/AcceptLanguageHeaderTest.java?rev=961914&r1=961913&r2=961914&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/http/AcceptLanguageHeaderTest.java (original)
+++ incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/http/AcceptLanguageHeaderTest.java Thu Jul  8 20:06:08 2010
@@ -20,12 +20,10 @@
 
 package org.apache.wink.common.internal.http;
 
-import junit.framework.TestCase;
-
-import java.util.Locale;
 import java.util.Arrays;
+import java.util.Locale;
 
-import org.apache.wink.common.internal.http.AcceptLanguage;
+import junit.framework.TestCase;
 
 /**
  * Unit test of AcceptLanguageHeader.

Modified: incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/lifecycle/DefaultOFFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/lifecycle/DefaultOFFactoryTest.java?rev=961914&r1=961913&r2=961914&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/lifecycle/DefaultOFFactoryTest.java (original)
+++ incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/lifecycle/DefaultOFFactoryTest.java Thu Jul  8 20:06:08 2010
@@ -19,10 +19,10 @@
  *******************************************************************************/
 package org.apache.wink.common.internal.lifecycle;
 
-import org.apache.wink.common.DynamicResource;
-import org.apache.wink.common.internal.lifecycle.DefaultLifecycleManager;
 import junit.framework.TestCase;
 
+import org.apache.wink.common.DynamicResource;
+
 /**
  * test scenarios not covered by OFFactoryTest
  */

Modified: incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/lifecycle/OFFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/lifecycle/OFFactoryTest.java?rev=961914&r1=961913&r2=961914&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/lifecycle/OFFactoryTest.java (original)
+++ incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/lifecycle/OFFactoryTest.java Thu Jul  8 20:06:08 2010
@@ -22,14 +22,10 @@ package org.apache.wink.common.internal.
 import javax.ws.rs.Path;
 import javax.ws.rs.ext.Provider;
 
+import junit.framework.TestCase;
+
 import org.apache.wink.common.annotations.Scope;
 import org.apache.wink.common.annotations.Scope.ScopeType;
-import org.apache.wink.common.internal.lifecycle.PrototypeObjectFactory;
-import org.apache.wink.common.internal.lifecycle.LifecycleManagersRegistry;
-import org.apache.wink.common.internal.lifecycle.ScopeLifecycleManager;
-import org.apache.wink.common.internal.lifecycle.SingletonObjectFactory;
-
-import junit.framework.TestCase;
 
 public class OFFactoryTest extends TestCase {
 

Modified: incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/lifecycle/ScopableOFFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/lifecycle/ScopableOFFactoryTest.java?rev=961914&r1=961913&r2=961914&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/lifecycle/ScopableOFFactoryTest.java (original)
+++ incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/lifecycle/ScopableOFFactoryTest.java Thu Jul  8 20:06:08 2010
@@ -19,8 +19,6 @@
  *******************************************************************************/
 package org.apache.wink.common.internal.lifecycle;
 
-import org.apache.wink.common.internal.lifecycle.ScopeLifecycleManager;
-
 import junit.framework.TestCase;
 
 /**

Modified: incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/providers/ProvidersContextResolverTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/providers/ProvidersContextResolverTest.java?rev=961914&r1=961913&r2=961914&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/providers/ProvidersContextResolverTest.java (original)
+++ incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/providers/ProvidersContextResolverTest.java Thu Jul  8 20:06:08 2010
@@ -27,12 +27,12 @@ import javax.ws.rs.core.MediaType;
 import javax.ws.rs.ext.ContextResolver;
 import javax.ws.rs.ext.Provider;
 
+import junit.framework.TestCase;
+
 import org.apache.wink.common.internal.application.ApplicationValidator;
 import org.apache.wink.common.internal.lifecycle.LifecycleManagersRegistry;
 import org.apache.wink.common.internal.registry.ProvidersRegistry;
 
-import junit.framework.TestCase;
-
 public class ProvidersContextResolverTest extends TestCase {
 
     public static class NotAProvider {

Modified: incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/providers/ProvidersErrorMapperTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/providers/ProvidersErrorMapperTest.java?rev=961914&r1=961913&r2=961914&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/providers/ProvidersErrorMapperTest.java (original)
+++ incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/providers/ProvidersErrorMapperTest.java Thu Jul  8 20:06:08 2010
@@ -25,6 +25,8 @@ import javax.ws.rs.core.Response;
 import javax.ws.rs.ext.ExceptionMapper;
 import javax.ws.rs.ext.Provider;
 
+import junit.framework.TestCase;
+
 import org.apache.wink.common.RestException;
 import org.apache.wink.common.annotations.Scope;
 import org.apache.wink.common.annotations.Scope.ScopeType;
@@ -32,8 +34,6 @@ import org.apache.wink.common.internal.a
 import org.apache.wink.common.internal.lifecycle.LifecycleManagersRegistry;
 import org.apache.wink.common.internal.registry.ProvidersRegistry;
 
-import junit.framework.TestCase;
-
 public class ProvidersErrorMapperTest extends TestCase {
 
     @Provider

Modified: incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/providers/entity/CsvProvidersTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/providers/entity/CsvProvidersTest.java?rev=961914&r1=961913&r2=961914&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/providers/entity/CsvProvidersTest.java (original)
+++ incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/providers/entity/CsvProvidersTest.java Thu Jul  8 20:06:08 2010
@@ -38,6 +38,8 @@ import javax.ws.rs.ext.MessageBodyReader
 import javax.ws.rs.ext.MessageBodyWriter;
 import javax.ws.rs.ext.Providers;
 
+import junit.framework.TestCase;
+
 import org.apache.wink.common.internal.MultivaluedMapImpl;
 import org.apache.wink.common.internal.providers.entity.csv.CsvDeserializerProvider;
 import org.apache.wink.common.internal.providers.entity.csv.CsvSerializerProvider;
@@ -51,8 +53,6 @@ import org.apache.wink.common.model.synd
 import org.apache.wink.common.model.synd.SyndFeed;
 import org.apache.wink.common.model.synd.SyndPerson;
 
-import junit.framework.TestCase;
-
 /**
  * 
  */

Modified: incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/providers/entity/DataSourceProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/providers/entity/DataSourceProviderTest.java?rev=961914&r1=961913&r2=961914&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/providers/entity/DataSourceProviderTest.java (original)
+++ incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/providers/entity/DataSourceProviderTest.java Thu Jul  8 20:06:08 2010
@@ -31,7 +31,6 @@ import java.io.InputStream;
 import javax.activation.DataSource;
 import javax.ws.rs.core.MediaType;
 
-import org.apache.wink.common.internal.providers.entity.DataSourceProvider;
 import org.junit.Test;
 
 public class DataSourceProviderTest {

Modified: incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/providers/entity/FileProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/providers/entity/FileProviderTest.java?rev=961914&r1=961913&r2=961914&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/providers/entity/FileProviderTest.java (original)
+++ incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/providers/entity/FileProviderTest.java Thu Jul  8 20:06:08 2010
@@ -19,19 +19,19 @@
  *******************************************************************************/
 package org.apache.wink.common.internal.providers.entity;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 
-import org.apache.wink.common.internal.providers.entity.FileProvider;
-import org.junit.Before;
-import org.junit.Test;
-
 import javax.ws.rs.WebApplicationException;
 import javax.ws.rs.core.MediaType;
 
+import org.junit.Before;
+import org.junit.Test;
+
 public class FileProviderTest {
     FileProvider fileProvider = null;
 

Modified: incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/providers/entity/ProvidersMessageBodyTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/providers/entity/ProvidersMessageBodyTest.java?rev=961914&r1=961913&r2=961914&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/providers/entity/ProvidersMessageBodyTest.java (original)
+++ incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/providers/entity/ProvidersMessageBodyTest.java Thu Jul  8 20:06:08 2010
@@ -35,19 +35,15 @@ import javax.ws.rs.ext.MessageBodyReader
 import javax.ws.rs.ext.MessageBodyWriter;
 import javax.ws.rs.ext.Provider;
 
+import junit.framework.TestCase;
+
 import org.apache.wink.common.WinkApplication;
 import org.apache.wink.common.annotations.Scope;
 import org.apache.wink.common.annotations.Scope.ScopeType;
 import org.apache.wink.common.internal.application.ApplicationValidator;
 import org.apache.wink.common.internal.lifecycle.LifecycleManagersRegistry;
-import org.apache.wink.common.internal.providers.entity.ByteArrayProvider;
-import org.apache.wink.common.internal.providers.entity.FileProvider;
-import org.apache.wink.common.internal.providers.entity.InputStreamProvider;
-import org.apache.wink.common.internal.providers.entity.StringProvider;
 import org.apache.wink.common.internal.registry.ProvidersRegistry;
 
-import junit.framework.TestCase;
-
 public class ProvidersMessageBodyTest extends TestCase {
 
     @Provider

Modified: incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/providers/entity/ReaderProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/providers/entity/ReaderProviderTest.java?rev=961914&r1=961913&r2=961914&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/providers/entity/ReaderProviderTest.java (original)
+++ incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/providers/entity/ReaderProviderTest.java Thu Jul  8 20:06:08 2010
@@ -19,6 +19,10 @@
  *******************************************************************************/
 package org.apache.wink.common.internal.providers.entity;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
 import java.io.BufferedReader;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -28,9 +32,7 @@ import java.io.StringReader;
 import java.io.UnsupportedEncodingException;
 
 import javax.ws.rs.core.MediaType;
-import static org.junit.Assert.*;
 
-import org.apache.wink.common.internal.providers.entity.ReaderProvider;
 import org.junit.Test;
 
 public class ReaderProviderTest {

Modified: incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/providers/header/AcceptCharsetHeaderDelegateTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/providers/header/AcceptCharsetHeaderDelegateTest.java?rev=961914&r1=961913&r2=961914&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/providers/header/AcceptCharsetHeaderDelegateTest.java (original)
+++ incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/providers/header/AcceptCharsetHeaderDelegateTest.java Thu Jul  8 20:06:08 2010
@@ -19,8 +19,10 @@
  */
 package org.apache.wink.common.internal.providers.header;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
-import static org.junit.Assert.*;
 
 import java.util.Arrays;
 import java.util.Collections;

Modified: incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/providers/header/CacheControlHeaderDelegateTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/providers/header/CacheControlHeaderDelegateTest.java?rev=961914&r1=961913&r2=961914&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/providers/header/CacheControlHeaderDelegateTest.java (original)
+++ incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/providers/header/CacheControlHeaderDelegateTest.java Thu Jul  8 20:06:08 2010
@@ -19,7 +19,8 @@
  *******************************************************************************/
 package org.apache.wink.common.internal.providers.header;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.fail;
 
 import java.util.Arrays;
 

Modified: incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/providers/header/ContentDispositionHeaderDelegateTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/providers/header/ContentDispositionHeaderDelegateTest.java?rev=961914&r1=961913&r2=961914&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/providers/header/ContentDispositionHeaderDelegateTest.java (original)
+++ incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/providers/header/ContentDispositionHeaderDelegateTest.java Thu Jul  8 20:06:08 2010
@@ -23,10 +23,10 @@ package org.apache.wink.common.internal.
 import javax.ws.rs.ext.RuntimeDelegate;
 import javax.ws.rs.ext.RuntimeDelegate.HeaderDelegate;
 
-import org.apache.wink.common.internal.http.ContentDispositionHeader;
-
 import junit.framework.TestCase;
 
+import org.apache.wink.common.internal.http.ContentDispositionHeader;
+
 /**
  * Unit test of ContentDispositionHelper
  */

Modified: incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/providers/header/DateHeaderDelegateTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/providers/header/DateHeaderDelegateTest.java?rev=961914&r1=961913&r2=961914&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/providers/header/DateHeaderDelegateTest.java (original)
+++ incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/providers/header/DateHeaderDelegateTest.java Thu Jul  8 20:06:08 2010
@@ -19,6 +19,9 @@
  *******************************************************************************/
 package org.apache.wink.common.internal.providers.header;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -27,8 +30,6 @@ import java.util.Locale;
 import javax.ws.rs.ext.RuntimeDelegate;
 import javax.ws.rs.ext.RuntimeDelegate.HeaderDelegate;
 
-import static org.junit.Assert.*;
-
 import org.junit.Test;
 
 public class DateHeaderDelegateTest {

Modified: incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/providers/header/EntityTagHeaderDelegateTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/providers/header/EntityTagHeaderDelegateTest.java?rev=961914&r1=961913&r2=961914&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/providers/header/EntityTagHeaderDelegateTest.java (original)
+++ incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/providers/header/EntityTagHeaderDelegateTest.java Thu Jul  8 20:06:08 2010
@@ -19,8 +19,8 @@
  *******************************************************************************/
 package org.apache.wink.common.internal.providers.header;
 
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
-import static org.junit.Assert.*;
 
 import javax.ws.rs.core.EntityTag;
 import javax.ws.rs.ext.RuntimeDelegate;

Modified: incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/providers/multipart/TestMultiPartParser.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/providers/multipart/TestMultiPartParser.java?rev=961914&r1=961913&r2=961914&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/providers/multipart/TestMultiPartParser.java (original)
+++ incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/providers/multipart/TestMultiPartParser.java Thu Jul  8 20:06:08 2010
@@ -27,8 +27,6 @@ import java.util.List;
 
 import javax.ws.rs.core.MultivaluedMap;
 
-import org.apache.wink.common.internal.providers.multipart.MultiPartParser;
-
 import junit.framework.TestCase;
 
 public class TestMultiPartParser extends TestCase {

Modified: incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/registry/ProvidersRegistryTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/registry/ProvidersRegistryTest.java?rev=961914&r1=961913&r2=961914&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/registry/ProvidersRegistryTest.java (original)
+++ incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/registry/ProvidersRegistryTest.java Thu Jul  8 20:06:08 2010
@@ -25,7 +25,6 @@ import java.lang.annotation.Annotation;
 import java.lang.reflect.Field;
 import java.lang.reflect.Type;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.Set;
 
 import javax.ws.rs.Produces;

Modified: incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/utils/ExceptionHelperTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/utils/ExceptionHelperTest.java?rev=961914&r1=961913&r2=961914&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/utils/ExceptionHelperTest.java (original)
+++ incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/utils/ExceptionHelperTest.java Thu Jul  8 20:06:08 2010
@@ -23,8 +23,6 @@ package org.apache.wink.common.internal.
 import java.io.PrintWriter;
 import java.io.StringWriter;
 
-import org.apache.wink.common.internal.utils.ExceptionHelper;
-
 import junit.framework.TestCase;
 
 /**

Modified: incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/utils/GenericsUtilsTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/utils/GenericsUtilsTest.java?rev=961914&r1=961913&r2=961914&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/utils/GenericsUtilsTest.java (original)
+++ incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/utils/GenericsUtilsTest.java Thu Jul  8 20:06:08 2010
@@ -23,8 +23,6 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.wink.common.internal.utils.GenericsUtils;
-
 import junit.framework.TestCase;
 
 public class GenericsUtilsTest extends TestCase {

Modified: incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/utils/StringUtilsTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/utils/StringUtilsTest.java?rev=961914&r1=961913&r2=961914&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/utils/StringUtilsTest.java (original)
+++ incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/utils/StringUtilsTest.java Thu Jul  8 20:06:08 2010
@@ -21,9 +21,6 @@
 package org.apache.wink.common.internal.utils;
 
 import static org.junit.Assert.assertArrayEquals;
-
-import org.apache.wink.common.internal.utils.StringUtils;
-
 import junit.framework.TestCase;
 
 public class StringUtilsTest extends TestCase {

Modified: incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/utils/UriHelperTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/utils/UriHelperTest.java?rev=961914&r1=961913&r2=961914&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/utils/UriHelperTest.java (original)
+++ incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/utils/UriHelperTest.java Thu Jul  8 20:06:08 2010
@@ -30,11 +30,10 @@ import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.MultivaluedMap;
 import javax.ws.rs.core.PathSegment;
 
+import junit.framework.TestCase;
+
 import org.apache.wink.common.internal.MultivaluedMapImpl;
 import org.apache.wink.common.internal.PathSegmentImpl;
-import org.apache.wink.common.internal.utils.UriHelper;
-
-import junit.framework.TestCase;
 
 /**
  * Unit test of UriHelper.

Modified: incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/uri/BitWorkingUriTemplateProcessorTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/uri/BitWorkingUriTemplateProcessorTest.java?rev=961914&r1=961913&r2=961914&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/uri/BitWorkingUriTemplateProcessorTest.java (original)
+++ incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/uri/BitWorkingUriTemplateProcessorTest.java Thu Jul  8 20:06:08 2010
@@ -29,12 +29,12 @@ import java.util.Set;
 
 import javax.ws.rs.core.MultivaluedMap;
 
+import junit.framework.TestCase;
+
 import org.apache.wink.common.internal.uritemplate.BitWorkingUriTemplateProcessor;
 import org.apache.wink.common.internal.uritemplate.UriTemplateMatcher;
 import org.apache.wink.common.internal.uritemplate.UriTemplateProcessor;
 
-import junit.framework.TestCase;
-
 /**
  * Unit test of UriTemplate.
  */

Modified: incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/uri/JaxRsUriTemplateProcessorTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/uri/JaxRsUriTemplateProcessorTest.java?rev=961914&r1=961913&r2=961914&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/uri/JaxRsUriTemplateProcessorTest.java (original)
+++ incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/uri/JaxRsUriTemplateProcessorTest.java Thu Jul  8 20:06:08 2010
@@ -26,14 +26,14 @@ import java.util.regex.PatternSyntaxExce
 
 import javax.ws.rs.core.MultivaluedMap;
 
+import junit.framework.TestCase;
+
 import org.apache.wink.common.internal.MultivaluedMapImpl;
 import org.apache.wink.common.internal.uritemplate.JaxRsUriTemplateProcessor;
 import org.apache.wink.common.internal.uritemplate.UriTemplateMatcher;
 import org.apache.wink.common.internal.uritemplate.UriTemplateProcessor;
 import org.apache.wink.common.internal.uritemplate.JaxRsUriTemplateProcessor.JaxRsCompilationHandler;
 
-import junit.framework.TestCase;
-
 public class JaxRsUriTemplateProcessorTest extends TestCase {
 
     private static class TestCompilationHandler implements JaxRsCompilationHandler {

Modified: incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/uri/UriEncoderTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/uri/UriEncoderTest.java?rev=961914&r1=961913&r2=961914&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/uri/UriEncoderTest.java (original)
+++ incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/uri/UriEncoderTest.java Thu Jul  8 20:06:08 2010
@@ -20,11 +20,11 @@
 
 package org.apache.wink.common.uri;
 
+import junit.framework.TestCase;
+
 import org.apache.wink.common.internal.uri.UriEncoder;
 import org.apache.wink.common.internal.utils.UriHelper;
 
-import junit.framework.TestCase;
-
 /**
  * Unit test of UriEncoder
  */

Modified: incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/uri/UriPathNormalizerTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/uri/UriPathNormalizerTest.java?rev=961914&r1=961913&r2=961914&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/uri/UriPathNormalizerTest.java (original)
+++ incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/uri/UriPathNormalizerTest.java Thu Jul  8 20:06:08 2010
@@ -20,10 +20,10 @@
 
 package org.apache.wink.common.uri;
 
-import org.apache.wink.common.internal.uri.UriPathNormalizer;
-
 import junit.framework.TestCase;
 
+import org.apache.wink.common.internal.uri.UriPathNormalizer;
+
 /**
  * Unit test of UriPathNormalizer.
  */

Modified: incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/utils/ProviderUtilsTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/utils/ProviderUtilsTest.java?rev=961914&r1=961913&r2=961914&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/utils/ProviderUtilsTest.java (original)
+++ incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/utils/ProviderUtilsTest.java Thu Jul  8 20:06:08 2010
@@ -19,7 +19,8 @@
  *******************************************************************************/
 package org.apache.wink.common.utils;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotSame;
 
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
@@ -29,7 +30,6 @@ import java.util.Map;
 
 import javax.ws.rs.core.MediaType;
 
-import org.apache.wink.common.utils.ProviderUtils;
 import org.junit.Test;
 
 public class ProviderUtilsTest {

Modified: incubator/wink/trunk/wink-component-test-support/src/main/java/org/apache/wink/test/diff/DiffWithAttributeQualifier.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-component-test-support/src/main/java/org/apache/wink/test/diff/DiffWithAttributeQualifier.java?rev=961914&r1=961913&r2=961914&view=diff
==============================================================================
--- incubator/wink/trunk/wink-component-test-support/src/main/java/org/apache/wink/test/diff/DiffWithAttributeQualifier.java (original)
+++ incubator/wink/trunk/wink-component-test-support/src/main/java/org/apache/wink/test/diff/DiffWithAttributeQualifier.java Thu Jul  8 20:06:08 2010
@@ -20,13 +20,13 @@
 
 package org.apache.wink.test.diff;
 
+import java.io.IOException;
+
 import org.custommonkey.xmlunit.Diff;
 import org.custommonkey.xmlunit.ElementNameAndAttributeQualifier;
 import org.w3c.dom.Document;
 import org.xml.sax.SAXException;
 
-import java.io.IOException;
-
 /**
  * Class that overrides XmlUnit Diff class. Only Elements with the same name as
  * well as the same values for all attributes qualify. The order of elements is

Modified: incubator/wink/trunk/wink-examples/apps/Bookmarks/src/main/java/org/apache/wink/example/bookmarks/BookmarkStore.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-examples/apps/Bookmarks/src/main/java/org/apache/wink/example/bookmarks/BookmarkStore.java?rev=961914&r1=961913&r2=961914&view=diff
==============================================================================
--- incubator/wink/trunk/wink-examples/apps/Bookmarks/src/main/java/org/apache/wink/example/bookmarks/BookmarkStore.java (original)
+++ incubator/wink/trunk/wink-examples/apps/Bookmarks/src/main/java/org/apache/wink/example/bookmarks/BookmarkStore.java Thu Jul  8 20:06:08 2010
@@ -20,9 +20,9 @@
 
 package org.apache.wink.example.bookmarks;
 
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.Collections;
 
 /**
  * Memory store of bookmarks, created just for the needs of Bookmarks demo.