[hibernate-commits] Hibernate SVN: r20106 - in search/branches/v3_1_1_GA_CP/src: main/java/org/hibernate/search/annotations and 52 other directories.

hibernate-commits at lists.jboss.org hibernate-commits at lists.jboss.org
Wed Aug 4 02:31:49 EDT 2010


Author: stliu
Date: 2010-08-04 02:31:38 -0400 (Wed, 04 Aug 2010)
New Revision: 20106

Modified:
   search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/FullTextQuery.java
   search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/annotations/Analyzer.java
   search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/annotations/AnalyzerDef.java
   search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/annotations/AnalyzerDefs.java
   search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/annotations/AnalyzerDiscriminator.java
   search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/annotations/ContainedIn.java
   search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/annotations/DateBridge.java
   search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/annotations/Factory.java
   search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/annotations/Fields.java
   search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/annotations/FullTextFilterDef.java
   search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/annotations/FullTextFilterDefs.java
   search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/annotations/IndexedEmbedded.java
   search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/annotations/Key.java
   search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/annotations/Parameter.java
   search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/annotations/TokenizerDef.java
   search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/backend/BackendQueueProcessorFactory.java
   search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/backend/LuceneIndexingParameters.java
   search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/backend/WorkQueue.java
   search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/backend/Workspace.java
   search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/backend/configuration/MaskedProperty.java
   search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/backend/impl/BatchedQueueingProcessor.java
   search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/backend/impl/TransactionalWorker.java
   search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/backend/impl/jms/AbstractJMSHibernateSearchController.java
   search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/backend/impl/jms/JMSBackendQueueProcessor.java
   search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/backend/impl/jms/JMSBackendQueueProcessorFactory.java
   search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/backend/impl/lucene/LuceneBackendQueueProcessorFactory.java
   search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/backend/impl/lucene/PerDPQueueProcessor.java
   search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/backend/impl/lucene/works/AddWorkDelegate.java
   search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/backend/impl/lucene/works/DeleteWorkDelegate.java
   search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/backend/impl/lucene/works/OptimizeWorkDelegate.java
   search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/backend/impl/lucene/works/PurgeAllWorkDelegate.java
   search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/bridge/builtin/BooleanBridge.java
   search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/bridge/builtin/ClassBridge.java
   search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/bridge/builtin/DateBridge.java
   search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/bridge/builtin/EnumBridge.java
   search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/bridge/builtin/UrlBridge.java
   search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/cfg/SearchConfigurationFromHibernateCore.java
   search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/engine/DocumentBuilderContainedEntity.java
   search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/engine/DocumentBuilderIndexedEntity.java
   search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/engine/DocumentExtractor.java
   search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/engine/Loader.java
   search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/engine/LuceneOptionsImpl.java
   search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/engine/ObjectLoader.java
   search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/engine/ObjectLoaderHelper.java
   search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/engine/QueryLoader.java
   search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/event/EventListenerRegister.java
   search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/event/FullTextIndexEventListener.java
   search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/filter/AndDocIdSet.java
   search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/filter/CachingWrapperFilter.java
   search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/filter/ChainedFilter.java
   search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/filter/StandardFilterKey.java
   search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/impl/InitContext.java
   search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/impl/SearchFactoryImpl.java
   search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/impl/SolrAnalyzerBuilder.java
   search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/jpa/FullTextEntityManager.java
   search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/jpa/FullTextQuery.java
   search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/jpa/impl/FullTextEntityManagerImpl.java
   search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/jpa/impl/FullTextQueryImpl.java
   search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/query/FullTextQueryImpl.java
   search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/query/IteratorImpl.java
   search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/query/QueryHits.java
   search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/query/ScrollableResultsImpl.java
   search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/reader/NotSharedReaderProvider.java
   search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/reader/ReaderProvider.java
   search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/reader/SharedReaderProvider.java
   search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/reader/SharingBufferReaderProvider.java
   search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/store/DirectoryProviderHelper.java
   search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/store/FSDirectoryProvider.java
   search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/store/FSMasterDirectoryProvider.java
   search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/store/FSSlaveDirectoryProvider.java
   search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/store/IdHashShardingStrategy.java
   search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/store/NotShardedStrategy.java
   search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/store/optimization/IncrementalOptimizerStrategy.java
   search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/store/optimization/NoOpOptimizerStrategy.java
   search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/util/ContextHelper.java
   search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/util/FilterCacheModeTypeHelper.java
   search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/util/HibernateSearchResourceLoader.java
   search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/AlternateDocument.java
   search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/Document.java
   search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/FSDirectoryTest.java
   search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/RamDirectoryTest.java
   search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/SearchTestCase.java
   search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/SerializationTestHelper.java
   search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/TestCase.java
   search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/TransactionTest.java
   search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/analyzer/AbstractTestAnalyzer.java
   search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/analyzer/AnalyzerTest.java
   search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/analyzer/Article.java
   search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/analyzer/BlogEntry.java
   search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/analyzer/DoubleAnalyzerTest.java
   search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/analyzer/MyComponent.java
   search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/analyzer/MyEntity.java
   search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/analyzer/inheritance/AnalyzerInheritanceTest.java
   search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/analyzer/inheritance/ISOLatin1Analyzer.java
   search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/analyzer/solr/InsertWhitespaceFilter.java
   search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/analyzer/solr/SolrAnalyzerTest.java
   search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/analyzer/solr/Team.java
   search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/bridge/BridgeTest.java
   search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/bridge/ClassBridgeTest.java
   search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/bridge/Cloud.java
   search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/bridge/Departments.java
   search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/bridge/TruncateStringBridge.java
   search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/bridge/UnresolvedBridgeTest.java
   search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/classloading/Animal.java
   search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/classloading/NoAnnotationsTest.java
   search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/configuration/EventListenerRegisterTest.java
   search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/configuration/LuceneIndexingParametersTest.java
   search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/configuration/MaskedPropertiesTest.java
   search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/configuration/ShardsConfigurationTest.java
   search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/configuration/UselessShardingStrategy.java
   search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/directoryProvider/DirectoryProviderHelperTest.java
   search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/directoryProvider/FSSlaveAndMasterDPTest.java
   search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/embedded/Address.java
   search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/embedded/Author.java
   search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/embedded/NonIndexedEntity.java
   search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/embedded/Order.java
   search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/embedded/Owner.java
   search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/embedded/Product.java
   search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/embedded/State.java
   search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/embedded/doubleinsert/Contact.java
   search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/fieldAccess/FieldAccessTest.java
   search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/filter/AndDocIdSetsTest.java
   search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/filter/Driver.java
   search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/filter/ExcludeAllFilter.java
   search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/filter/FiltersOptimizationTest.java
   search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/filter/InstanceBasedExcludeAllFilter.java
   search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/filter/SecurityFilterFactory.java
   search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/filter/Soap.java
   search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/id/Animal.java
   search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/id/EmbeddedIdTest.java
   search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/id/ImplicitIdTest.java
   search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/id/Person.java
   search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/id/PersonPK.java
   search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/id/PersonPKBridge.java
   search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/id/providedId/ProvidedIdPerson.java
   search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/id/providedId/ProvidedIdTest.java
   search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/indexingStrategy/ManualIndexingStrategyTest.java
   search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/inheritance/Animal.java
   search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/inheritance/Being.java
   search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/inheritance/InheritanceTest.java
   search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/inheritance/Mammal.java
   search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/jms/master/JMSMasterTest.java
   search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/jms/master/MDBSearchController.java
   search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/jms/master/TShirt.java
   search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/jms/slave/JMSSlaveTest.java
   search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/jms/slave/SearchQueueChecker.java
   search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/jms/slave/TShirt.java
   search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/jpa/Bretzel.java
   search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/jpa/EntityManagerTest.java
   search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/jpa/JPATestCase.java
   search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/optimizer/Construction.java
   search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/optimizer/Worker.java
   search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/perf/Boat.java
   search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/perf/IndexTestDontRun.java
   search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/perf/SearcherThread.java
   search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/query/AlternateBook.java
   search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/query/Book.java
   search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/query/Employee.java
   search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/query/LuceneQuerySortTest.java
   search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/query/MultiClassesQueryLoaderTest.java
   search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/query/Music.java
   search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/query/Person.java
   search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/query/ProjectionQueryTest.java
   search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/query/QueryUnindexedEntityTest.java
   search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/query/ScrollableResultsTest.java
   search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/query/boost/BoostedDescriptionLibrary.java
   search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/query/boost/BoostedFieldDescriptionLibrary.java
   search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/query/boost/BoostedGetDescriptionLibrary.java
   search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/query/boost/DynamicBoostedDescriptionLibrary.java
   search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/query/boost/DynamicBoostingTest.java
   search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/query/boost/FieldBoostTest.java
   search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/query/criteria/Bike.java
   search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/query/criteria/MixedCriteriaTest.java
   search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/query/explain/Dvd.java
   search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/query/explain/ExplanationTest.java
   search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/reader/Detective.java
   search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/reader/ReaderPerfTestCase.java
   search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/reader/Suspect.java
   search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/reader/functionality/SharingBufferIndexProviderTest.java
   search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/session/Categorie.java
   search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/session/DelegationWrapper.java
   search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/session/Domain.java
   search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/session/Email.java
   search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/session/Entite.java
   search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/session/MassIndexTest.java
   search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/session/MassIndexUsingManualFlushTest.java
   search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/session/SessionTest.java
   search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/shards/Animal.java
   search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/shards/Furniture.java
   search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/shards/IdShardingStrategyTest.java
   search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/shards/ShardsTest.java
   search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/similarity/SimilarityTest.java
   search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/similarity/Trash.java
   search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/util/AnalyzerUtils.java
   search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/util/FileHelperTest.java
   search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/worker/AsyncWorkerTest.java
   search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/worker/ConcurrencyTest.java
   search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/worker/Drink.java
   search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/worker/Employee.java
   search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/worker/Employer.java
   search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/worker/Food.java
   search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/worker/SyncWorkerTest.java
   search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/worker/duplication/EmailAddress.java
   search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/worker/duplication/Person.java
   search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/worker/duplication/SpecialPerson.java
   search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/worker/duplication/WorkDuplicationTest.java
Log:
clean up unused imports

Modified: search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/FullTextQuery.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/FullTextQuery.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/FullTextQuery.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -1,9 +1,9 @@
 //$Id$
 package org.hibernate.search;
 
+import org.apache.lucene.search.Explanation;
 import org.apache.lucene.search.Filter;
 import org.apache.lucene.search.Sort;
-import org.apache.lucene.search.Explanation;
 import org.hibernate.Criteria;
 import org.hibernate.Query;
 import org.hibernate.transform.ResultTransformer;

Modified: search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/annotations/Analyzer.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/annotations/Analyzer.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/annotations/Analyzer.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -1,11 +1,11 @@
 // $Id$
 package org.hibernate.search.annotations;
 
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Documented;
 
 /**
  * Define an Analyzer for a given entity, method, field or Field

Modified: search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/annotations/AnalyzerDef.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/annotations/AnalyzerDef.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/annotations/AnalyzerDef.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -1,11 +1,11 @@
 // $Id$
 package org.hibernate.search.annotations;
 
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Documented;
 
 /**
  * Reusable analyzer definition.

Modified: search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/annotations/AnalyzerDefs.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/annotations/AnalyzerDefs.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/annotations/AnalyzerDefs.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -1,11 +1,11 @@
 // $Id$
 package org.hibernate.search.annotations;
 
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Documented;
 
 /**
  * Reusable analyzer definitions.

Modified: search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/annotations/AnalyzerDiscriminator.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/annotations/AnalyzerDiscriminator.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/annotations/AnalyzerDiscriminator.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -1,11 +1,11 @@
 // $Id$
 package org.hibernate.search.annotations;
 
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Documented;
 
 import org.hibernate.search.analyzer.Discriminator;
 

Modified: search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/annotations/ContainedIn.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/annotations/ContainedIn.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/annotations/ContainedIn.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -1,11 +1,11 @@
 //$Id$
 package org.hibernate.search.annotations;
 
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Documented;
 
 /**
  * Describe the owning entity as being part of the target entity's

Modified: search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/annotations/DateBridge.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/annotations/DateBridge.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/annotations/DateBridge.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -7,8 +7,6 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import org.hibernate.search.annotations.Resolution;
-
 /**
  * Defines the temporal resolution of a given field
  * Date are stored as String in GMT

Modified: search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/annotations/Factory.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/annotations/Factory.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/annotations/Factory.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -1,11 +1,11 @@
 // $Id$
 package org.hibernate.search.annotations;
 
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Documented;
 
 /**
  * Marks a method as a factory method for a given type.

Modified: search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/annotations/Fields.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/annotations/Fields.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/annotations/Fields.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -1,11 +1,11 @@
 // $Id$
 package org.hibernate.search.annotations;
 
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Documented;
 
 /**
  * Mark a property as indexable into different fields

Modified: search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/annotations/FullTextFilterDef.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/annotations/FullTextFilterDef.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/annotations/FullTextFilterDef.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -1,11 +1,11 @@
 // $Id$
 package org.hibernate.search.annotations;
 
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Documented;
 
 /**
  * Defines a FullTextFilter that can be optionally applied to

Modified: search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/annotations/FullTextFilterDefs.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/annotations/FullTextFilterDefs.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/annotations/FullTextFilterDefs.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -1,11 +1,11 @@
 // $Id$
 package org.hibernate.search.annotations;
 
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Documented;
 
 /**
  * A list of FullTextFilterDef

Modified: search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/annotations/IndexedEmbedded.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/annotations/IndexedEmbedded.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/annotations/IndexedEmbedded.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -1,11 +1,11 @@
 //$Id$
 package org.hibernate.search.annotations;
 
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Documented;
 
 @Retention( RetentionPolicy.RUNTIME )
 @Target( { ElementType.FIELD, ElementType.METHOD } )

Modified: search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/annotations/Key.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/annotations/Key.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/annotations/Key.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -1,11 +1,11 @@
 // $Id$
 package org.hibernate.search.annotations;
 
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Documented;
 
 /**
  * Marks a method as a key constructor for a given type.

Modified: search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/annotations/Parameter.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/annotations/Parameter.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/annotations/Parameter.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -1,10 +1,11 @@
 //$Id$
 package org.hibernate.search.annotations;
 
-import java.lang.annotation.Target;
-import java.lang.annotation.Retention;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
 /**
  * Parameter (basically key/value pattern)
  *

Modified: search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/annotations/TokenizerDef.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/annotations/TokenizerDef.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/annotations/TokenizerDef.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -1,11 +1,11 @@
 // $Id$
 package org.hibernate.search.annotations;
 
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Documented;
 
 import org.apache.solr.analysis.TokenizerFactory;
 

Modified: search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/backend/BackendQueueProcessorFactory.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/backend/BackendQueueProcessorFactory.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/backend/BackendQueueProcessorFactory.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -1,8 +1,8 @@
 //$Id$
 package org.hibernate.search.backend;
 
+import java.util.List;
 import java.util.Properties;
-import java.util.List;
 
 import org.hibernate.search.engine.SearchFactoryImplementor;
 

Modified: search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/backend/LuceneIndexingParameters.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/backend/LuceneIndexingParameters.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/backend/LuceneIndexingParameters.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -1,20 +1,20 @@
 //$Id$
 package org.hibernate.search.backend;
 
+import static org.hibernate.search.backend.configuration.IndexWriterSetting.MAX_FIELD_LENGTH;
+import static org.hibernate.search.backend.configuration.IndexWriterSetting.USE_COMPOUND_FILE;
+
 import java.io.Serializable;
 import java.util.EnumMap;
 import java.util.Map;
 import java.util.Properties;
 
 import org.apache.lucene.index.IndexWriter;
-import org.slf4j.Logger;
-
 import org.hibernate.search.SearchException;
 import org.hibernate.search.backend.configuration.IndexWriterSetting;
-import static org.hibernate.search.backend.configuration.IndexWriterSetting.MAX_FIELD_LENGTH;
-import static org.hibernate.search.backend.configuration.IndexWriterSetting.USE_COMPOUND_FILE;
 import org.hibernate.search.backend.configuration.MaskedProperty;
 import org.hibernate.search.util.LoggerFactory;
+import org.slf4j.Logger;
 
 /**
  * Wrapper class around the Lucene indexing parameters defined in IndexWriterSetting.

Modified: search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/backend/WorkQueue.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/backend/WorkQueue.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/backend/WorkQueue.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -1,8 +1,8 @@
 //$Id$
 package org.hibernate.search.backend;
 
+import java.util.ArrayList;
 import java.util.List;
-import java.util.ArrayList;
 
 import org.hibernate.annotations.common.AssertionFailure;
 

Modified: search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/backend/Workspace.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/backend/Workspace.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/backend/Workspace.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -11,8 +11,6 @@
 import org.apache.lucene.index.IndexReader;
 import org.apache.lucene.index.IndexWriter;
 import org.apache.lucene.store.Directory;
-import org.slf4j.Logger;
-
 import org.hibernate.annotations.common.AssertionFailure;
 import org.hibernate.search.SearchException;
 import org.hibernate.search.SearchFactory;
@@ -21,6 +19,7 @@
 import org.hibernate.search.store.DirectoryProvider;
 import org.hibernate.search.store.optimization.OptimizerStrategy;
 import org.hibernate.search.util.LoggerFactory;
+import org.slf4j.Logger;
 
 /**
  * Lucene workspace for a DirectoryProvider.<p/>

Modified: search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/backend/configuration/MaskedProperty.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/backend/configuration/MaskedProperty.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/backend/configuration/MaskedProperty.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -16,10 +16,9 @@
 import java.util.Set;
 import java.util.TreeSet;
 
+import org.hibernate.search.util.LoggerFactory;
 import org.slf4j.Logger;
 
-import org.hibernate.search.util.LoggerFactory;
-
 /**
  * A wrapper to Properties, to restrict the availability of
  * values to only those which have a key beginning with some

Modified: search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/backend/impl/BatchedQueueingProcessor.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/backend/impl/BatchedQueueingProcessor.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/backend/impl/BatchedQueueingProcessor.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -9,8 +9,6 @@
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 
-import org.slf4j.Logger;
-
 import org.hibernate.Hibernate;
 import org.hibernate.annotations.common.util.ReflectHelper;
 import org.hibernate.annotations.common.util.StringHelper;
@@ -25,10 +23,11 @@
 import org.hibernate.search.backend.configuration.ConfigurationParseHelper;
 import org.hibernate.search.backend.impl.jms.JMSBackendQueueProcessorFactory;
 import org.hibernate.search.backend.impl.lucene.LuceneBackendQueueProcessorFactory;
+import org.hibernate.search.engine.DocumentBuilderContainedEntity;
 import org.hibernate.search.engine.DocumentBuilderIndexedEntity;
 import org.hibernate.search.engine.SearchFactoryImplementor;
-import org.hibernate.search.engine.DocumentBuilderContainedEntity;
 import org.hibernate.search.util.LoggerFactory;
+import org.slf4j.Logger;
 
 /**
  * Batch work until {@link #performWorks} is called.

Modified: search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/backend/impl/TransactionalWorker.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/backend/impl/TransactionalWorker.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/backend/impl/TransactionalWorker.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -6,10 +6,10 @@
 import javax.transaction.Synchronization;
 
 import org.hibernate.search.backend.QueueingProcessor;
+import org.hibernate.search.backend.TransactionContext;
 import org.hibernate.search.backend.Work;
 import org.hibernate.search.backend.WorkQueue;
 import org.hibernate.search.backend.Worker;
-import org.hibernate.search.backend.TransactionContext;
 import org.hibernate.search.engine.SearchFactoryImplementor;
 import org.hibernate.search.util.LoggerFactory;
 import org.hibernate.search.util.WeakIdentityHashMap;

Modified: search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/backend/impl/jms/AbstractJMSHibernateSearchController.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/backend/impl/jms/AbstractJMSHibernateSearchController.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/backend/impl/jms/AbstractJMSHibernateSearchController.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -2,6 +2,7 @@
 package org.hibernate.search.backend.impl.jms;
 
 import java.util.List;
+
 import javax.annotation.PostConstruct;
 import javax.annotation.PreDestroy;
 import javax.jms.JMSException;
@@ -9,13 +10,12 @@
 import javax.jms.MessageListener;
 import javax.jms.ObjectMessage;
 
-import org.slf4j.Logger;
-
 import org.hibernate.Session;
 import org.hibernate.search.backend.LuceneWork;
 import org.hibernate.search.engine.SearchFactoryImplementor;
 import org.hibernate.search.util.ContextHelper;
 import org.hibernate.search.util.LoggerFactory;
+import org.slf4j.Logger;
 
 /**
  * Implement the Hibernate Search controller responsible for processing the

Modified: search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/backend/impl/jms/JMSBackendQueueProcessor.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/backend/impl/jms/JMSBackendQueueProcessor.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/backend/impl/jms/JMSBackendQueueProcessor.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -4,18 +4,18 @@
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
+
 import javax.jms.JMSException;
 import javax.jms.ObjectMessage;
 import javax.jms.QueueConnection;
 import javax.jms.QueueSender;
 import javax.jms.QueueSession;
 
-import org.slf4j.Logger;
-
 import org.hibernate.HibernateException;
 import org.hibernate.search.backend.LuceneWork;
 import org.hibernate.search.backend.OptimizeLuceneWork;
 import org.hibernate.search.util.LoggerFactory;
+import org.slf4j.Logger;
 
 /**
  * @author Emmanuel Bernard

Modified: search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/backend/impl/jms/JMSBackendQueueProcessorFactory.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/backend/impl/jms/JMSBackendQueueProcessorFactory.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/backend/impl/jms/JMSBackendQueueProcessorFactory.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -5,6 +5,7 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Properties;
+
 import javax.jms.Queue;
 import javax.jms.QueueConnectionFactory;
 import javax.naming.Context;
@@ -13,9 +14,9 @@
 
 import org.hibernate.search.Environment;
 import org.hibernate.search.SearchException;
-import org.hibernate.search.engine.SearchFactoryImplementor;
 import org.hibernate.search.backend.BackendQueueProcessorFactory;
 import org.hibernate.search.backend.LuceneWork;
+import org.hibernate.search.engine.SearchFactoryImplementor;
 
 /**
  * @author Emmanuel Bernard

Modified: search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/backend/impl/lucene/LuceneBackendQueueProcessorFactory.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/backend/impl/lucene/LuceneBackendQueueProcessorFactory.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/backend/impl/lucene/LuceneBackendQueueProcessorFactory.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -2,9 +2,9 @@
 package org.hibernate.search.backend.impl.lucene;
 
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.Properties;
-import java.util.List;
 import java.util.concurrent.ExecutorService;
 
 import org.hibernate.search.backend.BackendQueueProcessorFactory;

Modified: search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/backend/impl/lucene/PerDPQueueProcessor.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/backend/impl/lucene/PerDPQueueProcessor.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/backend/impl/lucene/PerDPQueueProcessor.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -6,13 +6,12 @@
 
 import org.apache.lucene.index.IndexReader;
 import org.apache.lucene.index.IndexWriter;
-import org.slf4j.Logger;
-
 import org.hibernate.annotations.common.AssertionFailure;
 import org.hibernate.search.backend.LuceneWork;
 import org.hibernate.search.backend.Workspace;
 import org.hibernate.search.backend.impl.lucene.works.LuceneWorkVisitor;
 import org.hibernate.search.util.LoggerFactory;
+import org.slf4j.Logger;
 
 /**
  * @author Sanne Grinovero

Modified: search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/backend/impl/lucene/works/AddWorkDelegate.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/backend/impl/lucene/works/AddWorkDelegate.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/backend/impl/lucene/works/AddWorkDelegate.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -7,8 +7,6 @@
 import org.apache.lucene.index.IndexReader;
 import org.apache.lucene.index.IndexWriter;
 import org.apache.lucene.search.Similarity;
-import org.slf4j.Logger;
-
 import org.hibernate.search.SearchException;
 import org.hibernate.search.backend.AddLuceneWork;
 import org.hibernate.search.backend.LuceneWork;
@@ -17,6 +15,7 @@
 import org.hibernate.search.engine.DocumentBuilderIndexedEntity;
 import org.hibernate.search.util.LoggerFactory;
 import org.hibernate.search.util.ScopedAnalyzer;
+import org.slf4j.Logger;
 
 /**
  * Stateless implementation that performs a <code>AddLuceneWork</code>.

Modified: search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/backend/impl/lucene/works/DeleteWorkDelegate.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/backend/impl/lucene/works/DeleteWorkDelegate.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/backend/impl/lucene/works/DeleteWorkDelegate.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -9,15 +9,14 @@
 import org.apache.lucene.search.BooleanClause;
 import org.apache.lucene.search.BooleanQuery;
 import org.apache.lucene.search.TermQuery;
-import org.slf4j.Logger;
-
 import org.hibernate.search.SearchException;
 import org.hibernate.search.backend.LuceneWork;
 import org.hibernate.search.backend.Workspace;
 import org.hibernate.search.backend.impl.lucene.IndexInteractionType;
-import org.hibernate.search.engine.DocumentBuilderIndexedEntity;
 import org.hibernate.search.engine.DocumentBuilder;
+import org.hibernate.search.engine.DocumentBuilderIndexedEntity;
 import org.hibernate.search.util.LoggerFactory;
+import org.slf4j.Logger;
 
 /**
  * Stateless implementation that performs a <code>DeleteLuceneWork</code>.

Modified: search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/backend/impl/lucene/works/OptimizeWorkDelegate.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/backend/impl/lucene/works/OptimizeWorkDelegate.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/backend/impl/lucene/works/OptimizeWorkDelegate.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -4,13 +4,12 @@
 
 import org.apache.lucene.index.IndexReader;
 import org.apache.lucene.index.IndexWriter;
-import org.slf4j.Logger;
-
 import org.hibernate.search.SearchException;
 import org.hibernate.search.backend.LuceneWork;
 import org.hibernate.search.backend.Workspace;
 import org.hibernate.search.backend.impl.lucene.IndexInteractionType;
 import org.hibernate.search.util.LoggerFactory;
+import org.slf4j.Logger;
 
 /**
  * Stateless implementation that performs a OptimizeLuceneWork.

Modified: search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/backend/impl/lucene/works/PurgeAllWorkDelegate.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/backend/impl/lucene/works/PurgeAllWorkDelegate.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/backend/impl/lucene/works/PurgeAllWorkDelegate.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -3,13 +3,12 @@
 import org.apache.lucene.index.IndexReader;
 import org.apache.lucene.index.IndexWriter;
 import org.apache.lucene.index.Term;
-import org.slf4j.Logger;
-
 import org.hibernate.search.SearchException;
 import org.hibernate.search.backend.LuceneWork;
 import org.hibernate.search.backend.impl.lucene.IndexInteractionType;
 import org.hibernate.search.engine.DocumentBuilder;
 import org.hibernate.search.util.LoggerFactory;
+import org.slf4j.Logger;
 
 /**
 * Stateless implementation that performs a PurgeAllLuceneWork.

Modified: search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/bridge/builtin/BooleanBridge.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/bridge/builtin/BooleanBridge.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/bridge/builtin/BooleanBridge.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -1,8 +1,8 @@
 //$Id$
 package org.hibernate.search.bridge.builtin;
 
+import org.hibernate.annotations.common.util.StringHelper;
 import org.hibernate.search.bridge.TwoWayStringBridge;
-import org.hibernate.annotations.common.util.StringHelper;
 
 
 /**

Modified: search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/bridge/builtin/ClassBridge.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/bridge/builtin/ClassBridge.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/bridge/builtin/ClassBridge.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -1,10 +1,10 @@
 // $Id$
 package org.hibernate.search.bridge.builtin;
 
+import org.hibernate.annotations.common.util.ReflectHelper;
+import org.hibernate.annotations.common.util.StringHelper;
+import org.hibernate.search.SearchException;
 import org.hibernate.search.bridge.TwoWayStringBridge;
-import org.hibernate.search.SearchException;
-import org.hibernate.annotations.common.util.StringHelper;
-import org.hibernate.annotations.common.util.ReflectHelper;
 
 /**
  * Convert a Class back and forth

Modified: search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/bridge/builtin/DateBridge.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/bridge/builtin/DateBridge.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/bridge/builtin/DateBridge.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -9,8 +9,8 @@
 import org.apache.lucene.document.DateTools;
 import org.hibernate.AssertionFailure;
 import org.hibernate.HibernateException;
+import org.hibernate.search.annotations.Resolution;
 import org.hibernate.search.bridge.ParameterizedBridge;
-import org.hibernate.search.annotations.Resolution;
 import org.hibernate.search.bridge.TwoWayStringBridge;
 import org.hibernate.util.StringHelper;
 

Modified: search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/bridge/builtin/EnumBridge.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/bridge/builtin/EnumBridge.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/bridge/builtin/EnumBridge.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -1,8 +1,8 @@
 //$Id$
 package org.hibernate.search.bridge.builtin;
 
+import org.hibernate.annotations.common.util.StringHelper;
 import org.hibernate.search.bridge.TwoWayStringBridge;
-import org.hibernate.annotations.common.util.StringHelper;
 
 
 /**

Modified: search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/bridge/builtin/UrlBridge.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/bridge/builtin/UrlBridge.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/bridge/builtin/UrlBridge.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -1,12 +1,12 @@
 // $Id$
 package org.hibernate.search.bridge.builtin;
 
+import java.net.MalformedURLException;
 import java.net.URL;
-import java.net.MalformedURLException;
 
+import org.hibernate.annotations.common.util.StringHelper;
+import org.hibernate.search.SearchException;
 import org.hibernate.search.bridge.TwoWayStringBridge;
-import org.hibernate.search.SearchException;
-import org.hibernate.annotations.common.util.StringHelper;
 
 /**
  * Bridge for <code>URL</code>s.

Modified: search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/cfg/SearchConfigurationFromHibernateCore.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/cfg/SearchConfigurationFromHibernateCore.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/cfg/SearchConfigurationFromHibernateCore.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -2,8 +2,8 @@
 package org.hibernate.search.cfg;
 
 import java.util.Iterator;
+import java.util.NoSuchElementException;
 import java.util.Properties;
-import java.util.NoSuchElementException;
 
 import org.hibernate.annotations.common.reflection.ReflectionManager;
 import org.hibernate.annotations.common.reflection.java.JavaReflectionManager;

Modified: search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/engine/DocumentBuilderContainedEntity.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/engine/DocumentBuilderContainedEntity.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/engine/DocumentBuilderContainedEntity.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -15,8 +15,6 @@
 import org.apache.lucene.analysis.Analyzer;
 import org.apache.lucene.document.Field;
 import org.apache.lucene.search.Similarity;
-import org.slf4j.Logger;
-
 import org.hibernate.Hibernate;
 import org.hibernate.annotations.common.AssertionFailure;
 import org.hibernate.annotations.common.reflection.ReflectionManager;
@@ -49,6 +47,7 @@
 import org.hibernate.search.util.LoggerFactory;
 import org.hibernate.search.util.ReflectionHelper;
 import org.hibernate.search.util.ScopedAnalyzer;
+import org.slf4j.Logger;
 
 /**
  * Set up and provide a manager for classes which are indexed via <code>@IndexedEmbedded</code>, but themselves do not

Modified: search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/engine/DocumentBuilderIndexedEntity.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/engine/DocumentBuilderIndexedEntity.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/engine/DocumentBuilderIndexedEntity.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -5,18 +5,16 @@
 import java.lang.annotation.Annotation;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
-import java.util.HashMap;
 import java.util.Set;
-import java.util.HashSet;
 
 import org.apache.lucene.analysis.Analyzer;
 import org.apache.lucene.document.Document;
 import org.apache.lucene.document.Field;
 import org.apache.lucene.index.Term;
-import org.slf4j.Logger;
-
 import org.hibernate.Hibernate;
 import org.hibernate.annotations.common.AssertionFailure;
 import org.hibernate.annotations.common.reflection.ReflectionManager;
@@ -48,6 +46,7 @@
 import org.hibernate.search.store.IndexShardingStrategy;
 import org.hibernate.search.util.LoggerFactory;
 import org.hibernate.search.util.ReflectionHelper;
+import org.slf4j.Logger;
 
 /**
  * Set up and provide a manager for classes which are directly annotated with <code>@Indexed</code>.

Modified: search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/engine/DocumentExtractor.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/engine/DocumentExtractor.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/engine/DocumentExtractor.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -3,17 +3,15 @@
 
 import java.io.IOException;
 import java.io.Serializable;
-import java.util.Set;
-import java.util.Map;
 import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
 
 import org.apache.lucene.document.Document;
+import org.apache.lucene.document.FieldSelector;
 import org.apache.lucene.document.FieldSelectorResult;
 import org.apache.lucene.document.MapFieldSelector;
-import org.apache.lucene.document.FieldSelector;
-
 import org.hibernate.search.ProjectionConstants;
-import org.hibernate.search.SearchException;
 import org.hibernate.search.query.QueryHits;
 
 /**

Modified: search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/engine/Loader.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/engine/Loader.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/engine/Loader.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -4,7 +4,6 @@
 import java.util.List;
 
 import org.hibernate.Session;
-import org.hibernate.search.engine.EntityInfo;
 
 /**
  * Interface defining a set of operations in order to load entities which matched a query. Depending on the type of

Modified: search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/engine/LuceneOptionsImpl.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/engine/LuceneOptionsImpl.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/engine/LuceneOptionsImpl.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -4,7 +4,6 @@
 import org.apache.lucene.document.Field.Index;
 import org.apache.lucene.document.Field.Store;
 import org.apache.lucene.document.Field.TermVector;
-
 import org.hibernate.search.bridge.LuceneOptions;
 
 /**

Modified: search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/engine/ObjectLoader.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/engine/ObjectLoader.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/engine/ObjectLoader.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -5,11 +5,10 @@
 import java.util.Collections;
 import java.util.List;
 
-import org.slf4j.Logger;
-
 import org.hibernate.Hibernate;
 import org.hibernate.Session;
 import org.hibernate.search.util.LoggerFactory;
+import org.slf4j.Logger;
 
 /**
  * @author Emmanuel Bernard

Modified: search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/engine/ObjectLoaderHelper.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/engine/ObjectLoaderHelper.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/engine/ObjectLoaderHelper.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -6,14 +6,13 @@
 import java.util.List;
 import java.util.Set;
 
-import org.slf4j.Logger;
-
 import org.hibernate.Criteria;
 import org.hibernate.Hibernate;
 import org.hibernate.Session;
 import org.hibernate.criterion.Disjunction;
 import org.hibernate.criterion.Restrictions;
 import org.hibernate.search.util.LoggerFactory;
+import org.slf4j.Logger;
 
 /**
  * @author Emmanuel Bernard

Modified: search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/engine/QueryLoader.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/engine/QueryLoader.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/engine/QueryLoader.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -1,8 +1,8 @@
 //$Id$
 package org.hibernate.search.engine;
 
+import java.util.Collections;
 import java.util.List;
-import java.util.Collections;
 
 import org.hibernate.Criteria;
 import org.hibernate.Session;

Modified: search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/event/EventListenerRegister.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/event/EventListenerRegister.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/event/EventListenerRegister.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -3,8 +3,6 @@
 
 import java.util.Properties;
 
-import org.slf4j.Logger;
-
 import org.hibernate.event.EventListeners;
 import org.hibernate.event.FlushEventListener;
 import org.hibernate.event.PostCollectionRecreateEventListener;
@@ -15,6 +13,7 @@
 import org.hibernate.event.PostUpdateEventListener;
 import org.hibernate.search.Environment;
 import org.hibernate.search.util.LoggerFactory;
+import org.slf4j.Logger;
 
 /**
  * Helper methods initializing Hibernate Search event listeners.

Modified: search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/event/FullTextIndexEventListener.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/event/FullTextIndexEventListener.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/event/FullTextIndexEventListener.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -11,8 +11,6 @@
 import javax.transaction.Status;
 import javax.transaction.Synchronization;
 
-import org.slf4j.Logger;
-
 import org.hibernate.Session;
 import org.hibernate.cfg.Configuration;
 import org.hibernate.engine.EntityEntry;
@@ -41,6 +39,7 @@
 import org.hibernate.search.engine.SearchFactoryImplementor;
 import org.hibernate.search.util.LoggerFactory;
 import org.hibernate.search.util.WeakIdentityHashMap;
+import org.slf4j.Logger;
 
 /**
  * This listener supports setting a parent directory for all generated index files.

Modified: search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/filter/AndDocIdSet.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/filter/AndDocIdSet.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/filter/AndDocIdSet.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -1,10 +1,11 @@
 // $Id$
 package org.hibernate.search.filter;
 
+import static java.lang.Math.max;
+
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
-import static java.lang.Math.max;
 
 import org.apache.lucene.search.DocIdSet;
 import org.apache.lucene.search.DocIdSetIterator;

Modified: search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/filter/CachingWrapperFilter.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/filter/CachingWrapperFilter.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/filter/CachingWrapperFilter.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -7,10 +7,9 @@
 import org.apache.lucene.index.IndexReader;
 import org.apache.lucene.search.DocIdSet;
 import org.apache.lucene.search.Filter;
-import org.slf4j.Logger;
-
 import org.hibernate.search.util.LoggerFactory;
 import org.hibernate.util.SoftLimitMRUCache;
+import org.slf4j.Logger;
 
 /**
  * A slightly different version of Lucene's original <code>CachingWrapperFilter</code> which

Modified: search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/filter/ChainedFilter.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/filter/ChainedFilter.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/filter/ChainedFilter.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -1,14 +1,14 @@
 // $Id$
 package org.hibernate.search.filter;
 
+import java.io.IOException;
+import java.util.ArrayList;
 import java.util.BitSet;
 import java.util.List;
-import java.util.ArrayList;
-import java.io.IOException;
 
+import org.apache.lucene.index.IndexReader;
 import org.apache.lucene.search.DocIdSet;
 import org.apache.lucene.search.Filter;
-import org.apache.lucene.index.IndexReader;
 import org.hibernate.annotations.common.AssertionFailure;
 
 /**

Modified: search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/filter/StandardFilterKey.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/filter/StandardFilterKey.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/filter/StandardFilterKey.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -1,8 +1,8 @@
 // $Id$
 package org.hibernate.search.filter;
 
+import java.util.ArrayList;
 import java.util.List;
-import java.util.ArrayList;
 
 /**
  * Implements a filter key usign all injected parameters to compute

Modified: search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/impl/InitContext.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/impl/InitContext.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/impl/InitContext.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -10,7 +10,6 @@
 import org.apache.lucene.analysis.Analyzer;
 import org.apache.lucene.analysis.standard.StandardAnalyzer;
 import org.apache.lucene.search.Similarity;
-
 import org.hibernate.search.Environment;
 import org.hibernate.search.SearchException;
 import org.hibernate.search.annotations.AnalyzerDef;

Modified: search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/impl/SearchFactoryImpl.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/impl/SearchFactoryImpl.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/impl/SearchFactoryImpl.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -4,6 +4,7 @@
 import java.beans.Introspector;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -12,13 +13,10 @@
 import java.util.Map;
 import java.util.Properties;
 import java.util.Set;
-import java.util.Arrays;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.locks.ReentrantLock;
 
 import org.apache.lucene.analysis.Analyzer;
-import org.slf4j.Logger;
-
 import org.hibernate.annotations.common.reflection.ReflectionManager;
 import org.hibernate.annotations.common.reflection.XClass;
 import org.hibernate.annotations.common.reflection.java.JavaReflectionManager;
@@ -39,11 +37,11 @@
 import org.hibernate.search.backend.WorkerFactory;
 import org.hibernate.search.backend.configuration.ConfigurationParseHelper;
 import org.hibernate.search.cfg.SearchConfiguration;
+import org.hibernate.search.engine.DocumentBuilderContainedEntity;
 import org.hibernate.search.engine.DocumentBuilderIndexedEntity;
+import org.hibernate.search.engine.EntityState;
 import org.hibernate.search.engine.FilterDef;
 import org.hibernate.search.engine.SearchFactoryImplementor;
-import org.hibernate.search.engine.EntityState;
-import org.hibernate.search.engine.DocumentBuilderContainedEntity;
 import org.hibernate.search.filter.CachingWrapperFilter;
 import org.hibernate.search.filter.FilterCachingStrategy;
 import org.hibernate.search.filter.MRUFilterCachingStrategy;
@@ -53,6 +51,7 @@
 import org.hibernate.search.store.DirectoryProviderFactory;
 import org.hibernate.search.store.optimization.OptimizerStrategy;
 import org.hibernate.search.util.LoggerFactory;
+import org.slf4j.Logger;
 
 /**
  * @author Emmanuel Bernard

Modified: search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/impl/SolrAnalyzerBuilder.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/impl/SolrAnalyzerBuilder.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/impl/SolrAnalyzerBuilder.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -1,21 +1,20 @@
 package org.hibernate.search.impl;
 
-import java.util.Map;
-import java.util.HashMap;
 import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
 
 import org.apache.lucene.analysis.Analyzer;
-import org.apache.solr.analysis.TokenizerChain;
 import org.apache.solr.analysis.TokenFilterFactory;
+import org.apache.solr.analysis.TokenizerChain;
 import org.apache.solr.analysis.TokenizerFactory;
-import org.apache.solr.util.plugin.ResourceLoaderAware;
 import org.apache.solr.common.ResourceLoader;
-
+import org.apache.solr.util.plugin.ResourceLoaderAware;
+import org.hibernate.search.SearchException;
 import org.hibernate.search.annotations.AnalyzerDef;
-import org.hibernate.search.annotations.TokenizerDef;
-import org.hibernate.search.annotations.TokenFilterDef;
 import org.hibernate.search.annotations.Parameter;
-import org.hibernate.search.SearchException;
+import org.hibernate.search.annotations.TokenFilterDef;
+import org.hibernate.search.annotations.TokenizerDef;
 import org.hibernate.search.util.HibernateSearchResourceLoader;
 
 /**

Modified: search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/jpa/FullTextEntityManager.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/jpa/FullTextEntityManager.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/jpa/FullTextEntityManager.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -2,6 +2,7 @@
 package org.hibernate.search.jpa;
 
 import java.io.Serializable;
+
 import javax.persistence.EntityManager;
 
 import org.hibernate.search.SearchFactory;

Modified: search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/jpa/FullTextQuery.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/jpa/FullTextQuery.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/jpa/FullTextQuery.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -3,13 +3,13 @@
 
 import javax.persistence.Query;
 
+import org.apache.lucene.search.Explanation;
+import org.apache.lucene.search.Filter;
 import org.apache.lucene.search.Sort;
-import org.apache.lucene.search.Filter;
-import org.apache.lucene.search.Explanation;
 import org.hibernate.Criteria;
+import org.hibernate.search.FullTextFilter;
+import org.hibernate.search.ProjectionConstants;
 import org.hibernate.transform.ResultTransformer;
-import org.hibernate.search.ProjectionConstants;
-import org.hibernate.search.FullTextFilter;
 
 /**
  * The base interface for lucene powered searches.

Modified: search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/jpa/impl/FullTextEntityManagerImpl.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/jpa/impl/FullTextEntityManagerImpl.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/jpa/impl/FullTextEntityManagerImpl.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -2,19 +2,20 @@
 package org.hibernate.search.jpa.impl;
 
 import java.io.Serializable;
+
 import javax.persistence.EntityManager;
+import javax.persistence.EntityTransaction;
 import javax.persistence.FlushModeType;
 import javax.persistence.LockModeType;
 import javax.persistence.Query;
-import javax.persistence.EntityTransaction;
 
+import org.hibernate.Session;
+import org.hibernate.search.FullTextSession;
+import org.hibernate.search.Search;
+import org.hibernate.search.SearchException;
+import org.hibernate.search.SearchFactory;
 import org.hibernate.search.jpa.FullTextEntityManager;
 import org.hibernate.search.jpa.FullTextQuery;
-import org.hibernate.search.SearchFactory;
-import org.hibernate.search.SearchException;
-import org.hibernate.search.FullTextSession;
-import org.hibernate.search.Search;
-import org.hibernate.Session;
 
 /**
  * @author Emmanuel Bernard

Modified: search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/jpa/impl/FullTextQueryImpl.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/jpa/impl/FullTextQueryImpl.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/jpa/impl/FullTextQueryImpl.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -7,6 +7,7 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
+
 import javax.persistence.EntityExistsException;
 import javax.persistence.EntityNotFoundException;
 import javax.persistence.FlushModeType;
@@ -17,9 +18,9 @@
 import javax.persistence.Query;
 import javax.persistence.TemporalType;
 
+import org.apache.lucene.search.Explanation;
 import org.apache.lucene.search.Filter;
 import org.apache.lucene.search.Sort;
-import org.apache.lucene.search.Explanation;
 import org.hibernate.Criteria;
 import org.hibernate.FlushMode;
 import org.hibernate.HibernateException;

Modified: search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/query/FullTextQueryImpl.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/query/FullTextQueryImpl.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/query/FullTextQueryImpl.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -1,6 +1,10 @@
 //$Id$
 package org.hibernate.search.query;
 
+import static org.hibernate.search.reader.ReaderProviderHelper.getIndexReaders;
+import static org.hibernate.search.util.FilterCacheModeTypeHelper.cacheInstance;
+import static org.hibernate.search.util.FilterCacheModeTypeHelper.cacheResults;
+
 import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
@@ -25,8 +29,6 @@
 import org.apache.lucene.search.Sort;
 import org.apache.lucene.search.TermQuery;
 import org.apache.lucene.search.TopDocs;
-import org.slf4j.Logger;
-
 import org.hibernate.Criteria;
 import org.hibernate.HibernateException;
 import org.hibernate.LockMode;
@@ -42,6 +44,7 @@
 import org.hibernate.search.FullTextFilter;
 import org.hibernate.search.FullTextQuery;
 import org.hibernate.search.SearchException;
+import org.hibernate.search.engine.DocumentBuilder;
 import org.hibernate.search.engine.DocumentBuilderIndexedEntity;
 import org.hibernate.search.engine.DocumentExtractor;
 import org.hibernate.search.engine.EntityInfo;
@@ -51,18 +54,15 @@
 import org.hibernate.search.engine.ProjectionLoader;
 import org.hibernate.search.engine.QueryLoader;
 import org.hibernate.search.engine.SearchFactoryImplementor;
-import org.hibernate.search.engine.DocumentBuilder;
 import org.hibernate.search.filter.ChainedFilter;
 import org.hibernate.search.filter.FilterKey;
 import org.hibernate.search.filter.StandardFilterKey;
 import org.hibernate.search.reader.ReaderProvider;
-import static org.hibernate.search.reader.ReaderProviderHelper.getIndexReaders;
 import org.hibernate.search.store.DirectoryProvider;
 import org.hibernate.search.util.ContextHelper;
-import static org.hibernate.search.util.FilterCacheModeTypeHelper.cacheInstance;
-import static org.hibernate.search.util.FilterCacheModeTypeHelper.cacheResults;
 import org.hibernate.search.util.LoggerFactory;
 import org.hibernate.transform.ResultTransformer;
+import org.slf4j.Logger;
 
 /**
  * Implementation of {@link org.hibernate.search.FullTextQuery}.

Modified: search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/query/IteratorImpl.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/query/IteratorImpl.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/query/IteratorImpl.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -5,8 +5,8 @@
 import java.util.List;
 import java.util.NoSuchElementException;
 
+import org.hibernate.search.engine.EntityInfo;
 import org.hibernate.search.engine.Loader;
-import org.hibernate.search.engine.EntityInfo;
 
 /**
  * @author Emmanuel Bernard

Modified: search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/query/QueryHits.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/query/QueryHits.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/query/QueryHits.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -27,7 +27,6 @@
 import org.apache.lucene.search.Searcher;
 import org.apache.lucene.search.Sort;
 import org.apache.lucene.search.TopDocs;
-
 import org.hibernate.search.SearchException;
 
 /**

Modified: search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/query/ScrollableResultsImpl.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/query/ScrollableResultsImpl.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/query/ScrollableResultsImpl.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -16,8 +16,6 @@
 import java.util.TimeZone;
 
 import org.apache.lucene.search.IndexSearcher;
-import org.slf4j.Logger;
-
 import org.hibernate.HibernateException;
 import org.hibernate.ScrollableResults;
 import org.hibernate.engine.SessionImplementor;
@@ -28,6 +26,7 @@
 import org.hibernate.search.engine.Loader;
 import org.hibernate.search.util.LoggerFactory;
 import org.hibernate.type.Type;
+import org.slf4j.Logger;
 
 /**
  * Implements scrollable and paginated resultsets.

Modified: search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/reader/NotSharedReaderProvider.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/reader/NotSharedReaderProvider.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/reader/NotSharedReaderProvider.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -1,14 +1,15 @@
 //$Id$
 package org.hibernate.search.reader;
 
+import static org.hibernate.search.reader.ReaderProviderHelper.buildMultiReader;
+import static org.hibernate.search.reader.ReaderProviderHelper.clean;
+
 import java.io.IOException;
 import java.util.Properties;
 
 import org.apache.lucene.index.IndexReader;
 import org.hibernate.search.SearchException;
 import org.hibernate.search.engine.SearchFactoryImplementor;
-import static org.hibernate.search.reader.ReaderProviderHelper.buildMultiReader;
-import static org.hibernate.search.reader.ReaderProviderHelper.clean;
 import org.hibernate.search.store.DirectoryProvider;
 
 /**

Modified: search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/reader/ReaderProvider.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/reader/ReaderProvider.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/reader/ReaderProvider.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -4,8 +4,8 @@
 import java.util.Properties;
 
 import org.apache.lucene.index.IndexReader;
+import org.hibernate.search.engine.SearchFactoryImplementor;
 import org.hibernate.search.store.DirectoryProvider;
-import org.hibernate.search.engine.SearchFactoryImplementor;
 
 /**
  * Responsible for providing and managing the lifecycle of a read only reader. The implementation must have a

Modified: search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/reader/SharedReaderProvider.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/reader/SharedReaderProvider.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/reader/SharedReaderProvider.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -1,6 +1,9 @@
 //$Id$
 package org.hibernate.search.reader;
 
+import static org.hibernate.search.reader.ReaderProviderHelper.buildMultiReader;
+import static org.hibernate.search.reader.ReaderProviderHelper.clean;
+
 import java.io.IOException;
 import java.util.Collections;
 import java.util.HashMap;
@@ -12,15 +15,12 @@
 
 import org.apache.lucene.index.IndexReader;
 import org.apache.lucene.index.MultiReader;
-import org.slf4j.Logger;
-
 import org.hibernate.annotations.common.AssertionFailure;
 import org.hibernate.search.SearchException;
 import org.hibernate.search.engine.SearchFactoryImplementor;
-import static org.hibernate.search.reader.ReaderProviderHelper.buildMultiReader;
-import static org.hibernate.search.reader.ReaderProviderHelper.clean;
 import org.hibernate.search.store.DirectoryProvider;
 import org.hibernate.search.util.LoggerFactory;
+import org.slf4j.Logger;
 
 /**
  * Share readers per <code>SearchFactory</code>, reusing them if they are still valid.

Modified: search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/reader/SharingBufferReaderProvider.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/reader/SharingBufferReaderProvider.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/reader/SharingBufferReaderProvider.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -13,13 +13,12 @@
 import org.apache.lucene.index.IndexReader;
 import org.apache.lucene.index.MultiReader;
 import org.apache.lucene.store.Directory;
-import org.slf4j.Logger;
-
 import org.hibernate.annotations.common.AssertionFailure;
 import org.hibernate.search.SearchException;
 import org.hibernate.search.engine.SearchFactoryImplementor;
 import org.hibernate.search.store.DirectoryProvider;
 import org.hibernate.search.util.LoggerFactory;
+import org.slf4j.Logger;
 
 /**
  * This <code>ReaderProvider</code> shares IndexReaders as long as they are "current";

Modified: search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/store/DirectoryProviderHelper.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/store/DirectoryProviderHelper.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/store/DirectoryProviderHelper.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -9,12 +9,11 @@
 import org.apache.lucene.index.IndexReader;
 import org.apache.lucene.index.IndexWriter;
 import org.apache.lucene.store.FSDirectory;
-import org.slf4j.Logger;
-
 import org.hibernate.annotations.common.util.StringHelper;
 import org.hibernate.search.SearchException;
 import org.hibernate.search.util.FileHelper;
 import org.hibernate.search.util.LoggerFactory;
+import org.slf4j.Logger;
 
 /**
  * @author Emmanuel Bernard

Modified: search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/store/FSDirectoryProvider.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/store/FSDirectoryProvider.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/store/FSDirectoryProvider.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -6,11 +6,10 @@
 import java.util.Properties;
 
 import org.apache.lucene.store.FSDirectory;
-import org.slf4j.Logger;
-
 import org.hibernate.search.SearchException;
 import org.hibernate.search.engine.SearchFactoryImplementor;
 import org.hibernate.search.util.LoggerFactory;
+import org.slf4j.Logger;
 
 /**
  * Use a Lucene {@link FSDirectory}. The base directory is represented by the property <i>hibernate.search.default.indexBase</i>

Modified: search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/store/FSMasterDirectoryProvider.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/store/FSMasterDirectoryProvider.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/store/FSMasterDirectoryProvider.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -12,12 +12,11 @@
 import java.util.concurrent.locks.Lock;
 
 import org.apache.lucene.store.FSDirectory;
-import org.slf4j.Logger;
-
 import org.hibernate.search.SearchException;
 import org.hibernate.search.engine.SearchFactoryImplementor;
 import org.hibernate.search.util.FileHelper;
 import org.hibernate.search.util.LoggerFactory;
+import org.slf4j.Logger;
 
 /**
  * File based DirectoryProvider that takes care of index copy

Modified: search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/store/FSSlaveDirectoryProvider.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/store/FSSlaveDirectoryProvider.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/store/FSSlaveDirectoryProvider.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -11,13 +11,12 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 
 import org.apache.lucene.store.FSDirectory;
-import org.slf4j.Logger;
-
 import org.hibernate.AssertionFailure;
 import org.hibernate.search.SearchException;
 import org.hibernate.search.engine.SearchFactoryImplementor;
 import org.hibernate.search.util.FileHelper;
 import org.hibernate.search.util.LoggerFactory;
+import org.slf4j.Logger;
 
 /**
  * File based directory provider that takes care of getting a version of the index

Modified: search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/store/IdHashShardingStrategy.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/store/IdHashShardingStrategy.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/store/IdHashShardingStrategy.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -1,8 +1,8 @@
 // $Id$
 package org.hibernate.search.store;
 
+import java.io.Serializable;
 import java.util.Properties;
-import java.io.Serializable;
 
 import org.apache.lucene.document.Document;
 

Modified: search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/store/NotShardedStrategy.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/store/NotShardedStrategy.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/store/NotShardedStrategy.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -1,8 +1,8 @@
 // $Id$
 package org.hibernate.search.store;
 
+import java.io.Serializable;
 import java.util.Properties;
-import java.io.Serializable;
 
 import org.apache.lucene.document.Document;
 import org.hibernate.annotations.common.AssertionFailure;

Modified: search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/store/optimization/IncrementalOptimizerStrategy.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/store/optimization/IncrementalOptimizerStrategy.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/store/optimization/IncrementalOptimizerStrategy.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -5,14 +5,13 @@
 import java.util.Properties;
 
 import org.apache.lucene.index.IndexWriter;
-import org.slf4j.Logger;
-
 import org.hibernate.search.SearchException;
 import org.hibernate.search.backend.Workspace;
 import org.hibernate.search.backend.configuration.ConfigurationParseHelper;
 import org.hibernate.search.engine.SearchFactoryImplementor;
 import org.hibernate.search.store.DirectoryProvider;
 import org.hibernate.search.util.LoggerFactory;
+import org.slf4j.Logger;
 
 /**
  * Optimization strategy triggered after a certain amount of operations

Modified: search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/store/optimization/NoOpOptimizerStrategy.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/store/optimization/NoOpOptimizerStrategy.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/store/optimization/NoOpOptimizerStrategy.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -3,9 +3,9 @@
 
 import java.util.Properties;
 
+import org.hibernate.search.backend.Workspace;
+import org.hibernate.search.engine.SearchFactoryImplementor;
 import org.hibernate.search.store.DirectoryProvider;
-import org.hibernate.search.engine.SearchFactoryImplementor;
-import org.hibernate.search.backend.Workspace;
 
 /**
  * @author Emmanuel Bernard

Modified: search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/util/ContextHelper.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/util/ContextHelper.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/util/ContextHelper.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -5,8 +5,8 @@
 import org.hibernate.Session;
 import org.hibernate.engine.SessionImplementor;
 import org.hibernate.event.PostInsertEventListener;
+import org.hibernate.search.engine.SearchFactoryImplementor;
 import org.hibernate.search.event.FullTextIndexEventListener;
-import org.hibernate.search.engine.SearchFactoryImplementor;
 
 /**
  * @author Emmanuel Bernard

Modified: search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/util/FilterCacheModeTypeHelper.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/util/FilterCacheModeTypeHelper.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/util/FilterCacheModeTypeHelper.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -1,7 +1,7 @@
 package org.hibernate.search.util;
 
+import org.hibernate.annotations.common.AssertionFailure;
 import org.hibernate.search.annotations.FilterCacheModeType;
-import org.hibernate.annotations.common.AssertionFailure;
 
 /**
  * @author Emmanuel Bernard

Modified: search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/util/HibernateSearchResourceLoader.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/util/HibernateSearchResourceLoader.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/main/java/org/hibernate/search/util/HibernateSearchResourceLoader.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -1,16 +1,15 @@
 package org.hibernate.search.util;
 
-import java.io.InputStream;
+import java.io.BufferedReader;
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.InputStreamReader;
-import java.io.BufferedReader;
-import java.util.List;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.List;
 
 import org.apache.solr.common.ResourceLoader;
 import org.apache.solr.util.plugin.ResourceLoaderAware;
-
 import org.hibernate.annotations.common.util.ReflectHelper;
 import org.hibernate.search.SearchException;
 

Modified: search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/AlternateDocument.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/AlternateDocument.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/AlternateDocument.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -5,12 +5,12 @@
 import javax.persistence.Id;
 import javax.persistence.Lob;
 
-import org.hibernate.search.annotations.Indexed;
+import org.hibernate.search.annotations.Boost;
 import org.hibernate.search.annotations.DocumentId;
 import org.hibernate.search.annotations.Field;
+import org.hibernate.search.annotations.Index;
+import org.hibernate.search.annotations.Indexed;
 import org.hibernate.search.annotations.Store;
-import org.hibernate.search.annotations.Index;
-import org.hibernate.search.annotations.Boost;
 
 /**
  * Example of 2 entities mapped in the same index

Modified: search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/Document.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/Document.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/Document.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -6,11 +6,11 @@
 import javax.persistence.Id;
 import javax.persistence.Lob;
 
-import org.hibernate.search.annotations.Indexed;
 import org.hibernate.search.annotations.Boost;
+import org.hibernate.search.annotations.DocumentId;
 import org.hibernate.search.annotations.Field;
 import org.hibernate.search.annotations.Index;
-import org.hibernate.search.annotations.DocumentId;
+import org.hibernate.search.annotations.Indexed;
 import org.hibernate.search.annotations.Store;
 
 @Entity

Modified: search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/FSDirectoryTest.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/FSDirectoryTest.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/FSDirectoryTest.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -14,7 +14,6 @@
 import org.apache.lucene.search.Query;
 import org.apache.lucene.search.TermQuery;
 import org.apache.lucene.search.TopDocs;
-
 import org.hibernate.Session;
 import org.hibernate.search.Environment;
 import org.hibernate.search.store.FSDirectoryProvider;

Modified: search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/RamDirectoryTest.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/RamDirectoryTest.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/RamDirectoryTest.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -1,11 +1,11 @@
 //$Id$
 package org.hibernate.search.test;
 
-import org.hibernate.Session;
-import org.hibernate.search.Search;
 import org.apache.lucene.index.IndexReader;
 import org.apache.lucene.index.Term;
 import org.apache.lucene.search.TermQuery;
+import org.hibernate.Session;
+import org.hibernate.search.Search;
 
 /**
  * @author Emmanuel Bernard

Modified: search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/SearchTestCase.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/SearchTestCase.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/SearchTestCase.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -6,8 +6,6 @@
 
 import org.apache.lucene.analysis.StopAnalyzer;
 import org.apache.lucene.store.Directory;
-import org.slf4j.Logger;
-
 import org.hibernate.HibernateException;
 import org.hibernate.Transaction;
 import org.hibernate.cfg.AnnotationConfiguration;
@@ -22,6 +20,7 @@
 import org.hibernate.search.event.FullTextIndexEventListener;
 import org.hibernate.search.store.RAMDirectoryProvider;
 import org.hibernate.tool.hbm2ddl.SchemaExport;
+import org.slf4j.Logger;
 
 /**
  * Base class for Hibernate Search unit tests.

Modified: search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/SerializationTestHelper.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/SerializationTestHelper.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/SerializationTestHelper.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -9,10 +9,10 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import junit.framework.TestCase;
+
 import org.hibernate.search.test.SerializationTestHelper.Foo.TestInnerClass;
 
-import junit.framework.TestCase;
-
 /**
  * @author Sanne Grinovero
  */

Modified: search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/TestCase.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/TestCase.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/TestCase.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -4,18 +4,17 @@
 import java.io.InputStream;
 
 import org.apache.lucene.analysis.StopAnalyzer;
-
 import org.hibernate.HibernateException;
 import org.hibernate.Interceptor;
 import org.hibernate.Session;
 import org.hibernate.SessionFactory;
-import org.hibernate.search.store.RAMDirectoryProvider;
 import org.hibernate.cfg.Configuration;
 import org.hibernate.cfg.Environment;
 import org.hibernate.dialect.Dialect;
 import org.hibernate.event.FlushEventListener;
 import org.hibernate.event.def.DefaultFlushEventListener;
 import org.hibernate.search.event.FullTextIndexEventListener;
+import org.hibernate.search.store.RAMDirectoryProvider;
 
 /**
  * A modified base class for tests without annotations.

Modified: search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/TransactionTest.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/TransactionTest.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/TransactionTest.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -4,7 +4,6 @@
 import java.io.IOException;
 
 import org.apache.lucene.index.IndexReader;
-
 import org.hibernate.Session;
 
 /**

Modified: search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/analyzer/AbstractTestAnalyzer.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/analyzer/AbstractTestAnalyzer.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/analyzer/AbstractTestAnalyzer.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -1,12 +1,12 @@
 // $Id$
 package org.hibernate.search.test.analyzer;
 
+import java.io.IOException;
 import java.io.Reader;
-import java.io.IOException;
 
 import org.apache.lucene.analysis.Analyzer;
+import org.apache.lucene.analysis.Token;
 import org.apache.lucene.analysis.TokenStream;
-import org.apache.lucene.analysis.Token;
 
 
 /**

Modified: search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/analyzer/AnalyzerTest.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/analyzer/AnalyzerTest.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/analyzer/AnalyzerTest.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -3,29 +3,26 @@
 
 import java.util.HashSet;
 import java.util.Set;
-import javax.print.attribute.HashAttributeSet;
 
 import org.apache.lucene.analysis.Analyzer;
 import org.apache.lucene.analysis.Token;
 import org.apache.lucene.analysis.standard.StandardAnalyzer;
 import org.apache.lucene.queryParser.QueryParser;
-import org.slf4j.Logger;
-
 import org.hibernate.Transaction;
 import org.hibernate.annotations.common.reflection.ReflectionManager;
 import org.hibernate.annotations.common.reflection.XClass;
 import org.hibernate.search.FullTextQuery;
 import org.hibernate.search.FullTextSession;
 import org.hibernate.search.Search;
-import org.hibernate.search.SearchFactory;
 import org.hibernate.search.SearchException;
-import org.hibernate.search.impl.InitContext;
-import org.hibernate.search.cfg.SearchConfiguration;
+import org.hibernate.search.SearchFactory;
 import org.hibernate.search.cfg.SearchConfigurationFromHibernateCore;
 import org.hibernate.search.engine.DocumentBuilderContainedEntity;
+import org.hibernate.search.impl.InitContext;
 import org.hibernate.search.test.SearchTestCase;
 import org.hibernate.search.test.util.AnalyzerUtils;
 import org.hibernate.search.util.LoggerFactory;
+import org.slf4j.Logger;
 
 /**
  * @author Emmanuel Bernard

Modified: search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/analyzer/Article.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/analyzer/Article.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/analyzer/Article.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -2,6 +2,7 @@
 package org.hibernate.search.test.analyzer;
 
 import java.util.Set;
+
 import javax.persistence.CascadeType;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
@@ -12,7 +13,6 @@
 import org.apache.solr.analysis.GermanStemFilterFactory;
 import org.apache.solr.analysis.LowerCaseFilterFactory;
 import org.apache.solr.analysis.StandardTokenizerFactory;
-
 import org.hibernate.search.annotations.AnalyzerDef;
 import org.hibernate.search.annotations.AnalyzerDefs;
 import org.hibernate.search.annotations.AnalyzerDiscriminator;

Modified: search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/analyzer/BlogEntry.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/analyzer/BlogEntry.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/analyzer/BlogEntry.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -2,6 +2,7 @@
 package org.hibernate.search.test.analyzer;
 
 import java.util.Set;
+
 import javax.persistence.CascadeType;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
@@ -12,7 +13,6 @@
 import org.apache.solr.analysis.GermanStemFilterFactory;
 import org.apache.solr.analysis.LowerCaseFilterFactory;
 import org.apache.solr.analysis.StandardTokenizerFactory;
-
 import org.hibernate.search.annotations.AnalyzerDef;
 import org.hibernate.search.annotations.AnalyzerDefs;
 import org.hibernate.search.annotations.AnalyzerDiscriminator;

Modified: search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/analyzer/DoubleAnalyzerTest.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/analyzer/DoubleAnalyzerTest.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/analyzer/DoubleAnalyzerTest.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -4,14 +4,13 @@
 import org.apache.lucene.queryParser.QueryParser;
 import org.apache.lucene.search.MatchAllDocsQuery;
 import org.apache.lucene.search.Query;
-import org.slf4j.Logger;
-
 import org.hibernate.Transaction;
 import org.hibernate.search.FullTextQuery;
 import org.hibernate.search.FullTextSession;
 import org.hibernate.search.Search;
 import org.hibernate.search.test.SearchTestCase;
 import org.hibernate.search.util.LoggerFactory;
+import org.slf4j.Logger;
 
 /**
  * Test for http://opensource.atlassian.com/projects/hibernate/browse/HSEARCH-263

Modified: search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/analyzer/MyComponent.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/analyzer/MyComponent.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/analyzer/MyComponent.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -1,9 +1,9 @@
 //$Id$
 package org.hibernate.search.test.analyzer;
 
+import org.hibernate.search.annotations.Analyzer;
 import org.hibernate.search.annotations.Field;
 import org.hibernate.search.annotations.Index;
-import org.hibernate.search.annotations.Analyzer;
 
 /**
  * @author Emmanuel Bernard

Modified: search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/analyzer/MyEntity.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/analyzer/MyEntity.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/analyzer/MyEntity.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -1,16 +1,16 @@
 //$Id$
 package org.hibernate.search.test.analyzer;
 
+import javax.persistence.Embedded;
 import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Embedded;
 
-import org.hibernate.search.annotations.Indexed;
+import org.hibernate.search.annotations.Analyzer;
 import org.hibernate.search.annotations.DocumentId;
 import org.hibernate.search.annotations.Field;
 import org.hibernate.search.annotations.Index;
-import org.hibernate.search.annotations.Analyzer;
+import org.hibernate.search.annotations.Indexed;
 import org.hibernate.search.annotations.IndexedEmbedded;
 
 /**

Modified: search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/analyzer/inheritance/AnalyzerInheritanceTest.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/analyzer/inheritance/AnalyzerInheritanceTest.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/analyzer/inheritance/AnalyzerInheritanceTest.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -20,8 +20,6 @@
 import org.apache.lucene.analysis.Analyzer;
 import org.apache.lucene.analysis.Token;
 import org.apache.lucene.queryParser.QueryParser;
-import org.slf4j.Logger;
-
 import org.hibernate.Transaction;
 import org.hibernate.search.FullTextQuery;
 import org.hibernate.search.FullTextSession;
@@ -29,6 +27,7 @@
 import org.hibernate.search.test.SearchTestCase;
 import org.hibernate.search.test.util.AnalyzerUtils;
 import org.hibernate.search.util.LoggerFactory;
+import org.slf4j.Logger;
 
 /**
  * Test to verify HSEARCH-267.

Modified: search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/analyzer/inheritance/ISOLatin1Analyzer.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/analyzer/inheritance/ISOLatin1Analyzer.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/analyzer/inheritance/ISOLatin1Analyzer.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -19,9 +19,9 @@
 
 import java.io.Reader;
 
+import org.apache.lucene.analysis.Analyzer;
+import org.apache.lucene.analysis.ISOLatin1AccentFilter;
 import org.apache.lucene.analysis.TokenStream;
-import org.apache.lucene.analysis.ISOLatin1AccentFilter;
-import org.apache.lucene.analysis.Analyzer;
 import org.apache.lucene.analysis.standard.StandardTokenizer;
 
 /**

Modified: search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/analyzer/solr/InsertWhitespaceFilter.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/analyzer/solr/InsertWhitespaceFilter.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/analyzer/solr/InsertWhitespaceFilter.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -1,15 +1,11 @@
 // $Id: AbstractTestAnalyzer.java 15547 2008-11-11 12:57:47Z hardy.ferentschik $
 package org.hibernate.search.test.analyzer.solr;
 
-import java.io.Reader;
 import java.io.IOException;
 
-import org.apache.lucene.analysis.Analyzer;
-import org.apache.lucene.analysis.TokenStream;
 import org.apache.lucene.analysis.Token;
-import org.apache.lucene.analysis.Tokenizer;
 import org.apache.lucene.analysis.TokenFilter;
-import org.apache.lucene.search.Filter;
+import org.apache.lucene.analysis.TokenStream;
 
 
 /**

Modified: search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/analyzer/solr/SolrAnalyzerTest.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/analyzer/solr/SolrAnalyzerTest.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/analyzer/solr/SolrAnalyzerTest.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -1,11 +1,10 @@
 // $Id$
 package org.hibernate.search.test.analyzer.solr;
 
-import org.apache.lucene.index.Term;
-import org.apache.lucene.search.TermQuery;
 import org.apache.lucene.analysis.Analyzer;
 import org.apache.lucene.analysis.Token;
-
+import org.apache.lucene.index.Term;
+import org.apache.lucene.search.TermQuery;
 import org.hibernate.Transaction;
 import org.hibernate.search.FullTextSession;
 import org.hibernate.search.Search;
@@ -29,7 +28,7 @@
 	public void testAnalyzerDef() throws Exception {
 		// create the test instance
 		Team team = new Team();
-		team.setDescription( "This is a D\u00E0scription" );  // \u00E0 == ˆ - ISOLatin1AccentFilterFactory should strip of diacritic 
+		team.setDescription( "This is a D\u00E0scription" );  // \u00E0 == � - ISOLatin1AccentFilterFactory should strip of diacritic 
 		team.setLocation( "Atlanta" );
 		team.setName( "ATL team" );
 
@@ -44,7 +43,7 @@
 		tx = fts.beginTransaction();
 		TermQuery query = new TermQuery( new Term( "description", "D\u00E0scription" ) );
 		assertEquals(
-				"iso latin filter should work.  ˆ should be a now", 0, fts.createFullTextQuery( query ).list().size()
+				"iso latin filter should work.  � should be a now", 0, fts.createFullTextQuery( query ).list().size()
 		);
 
 		query = new TermQuery( new Term( "description", "is" ) );

Modified: search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/analyzer/solr/Team.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/analyzer/solr/Team.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/analyzer/solr/Team.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -11,6 +11,8 @@
 import org.apache.solr.analysis.LengthFilterFactory;
 import org.apache.solr.analysis.LowerCaseFilterFactory;
 import org.apache.solr.analysis.LowerCaseTokenizerFactory;
+import org.apache.solr.analysis.PatternTokenizerFactory;
+import org.apache.solr.analysis.PhoneticFilterFactory;
 import org.apache.solr.analysis.PorterStemFilterFactory;
 import org.apache.solr.analysis.ShingleFilterFactory;
 import org.apache.solr.analysis.SnowballPorterFilterFactory;
@@ -20,9 +22,6 @@
 import org.apache.solr.analysis.SynonymFilterFactory;
 import org.apache.solr.analysis.TrimFilterFactory;
 import org.apache.solr.analysis.WordDelimiterFilterFactory;
-import org.apache.solr.analysis.PhoneticFilterFactory;
-import org.apache.solr.analysis.PatternTokenizerFactory;
-
 import org.hibernate.search.annotations.Analyzer;
 import org.hibernate.search.annotations.AnalyzerDef;
 import org.hibernate.search.annotations.AnalyzerDefs;

Modified: search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/bridge/BridgeTest.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/bridge/BridgeTest.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/bridge/BridgeTest.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -1,29 +1,28 @@
 //$Id$
 package org.hibernate.search.test.bridge;
 
+import java.net.URI;
+import java.net.URL;
+import java.util.Calendar;
 import java.util.Date;
-import java.util.List;
 import java.util.GregorianCalendar;
-import java.util.Calendar;
+import java.util.List;
 import java.util.TimeZone;
-import java.net.URI;
-import java.net.URL;
 
+import org.apache.lucene.analysis.SimpleAnalyzer;
+import org.apache.lucene.analysis.standard.StandardAnalyzer;
+import org.apache.lucene.index.Term;
+import org.apache.lucene.queryParser.QueryParser;
+import org.apache.lucene.search.BooleanClause;
+import org.apache.lucene.search.BooleanQuery;
+import org.apache.lucene.search.Query;
+import org.apache.lucene.search.TermQuery;
 import org.hibernate.Transaction;
 import org.hibernate.cfg.Configuration;
-
-import org.hibernate.search.test.SearchTestCase;
 import org.hibernate.search.Environment;
 import org.hibernate.search.FullTextSession;
 import org.hibernate.search.Search;
-import org.apache.lucene.search.Query;
-import org.apache.lucene.search.TermQuery;
-import org.apache.lucene.search.BooleanQuery;
-import org.apache.lucene.search.BooleanClause;
-import org.apache.lucene.queryParser.QueryParser;
-import org.apache.lucene.analysis.standard.StandardAnalyzer;
-import org.apache.lucene.analysis.SimpleAnalyzer;
-import org.apache.lucene.index.Term;
+import org.hibernate.search.test.SearchTestCase;
 
 /**
  * @author Emmanuel Bernard

Modified: search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/bridge/ClassBridgeTest.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/bridge/ClassBridgeTest.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/bridge/ClassBridgeTest.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -4,16 +4,16 @@
 import java.util.List;
 
 import org.apache.lucene.analysis.SimpleAnalyzer;
+import org.apache.lucene.document.Document;
 import org.apache.lucene.queryParser.QueryParser;
 import org.apache.lucene.search.Query;
-import org.apache.lucene.document.Document;
+import org.hibernate.ScrollableResults;
 import org.hibernate.Transaction;
-import org.hibernate.ScrollableResults;
 import org.hibernate.cfg.Configuration;
 import org.hibernate.search.Environment;
+import org.hibernate.search.FullTextQuery;
 import org.hibernate.search.FullTextSession;
 import org.hibernate.search.Search;
-import org.hibernate.search.FullTextQuery;
 import org.hibernate.search.test.SearchTestCase;
 
 /**

Modified: search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/bridge/Cloud.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/bridge/Cloud.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/bridge/Cloud.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -1,9 +1,10 @@
 //$Id$
 package org.hibernate.search.test.bridge;
 
+import java.net.URI;
+import java.net.URL;
 import java.util.Date;
-import java.net.URL;
-import java.net.URI;
+
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;

Modified: search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/bridge/Departments.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/bridge/Departments.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/bridge/Departments.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -2,17 +2,17 @@
 package org.hibernate.search.test.bridge;
 
 import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
-import javax.persistence.GeneratedValue;
 
-import org.hibernate.search.annotations.Indexed;
 import org.hibernate.search.annotations.ClassBridge;
+import org.hibernate.search.annotations.ClassBridges;
+import org.hibernate.search.annotations.DocumentId;
+import org.hibernate.search.annotations.Field;
 import org.hibernate.search.annotations.Index;
+import org.hibernate.search.annotations.Indexed;
+import org.hibernate.search.annotations.Parameter;
 import org.hibernate.search.annotations.Store;
-import org.hibernate.search.annotations.Parameter;
-import org.hibernate.search.annotations.DocumentId;
-import org.hibernate.search.annotations.Field;
-import org.hibernate.search.annotations.ClassBridges;
 
 /**
  * This is just a simple copy of the Department entity to allow

Modified: search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/bridge/TruncateStringBridge.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/bridge/TruncateStringBridge.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/bridge/TruncateStringBridge.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -3,8 +3,8 @@
 
 import java.util.Map;
 
+import org.hibernate.search.bridge.ParameterizedBridge;
 import org.hibernate.search.bridge.StringBridge;
-import org.hibernate.search.bridge.ParameterizedBridge;
 
 /**
  * @author Emmanuel Bernard

Modified: search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/bridge/UnresolvedBridgeTest.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/bridge/UnresolvedBridgeTest.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/bridge/UnresolvedBridgeTest.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -1,10 +1,11 @@
 //$Id$
 package org.hibernate.search.test.bridge;
 
+import junit.framework.TestCase;
+
+import org.hibernate.cfg.AnnotationConfiguration;
 import org.hibernate.search.SearchException;
 import org.hibernate.search.store.RAMDirectoryProvider;
-import org.hibernate.cfg.AnnotationConfiguration;
-import junit.framework.TestCase;
 
 /**
  * @author Emmanuel Bernard

Modified: search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/classloading/Animal.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/classloading/Animal.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/classloading/Animal.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -17,10 +17,10 @@
 */
 package org.hibernate.search.test.classloading;
 
+import org.hibernate.search.annotations.DocumentId;
 import org.hibernate.search.annotations.Field;
 import org.hibernate.search.annotations.Index;
 import org.hibernate.search.annotations.Indexed;
-import org.hibernate.search.annotations.DocumentId;
 
 /**
  * Test class which is configured via XML and does not depend on Hibernate Annotations.

Modified: search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/classloading/NoAnnotationsTest.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/classloading/NoAnnotationsTest.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/classloading/NoAnnotationsTest.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -5,7 +5,6 @@
 
 import org.apache.lucene.index.Term;
 import org.apache.lucene.search.TermQuery;
-
 import org.hibernate.Session;
 import org.hibernate.Transaction;
 import org.hibernate.search.Search;

Modified: search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/configuration/EventListenerRegisterTest.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/configuration/EventListenerRegisterTest.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/configuration/EventListenerRegisterTest.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -3,6 +3,8 @@
 
 import java.util.Properties;
 
+import junit.framework.TestCase;
+
 import org.hibernate.event.EventListeners;
 import org.hibernate.event.PostCollectionRecreateEvent;
 import org.hibernate.event.PostCollectionRecreateEventListener;
@@ -18,11 +20,9 @@
 import org.hibernate.event.PostUpdateEventListener;
 import org.hibernate.search.Environment;
 import org.hibernate.search.event.EventListenerRegister;
+import org.hibernate.search.event.FullTextIndexCollectionEventListener;
 import org.hibernate.search.event.FullTextIndexEventListener;
-import org.hibernate.search.event.FullTextIndexCollectionEventListener;
 
-import junit.framework.TestCase;
-
 /**
  * @author Sanne Grinovero
  */

Modified: search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/configuration/LuceneIndexingParametersTest.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/configuration/LuceneIndexingParametersTest.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/configuration/LuceneIndexingParametersTest.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -1,6 +1,15 @@
 // $Id$
 package org.hibernate.search.test.configuration;
 
+import static org.hibernate.search.backend.configuration.IndexWriterSetting.MAX_BUFFERED_DOCS;
+import static org.hibernate.search.backend.configuration.IndexWriterSetting.MAX_FIELD_LENGTH;
+import static org.hibernate.search.backend.configuration.IndexWriterSetting.MAX_MERGE_DOCS;
+import static org.hibernate.search.backend.configuration.IndexWriterSetting.MERGE_FACTOR;
+import static org.hibernate.search.backend.configuration.IndexWriterSetting.RAM_BUFFER_SIZE;
+import static org.hibernate.search.backend.configuration.IndexWriterSetting.USE_COMPOUND_FILE;
+import static org.hibernate.search.test.configuration.ConfigurationReadTestCase.TransactionType.BATCH;
+import static org.hibernate.search.test.configuration.ConfigurationReadTestCase.TransactionType.TRANSACTION;
+
 import java.io.IOException;
 import java.util.Properties;
 
@@ -10,15 +19,6 @@
 import org.hibernate.search.test.query.Author;
 import org.hibernate.search.test.query.Book;
 
-import static org.hibernate.search.backend.configuration.IndexWriterSetting.MAX_BUFFERED_DOCS;
-import static org.hibernate.search.backend.configuration.IndexWriterSetting.MAX_MERGE_DOCS;
-import static org.hibernate.search.backend.configuration.IndexWriterSetting.MERGE_FACTOR;
-import static org.hibernate.search.backend.configuration.IndexWriterSetting.RAM_BUFFER_SIZE;
-import static org.hibernate.search.backend.configuration.IndexWriterSetting.USE_COMPOUND_FILE;
-import static org.hibernate.search.backend.configuration.IndexWriterSetting.MAX_FIELD_LENGTH;
-import static org.hibernate.search.test.configuration.ConfigurationReadTestCase.TransactionType.TRANSACTION;
-import static org.hibernate.search.test.configuration.ConfigurationReadTestCase.TransactionType.BATCH;
-
 /**
  * @author Sanne Grinovero
  */

Modified: search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/configuration/MaskedPropertiesTest.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/configuration/MaskedPropertiesTest.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/configuration/MaskedPropertiesTest.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -2,8 +2,8 @@
 package org.hibernate.search.test.configuration;
 
 import java.io.IOException;
+import java.util.Enumeration;
 import java.util.Properties;
-import java.util.Enumeration;
 
 import org.hibernate.search.backend.configuration.MaskedProperty;
 import org.hibernate.search.test.SerializationTestHelper;

Modified: search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/configuration/ShardsConfigurationTest.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/configuration/ShardsConfigurationTest.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/configuration/ShardsConfigurationTest.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -6,8 +6,9 @@
 import static org.hibernate.search.backend.configuration.IndexWriterSetting.MERGE_FACTOR;
 import static org.hibernate.search.backend.configuration.IndexWriterSetting.RAM_BUFFER_SIZE;
 import static org.hibernate.search.backend.configuration.IndexWriterSetting.TERM_INDEX_INTERVAL;
+import static org.hibernate.search.test.configuration.ConfigurationReadTestCase.TransactionType.BATCH;
 import static org.hibernate.search.test.configuration.ConfigurationReadTestCase.TransactionType.TRANSACTION;
-import static org.hibernate.search.test.configuration.ConfigurationReadTestCase.TransactionType.BATCH;
+
 import org.hibernate.search.store.DirectoryProvider;
 import org.hibernate.search.store.FSDirectoryProvider;
 import org.hibernate.search.store.IndexShardingStrategy;

Modified: search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/configuration/UselessShardingStrategy.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/configuration/UselessShardingStrategy.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/configuration/UselessShardingStrategy.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -2,8 +2,8 @@
 package org.hibernate.search.test.configuration;
 
 import java.io.Serializable;
+import java.util.Enumeration;
 import java.util.Properties;
-import java.util.Enumeration;
 
 import org.apache.lucene.document.Document;
 import org.hibernate.search.store.DirectoryProvider;

Modified: search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/directoryProvider/DirectoryProviderHelperTest.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/directoryProvider/DirectoryProviderHelperTest.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/directoryProvider/DirectoryProviderHelperTest.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -3,7 +3,9 @@
 
 import java.io.File;
 import java.util.Properties;
+
 import junit.framework.TestCase;
+
 import org.hibernate.search.SearchException;
 import org.hibernate.search.store.DirectoryProviderHelper;
 import org.hibernate.search.util.FileHelper;

Modified: search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/directoryProvider/FSSlaveAndMasterDPTest.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/directoryProvider/FSSlaveAndMasterDPTest.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/directoryProvider/FSSlaveAndMasterDPTest.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -7,16 +7,15 @@
 
 import org.apache.lucene.analysis.StopAnalyzer;
 import org.apache.lucene.queryParser.QueryParser;
-import org.slf4j.Logger;
-
+import org.hibernate.HibernateException;
 import org.hibernate.Session;
 import org.hibernate.Transaction;
-import org.hibernate.HibernateException;
 import org.hibernate.cfg.Configuration;
 import org.hibernate.search.FullTextSession;
 import org.hibernate.search.Search;
 import org.hibernate.search.util.FileHelper;
 import org.hibernate.search.util.LoggerFactory;
+import org.slf4j.Logger;
 
 /**
  * Test case for master/slave directories.

Modified: search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/embedded/Address.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/embedded/Address.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/embedded/Address.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -3,20 +3,21 @@
 
 import java.util.HashSet;
 import java.util.Set;
+
+import javax.persistence.CascadeType;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
 import javax.persistence.ManyToOne;
 import javax.persistence.OneToMany;
-import javax.persistence.CascadeType;
 
+import org.hibernate.annotations.Target;
 import org.hibernate.search.annotations.ContainedIn;
 import org.hibernate.search.annotations.DocumentId;
 import org.hibernate.search.annotations.Field;
 import org.hibernate.search.annotations.Index;
 import org.hibernate.search.annotations.Indexed;
 import org.hibernate.search.annotations.IndexedEmbedded;
-import org.hibernate.annotations.Target;
 
 /**
  * @author Emmanuel Bernard

Modified: search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/embedded/Author.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/embedded/Author.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/embedded/Author.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -2,12 +2,12 @@
 package org.hibernate.search.test.embedded;
 
 import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
-import javax.persistence.GeneratedValue;
 
+import org.hibernate.search.annotations.DocumentId;
 import org.hibernate.search.annotations.Field;
 import org.hibernate.search.annotations.Index;
-import org.hibernate.search.annotations.DocumentId;
 
 /**
  * @author Emmanuel Bernard

Modified: search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/embedded/NonIndexedEntity.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/embedded/NonIndexedEntity.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/embedded/NonIndexedEntity.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -1,8 +1,8 @@
 package org.hibernate.search.test.embedded;
 
 import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
-import javax.persistence.GeneratedValue;
 
 /**
  * @author Emmanuel Bernard

Modified: search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/embedded/Order.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/embedded/Order.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/embedded/Order.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -1,14 +1,14 @@
 //$Id$
 package org.hibernate.search.test.embedded;
 
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Entity;
 import javax.persistence.Table;
 
+import org.hibernate.search.annotations.DocumentId;
 import org.hibernate.search.annotations.Field;
 import org.hibernate.search.annotations.Index;
-import org.hibernate.search.annotations.DocumentId;
 
 /**
  * @author Emmanuel Bernard

Modified: search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/embedded/Owner.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/embedded/Owner.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/embedded/Owner.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -3,10 +3,10 @@
 
 import javax.persistence.Embeddable;
 
+import org.hibernate.annotations.Parent;
 import org.hibernate.search.annotations.Field;
 import org.hibernate.search.annotations.Index;
 import org.hibernate.search.annotations.IndexedEmbedded;
-import org.hibernate.annotations.Parent;
 
 /**
  * @author Emmanuel Bernard

Modified: search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/embedded/Product.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/embedded/Product.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/embedded/Product.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -1,23 +1,24 @@
 //$Id$
 package org.hibernate.search.test.embedded;
 
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
 import java.util.Set;
-import java.util.Map;
-import java.util.HashSet;
-import java.util.HashMap;
+
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Entity;
 import javax.persistence.ManyToMany;
-import javax.persistence.Column;
-import javax.persistence.CascadeType;
 
-import org.hibernate.search.annotations.Indexed;
+import org.hibernate.annotations.MapKey;
+import org.hibernate.search.annotations.DocumentId;
 import org.hibernate.search.annotations.Field;
 import org.hibernate.search.annotations.Index;
+import org.hibernate.search.annotations.Indexed;
 import org.hibernate.search.annotations.IndexedEmbedded;
-import org.hibernate.search.annotations.DocumentId;
-import org.hibernate.annotations.MapKey;
 
 /**
  * @author Emmanuel Bernard

Modified: search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/embedded/State.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/embedded/State.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/embedded/State.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -9,7 +9,6 @@
 import org.hibernate.search.annotations.ContainedIn;
 import org.hibernate.search.annotations.DocumentId;
 import org.hibernate.search.annotations.Field;
-import org.hibernate.search.annotations.Indexed;
 
 /**
  * @author Hardy Ferentschik

Modified: search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/embedded/doubleinsert/Contact.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/embedded/doubleinsert/Contact.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/embedded/doubleinsert/Contact.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -6,6 +6,7 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
+
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.DiscriminatorColumn;

Modified: search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/fieldAccess/FieldAccessTest.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/fieldAccess/FieldAccessTest.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/fieldAccess/FieldAccessTest.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -3,13 +3,13 @@
 
 import java.util.List;
 
-import org.hibernate.search.test.SearchTestCase;
+import org.apache.lucene.analysis.standard.StandardAnalyzer;
+import org.apache.lucene.queryParser.QueryParser;
+import org.hibernate.Session;
+import org.hibernate.Transaction;
 import org.hibernate.search.FullTextSession;
 import org.hibernate.search.Search;
-import org.hibernate.Session;
-import org.hibernate.Transaction;
-import org.apache.lucene.queryParser.QueryParser;
-import org.apache.lucene.analysis.standard.StandardAnalyzer;
+import org.hibernate.search.test.SearchTestCase;
 
 /**
  * @author Emmanuel Bernard

Modified: search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/filter/AndDocIdSetsTest.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/filter/AndDocIdSetsTest.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/filter/AndDocIdSetsTest.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -7,13 +7,13 @@
 import java.util.List;
 import java.util.Random;
 
+import junit.framework.TestCase;
+
 import org.apache.lucene.search.DocIdSet;
 import org.apache.lucene.search.DocIdSetIterator;
 import org.apache.lucene.util.DocIdBitSet;
 import org.hibernate.search.filter.AndDocIdSet;
 
-import junit.framework.TestCase;
-
 /**
  * Functionality testcase for org.hibernate.search.filter.AndDocIdSet.
  * There is a main method to run some very approximate performance

Modified: search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/filter/Driver.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/filter/Driver.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/filter/Driver.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -2,18 +2,19 @@
 package org.hibernate.search.test.filter;
 
 import java.util.Date;
+
 import javax.persistence.Entity;
 import javax.persistence.Id;
 
-import org.hibernate.search.annotations.Indexed;
+import org.hibernate.search.annotations.DateBridge;
 import org.hibernate.search.annotations.DocumentId;
 import org.hibernate.search.annotations.Field;
+import org.hibernate.search.annotations.FilterCacheModeType;
+import org.hibernate.search.annotations.FullTextFilterDef;
+import org.hibernate.search.annotations.FullTextFilterDefs;
 import org.hibernate.search.annotations.Index;
-import org.hibernate.search.annotations.DateBridge;
+import org.hibernate.search.annotations.Indexed;
 import org.hibernate.search.annotations.Resolution;
-import org.hibernate.search.annotations.FullTextFilterDef;
-import org.hibernate.search.annotations.FullTextFilterDefs;
-import org.hibernate.search.annotations.FilterCacheModeType;
 
 /**
  * @author Emmanuel Bernard

Modified: search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/filter/ExcludeAllFilter.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/filter/ExcludeAllFilter.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/filter/ExcludeAllFilter.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -1,13 +1,12 @@
 // $Id$
 package org.hibernate.search.test.filter;
 
-import java.util.BitSet;
 import java.io.IOException;
+import java.util.BitSet;
 
+import org.apache.lucene.index.IndexReader;
 import org.apache.lucene.search.DocIdSet;
 import org.apache.lucene.search.Filter;
-import org.apache.lucene.index.IndexReader;
-
 import org.hibernate.search.filter.EmptyDocIdBitSet;
 
 /**

Modified: search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/filter/FiltersOptimizationTest.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/filter/FiltersOptimizationTest.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/filter/FiltersOptimizationTest.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -3,17 +3,16 @@
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.BitSet;
-import java.util.Collections;
 import java.util.List;
 
+import junit.framework.TestCase;
+
 import org.apache.lucene.search.DocIdSet;
 import org.apache.lucene.search.DocIdSetIterator;
 import org.apache.lucene.util.DocIdBitSet;
 import org.apache.lucene.util.OpenBitSet;
 import org.hibernate.search.filter.FilterOptimizationHelper;
 
-import junit.framework.TestCase;
-
 /**
  * Used to test org.hibernate.search.filter.FiltersOptimizationHelper
  * @see org.hibernate.search.filter.FilterOptimizationHelper

Modified: search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/filter/InstanceBasedExcludeAllFilter.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/filter/InstanceBasedExcludeAllFilter.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/filter/InstanceBasedExcludeAllFilter.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -1,12 +1,11 @@
 package org.hibernate.search.test.filter;
 
-import java.util.BitSet;
 import java.io.IOException;
+import java.util.BitSet;
 
 import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.search.Filter;
 import org.apache.lucene.search.DocIdSet;
-
+import org.apache.lucene.search.Filter;
 import org.hibernate.search.filter.EmptyDocIdBitSet;
 
 /**

Modified: search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/filter/SecurityFilterFactory.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/filter/SecurityFilterFactory.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/filter/SecurityFilterFactory.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -6,7 +6,6 @@
 import org.apache.lucene.search.Query;
 import org.apache.lucene.search.QueryWrapperFilter;
 import org.apache.lucene.search.TermQuery;
-
 import org.hibernate.search.annotations.Factory;
 import org.hibernate.search.annotations.Key;
 import org.hibernate.search.filter.FilterKey;

Modified: search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/filter/Soap.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/filter/Soap.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/filter/Soap.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -1,9 +1,9 @@
 //$Id$
 package org.hibernate.search.test.filter;
 
-import javax.persistence.Id;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
 
 import org.hibernate.search.annotations.DocumentId;
 import org.hibernate.search.annotations.Field;

Modified: search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/id/Animal.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/id/Animal.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/id/Animal.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -18,8 +18,8 @@
 package org.hibernate.search.test.id;
 
 import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
-import javax.persistence.GeneratedValue;
 
 import org.hibernate.search.annotations.Field;
 import org.hibernate.search.annotations.Index;

Modified: search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/id/EmbeddedIdTest.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/id/EmbeddedIdTest.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/id/EmbeddedIdTest.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -5,7 +5,6 @@
 
 import org.apache.lucene.index.Term;
 import org.apache.lucene.search.TermQuery;
-
 import org.hibernate.Session;
 import org.hibernate.Transaction;
 import org.hibernate.search.Search;

Modified: search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/id/ImplicitIdTest.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/id/ImplicitIdTest.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/id/ImplicitIdTest.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -5,7 +5,6 @@
 
 import org.apache.lucene.index.Term;
 import org.apache.lucene.search.TermQuery;
-
 import org.hibernate.Session;
 import org.hibernate.Transaction;
 import org.hibernate.search.Search;

Modified: search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/id/Person.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/id/Person.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/id/Person.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -1,12 +1,12 @@
 // $Id$
 package org.hibernate.search.test.id;
 
+import javax.persistence.EmbeddedId;
 import javax.persistence.Entity;
-import javax.persistence.EmbeddedId;
 
-import org.hibernate.search.annotations.FieldBridge;
 import org.hibernate.search.annotations.DocumentId;
 import org.hibernate.search.annotations.Field;
+import org.hibernate.search.annotations.FieldBridge;
 import org.hibernate.search.annotations.Indexed;
 
 /**

Modified: search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/id/PersonPK.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/id/PersonPK.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/id/PersonPK.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -2,6 +2,7 @@
 package org.hibernate.search.test.id;
 
 import java.io.Serializable;
+
 import javax.persistence.Embeddable;
 
 /**

Modified: search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/id/PersonPKBridge.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/id/PersonPKBridge.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/id/PersonPKBridge.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -3,7 +3,6 @@
 
 import org.apache.lucene.document.Document;
 import org.apache.lucene.document.Field;
-
 import org.hibernate.search.bridge.LuceneOptions;
 import org.hibernate.search.bridge.TwoWayFieldBridge;
 

Modified: search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/id/providedId/ProvidedIdPerson.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/id/providedId/ProvidedIdPerson.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/id/providedId/ProvidedIdPerson.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -1,14 +1,20 @@
 package org.hibernate.search.test.id.providedId;
 
-import org.hibernate.search.annotations.*;
-import org.hibernate.search.bridge.builtin.LongBridge;
+import java.io.Serializable;
 
 import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
-import javax.persistence.GeneratedValue;
-import java.io.Serializable;
 
+import org.hibernate.search.annotations.Field;
+import org.hibernate.search.annotations.FieldBridge;
+import org.hibernate.search.annotations.Index;
+import org.hibernate.search.annotations.Indexed;
+import org.hibernate.search.annotations.ProvidedId;
+import org.hibernate.search.annotations.Store;
+import org.hibernate.search.bridge.builtin.LongBridge;
 
+
 /**
  * @author Navin Surtani (<a href="mailto:nsurtani at redhat.com">nsurtani at redhat.com</a>)
  */

Modified: search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/id/providedId/ProvidedIdTest.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/id/providedId/ProvidedIdTest.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/id/providedId/ProvidedIdTest.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -5,7 +5,6 @@
 import org.apache.lucene.search.IndexSearcher;
 import org.apache.lucene.search.Query;
 import org.apache.lucene.search.TopDocs;
-
 import org.hibernate.Session;
 import org.hibernate.Transaction;
 import org.hibernate.search.FullTextSession;

Modified: search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/indexingStrategy/ManualIndexingStrategyTest.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/indexingStrategy/ManualIndexingStrategyTest.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/indexingStrategy/ManualIndexingStrategyTest.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -2,13 +2,12 @@
 package org.hibernate.search.test.indexingStrategy;
 
 import org.apache.lucene.index.IndexReader;
-
 import org.hibernate.Session;
 import org.hibernate.cfg.Configuration;
+import org.hibernate.search.Environment;
 import org.hibernate.search.test.AlternateDocument;
 import org.hibernate.search.test.Document;
 import org.hibernate.search.test.SearchTestCase;
-import org.hibernate.search.Environment;
 
 /**
  * @author Emmanuel Bernard

Modified: search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/inheritance/Animal.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/inheritance/Animal.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/inheritance/Animal.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -1,7 +1,6 @@
 //$Id$
 package org.hibernate.search.test.inheritance;
 
-import java.io.Serializable;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
@@ -9,7 +8,6 @@
 import org.hibernate.search.annotations.DocumentId;
 import org.hibernate.search.annotations.Field;
 import org.hibernate.search.annotations.Index;
-import org.hibernate.search.annotations.Indexed;
 import org.hibernate.search.annotations.Store;
 
 /**

Modified: search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/inheritance/Being.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/inheritance/Being.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/inheritance/Being.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -4,9 +4,8 @@
 import javax.persistence.MappedSuperclass;
 
 import org.hibernate.search.annotations.Field;
-import org.hibernate.search.annotations.Index;
 import org.hibernate.search.annotations.FieldBridge;
-import org.hibernate.search.annotations.Indexed;
+import org.hibernate.search.annotations.Index;
 import org.hibernate.search.test.bridge.PaddedIntegerBridge;
 
 /**

Modified: search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/inheritance/InheritanceTest.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/inheritance/InheritanceTest.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/inheritance/InheritanceTest.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -1,8 +1,8 @@
 //$Id$
 package org.hibernate.search.test.inheritance;
 
-import java.util.List;
 import java.io.Serializable;
+import java.util.List;
 
 import org.apache.lucene.analysis.StopAnalyzer;
 import org.apache.lucene.index.Term;
@@ -10,13 +10,12 @@
 import org.apache.lucene.search.Query;
 import org.apache.lucene.search.RangeQuery;
 import org.apache.lucene.search.TermQuery;
-import org.slf4j.Logger;
-
 import org.hibernate.Transaction;
 import org.hibernate.search.FullTextSession;
 import org.hibernate.search.Search;
-import org.hibernate.search.util.LoggerFactory;
 import org.hibernate.search.test.SearchTestCase;
+import org.hibernate.search.util.LoggerFactory;
+import org.slf4j.Logger;
 
 /**
  * @author Emmanuel Bernard

Modified: search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/inheritance/Mammal.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/inheritance/Mammal.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/inheritance/Mammal.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -2,6 +2,7 @@
 package org.hibernate.search.test.inheritance;
 
 import java.io.Serializable;
+
 import javax.persistence.Entity;
 
 import org.hibernate.search.annotations.Field;

Modified: search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/jms/master/JMSMasterTest.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/jms/master/JMSMasterTest.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/jms/master/JMSMasterTest.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -6,6 +6,7 @@
 import java.sql.Statement;
 import java.util.ArrayList;
 import java.util.List;
+
 import javax.jms.MessageConsumer;
 import javax.jms.ObjectMessage;
 import javax.jms.Queue;
@@ -21,7 +22,6 @@
 import org.apache.lucene.document.Field;
 import org.apache.lucene.queryParser.QueryParser;
 import org.apache.lucene.search.Query;
-
 import org.hibernate.Session;
 import org.hibernate.cfg.Configuration;
 import org.hibernate.search.Environment;

Modified: search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/jms/master/MDBSearchController.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/jms/master/MDBSearchController.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/jms/master/MDBSearchController.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -1,11 +1,9 @@
 //$Id$
 package org.hibernate.search.test.jms.master;
 
-import javax.jms.MessageListener;
-
-import org.hibernate.search.backend.impl.jms.AbstractJMSHibernateSearchController;
 import org.hibernate.Session;
 import org.hibernate.SessionFactory;
+import org.hibernate.search.backend.impl.jms.AbstractJMSHibernateSearchController;
 
 /**
  * @author Emmanuel Bernard

Modified: search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/jms/master/TShirt.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/jms/master/TShirt.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/jms/master/TShirt.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -6,10 +6,10 @@
 import javax.persistence.Id;
 import javax.persistence.Table;
 
-import org.hibernate.search.annotations.Indexed;
 import org.hibernate.search.annotations.DocumentId;
 import org.hibernate.search.annotations.Field;
 import org.hibernate.search.annotations.Index;
+import org.hibernate.search.annotations.Indexed;
 
 /**
  * @author Emmanuel Bernard

Modified: search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/jms/slave/JMSSlaveTest.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/jms/slave/JMSSlaveTest.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/jms/slave/JMSSlaveTest.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -9,13 +9,12 @@
 import javax.naming.Context;
 
 import org.apache.activemq.broker.BrokerService;
-
+import org.hibernate.Session;
+import org.hibernate.Transaction;
 import org.hibernate.cfg.Configuration;
 import org.hibernate.search.Environment;
 import org.hibernate.search.backend.impl.jms.JMSBackendQueueProcessorFactory;
 import org.hibernate.search.test.SearchTestCase;
-import org.hibernate.Session;
-import org.hibernate.Transaction;
 
 /**
  * Checks that the Slave in a JMS configuration proplerly places index jobs onto the queue.

Modified: search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/jms/slave/SearchQueueChecker.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/jms/slave/SearchQueueChecker.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/jms/slave/SearchQueueChecker.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -2,12 +2,12 @@
 package org.hibernate.search.test.jms.slave;
 
 import java.util.List;
+
+import javax.jms.JMSException;
+import javax.jms.Message;
 import javax.jms.MessageListener;
-import javax.jms.Message;
 import javax.jms.ObjectMessage;
-import javax.jms.JMSException;
 
-
 import org.hibernate.search.backend.LuceneWork;
 
 /**

Modified: search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/jms/slave/TShirt.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/jms/slave/TShirt.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/jms/slave/TShirt.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -3,13 +3,13 @@
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
-import javax.persistence.GeneratedValue;
 
-import org.hibernate.search.annotations.Indexed;
 import org.hibernate.search.annotations.DocumentId;
 import org.hibernate.search.annotations.Field;
 import org.hibernate.search.annotations.Index;
+import org.hibernate.search.annotations.Indexed;
 
 /**
  * @author Emmanuel Bernard

Modified: search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/jpa/Bretzel.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/jpa/Bretzel.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/jpa/Bretzel.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -2,13 +2,13 @@
 package org.hibernate.search.test.jpa;
 
 import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
-import javax.persistence.GeneratedValue;
 
-import org.hibernate.search.annotations.Indexed;
 import org.hibernate.search.annotations.DocumentId;
 import org.hibernate.search.annotations.Field;
 import org.hibernate.search.annotations.Index;
+import org.hibernate.search.annotations.Indexed;
 
 /**
  * @author Emmanuel Bernard

Modified: search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/jpa/EntityManagerTest.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/jpa/EntityManagerTest.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/jpa/EntityManagerTest.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -1,13 +1,13 @@
 //$Id$
 package org.hibernate.search.test.jpa;
 
-import org.hibernate.search.jpa.Search;
-import org.hibernate.search.jpa.FullTextEntityManager;
+import org.apache.lucene.analysis.StopAnalyzer;
+import org.apache.lucene.index.Term;
+import org.apache.lucene.queryParser.QueryParser;
 import org.apache.lucene.search.Query;
 import org.apache.lucene.search.TermQuery;
-import org.apache.lucene.queryParser.QueryParser;
-import org.apache.lucene.analysis.StopAnalyzer;
-import org.apache.lucene.index.Term;
+import org.hibernate.search.jpa.FullTextEntityManager;
+import org.hibernate.search.jpa.Search;
 
 /**
  * @author Emmanuel Bernard

Modified: search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/jpa/JPATestCase.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/jpa/JPATestCase.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/jpa/JPATestCase.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -1,19 +1,21 @@
 //$Id$
 package org.hibernate.search.test.jpa;
 
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
 import java.util.Map;
-import java.util.HashMap;
 import java.util.Properties;
-import java.util.ArrayList;import java.util.Arrays;
-import java.io.InputStream;
-import java.io.IOException;
+
 import javax.persistence.EntityManagerFactory;
 import javax.persistence.Persistence;
 
+import org.apache.lucene.analysis.StopAnalyzer;
 import org.hibernate.cfg.Environment;
 import org.hibernate.ejb.HibernatePersistence;
 import org.hibernate.search.store.RAMDirectoryProvider;
-import org.apache.lucene.analysis.StopAnalyzer;
 
 /**
  * @author Emmanuel Bernard

Modified: search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/optimizer/Construction.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/optimizer/Construction.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/optimizer/Construction.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -2,13 +2,13 @@
 package org.hibernate.search.test.optimizer;
 
 import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
-import javax.persistence.GeneratedValue;
 
-import org.hibernate.search.annotations.Indexed;
 import org.hibernate.search.annotations.DocumentId;
 import org.hibernate.search.annotations.Field;
 import org.hibernate.search.annotations.Index;
+import org.hibernate.search.annotations.Indexed;
 
 /**
  * @author Emmanuel Bernard

Modified: search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/optimizer/Worker.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/optimizer/Worker.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/optimizer/Worker.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -1,14 +1,14 @@
 //$Id$
 package org.hibernate.search.test.optimizer;
 
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Entity;
 
-import org.hibernate.search.annotations.Indexed;
 import org.hibernate.search.annotations.DocumentId;
 import org.hibernate.search.annotations.Field;
 import org.hibernate.search.annotations.Index;
+import org.hibernate.search.annotations.Indexed;
 
 /**
  * @author Emmanuel Bernard

Modified: search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/perf/Boat.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/perf/Boat.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/perf/Boat.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -2,12 +2,12 @@
 package org.hibernate.search.test.perf;
 
 import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
-import javax.persistence.GeneratedValue;
 
+import org.hibernate.search.annotations.DocumentId;
+import org.hibernate.search.annotations.Field;
 import org.hibernate.search.annotations.Indexed;
-import org.hibernate.search.annotations.Field;
-import org.hibernate.search.annotations.DocumentId;
 import org.hibernate.search.annotations.Store;
 
 /**

Modified: search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/perf/IndexTestDontRun.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/perf/IndexTestDontRun.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/perf/IndexTestDontRun.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -10,6 +10,7 @@
 import java.util.concurrent.TimeUnit;
 
 import junit.textui.TestRunner;
+
 import org.apache.lucene.search.IndexSearcher;
 import org.apache.lucene.store.Directory;
 import org.hibernate.Session;

Modified: search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/perf/SearcherThread.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/perf/SearcherThread.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/perf/SearcherThread.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -7,22 +7,21 @@
 import java.util.concurrent.CountDownLatch;
 
 import org.apache.lucene.analysis.standard.StandardAnalyzer;
+import org.apache.lucene.document.Document;
 import org.apache.lucene.queryParser.ParseException;
 import org.apache.lucene.queryParser.QueryParser;
 import org.apache.lucene.search.BooleanQuery;
 import org.apache.lucene.search.IndexSearcher;
 import org.apache.lucene.search.Query;
-import org.apache.lucene.search.TopDocs;
 import org.apache.lucene.search.Searcher;
-import org.apache.lucene.document.Document;
-import org.slf4j.Logger;
-
+import org.apache.lucene.search.TopDocs;
 import org.hibernate.SessionFactory;
 import org.hibernate.search.FullTextQuery;
 import org.hibernate.search.FullTextSession;
 import org.hibernate.search.Search;
 import org.hibernate.search.SearchException;
 import org.hibernate.search.util.LoggerFactory;
+import org.slf4j.Logger;
 
 /**
  * @author Emmanuel Bernard

Modified: search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/query/AlternateBook.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/query/AlternateBook.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/query/AlternateBook.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -4,10 +4,10 @@
 import javax.persistence.Entity;
 import javax.persistence.Id;
 
-import org.hibernate.search.annotations.Indexed;
 import org.hibernate.search.annotations.DocumentId;
 import org.hibernate.search.annotations.Field;
 import org.hibernate.search.annotations.Index;
+import org.hibernate.search.annotations.Indexed;
 
 /**
  * @author Emmanuel Bernard

Modified: search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/query/Book.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/query/Book.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/query/Book.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -4,6 +4,7 @@
 import java.util.Date;
 import java.util.HashSet;
 import java.util.Set;
+
 import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.ManyToMany;

Modified: search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/query/Employee.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/query/Employee.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/query/Employee.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -2,16 +2,17 @@
 package org.hibernate.search.test.query;
 
 import java.util.Date;
+
 import javax.persistence.Entity;
 import javax.persistence.Id;
 
+import org.hibernate.search.annotations.DateBridge;
 import org.hibernate.search.annotations.DocumentId;
 import org.hibernate.search.annotations.Field;
 import org.hibernate.search.annotations.Index;
 import org.hibernate.search.annotations.Indexed;
+import org.hibernate.search.annotations.Resolution;
 import org.hibernate.search.annotations.Store;
-import org.hibernate.search.annotations.DateBridge;
-import org.hibernate.search.annotations.Resolution;
 
 /**
  * @author John Grffin

Modified: search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/query/LuceneQuerySortTest.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/query/LuceneQuerySortTest.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/query/LuceneQuerySortTest.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -1,8 +1,8 @@
 //$Id$
 package org.hibernate.search.test.query;
 
+import java.util.Calendar;
 import java.util.List;
-import java.util.Calendar;
 
 import org.apache.lucene.analysis.StopAnalyzer;
 import org.apache.lucene.queryParser.QueryParser;
@@ -10,9 +10,9 @@
 import org.apache.lucene.search.Sort;
 import org.apache.lucene.search.SortField;
 import org.hibernate.Transaction;
+import org.hibernate.search.FullTextQuery;
 import org.hibernate.search.FullTextSession;
 import org.hibernate.search.Search;
-import org.hibernate.search.FullTextQuery;
 import org.hibernate.search.test.SearchTestCase;
 
 

Modified: search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/query/MultiClassesQueryLoaderTest.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/query/MultiClassesQueryLoaderTest.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/query/MultiClassesQueryLoaderTest.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -4,15 +4,15 @@
 import java.sql.Statement;
 import java.util.List;
 
-import org.hibernate.search.test.SearchTestCase;
+import org.apache.lucene.analysis.KeywordAnalyzer;
+import org.apache.lucene.queryParser.QueryParser;
+import org.apache.lucene.search.Query;
+import org.hibernate.Session;
+import org.hibernate.Transaction;
+import org.hibernate.search.FullTextQuery;
 import org.hibernate.search.FullTextSession;
 import org.hibernate.search.Search;
-import org.hibernate.search.FullTextQuery;
-import org.hibernate.Session;
-import org.hibernate.Transaction;
-import org.apache.lucene.queryParser.QueryParser;
-import org.apache.lucene.analysis.KeywordAnalyzer;
-import org.apache.lucene.search.Query;
+import org.hibernate.search.test.SearchTestCase;
 
 /**
  * @author Emmanuel Bernard

Modified: search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/query/Music.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/query/Music.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/query/Music.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -3,6 +3,7 @@
 
 import java.util.HashSet;
 import java.util.Set;
+
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Entity;

Modified: search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/query/Person.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/query/Person.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/query/Person.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -5,12 +5,6 @@
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
 
-import org.hibernate.search.annotations.DocumentId;
-import org.hibernate.search.annotations.Field;
-import org.hibernate.search.annotations.Index;
-import org.hibernate.search.annotations.Indexed;
-import org.hibernate.search.annotations.Store;
-
 /**
  * @author Emmanuel Bernard
  */

Modified: search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/query/ProjectionQueryTest.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/query/ProjectionQueryTest.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/query/ProjectionQueryTest.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -2,17 +2,16 @@
 package org.hibernate.search.test.query;
 
 import java.io.Serializable;
+import java.util.Date;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
-import java.util.Date;
 
 import org.apache.lucene.analysis.StopAnalyzer;
 import org.apache.lucene.analysis.standard.StandardAnalyzer;
 import org.apache.lucene.document.Document;
 import org.apache.lucene.queryParser.QueryParser;
 import org.apache.lucene.search.Query;
-
 import org.hibernate.ScrollableResults;
 import org.hibernate.Session;
 import org.hibernate.Transaction;

Modified: search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/query/QueryUnindexedEntityTest.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/query/QueryUnindexedEntityTest.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/query/QueryUnindexedEntityTest.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -4,7 +4,6 @@
 import org.apache.lucene.analysis.standard.StandardAnalyzer;
 import org.apache.lucene.queryParser.QueryParser;
 import org.apache.lucene.search.Query;
-
 import org.hibernate.HibernateException;
 import org.hibernate.Transaction;
 import org.hibernate.search.FullTextQuery;

Modified: search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/query/ScrollableResultsTest.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/query/ScrollableResultsTest.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/query/ScrollableResultsTest.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -1,6 +1,8 @@
 //$Id
 package org.hibernate.search.test.query;
 
+import junit.framework.TestCase;
+
 import org.apache.lucene.index.Term;
 import org.apache.lucene.search.Sort;
 import org.apache.lucene.search.SortField;
@@ -11,8 +13,6 @@
 import org.hibernate.search.FullTextSession;
 import org.hibernate.search.test.util.FullTextSessionBuilder;
 
-import junit.framework.TestCase;
-
 /**
  * Test for org.hibernate.search.query.ScrollableResultsImpl
  * 

Modified: search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/query/boost/BoostedDescriptionLibrary.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/query/boost/BoostedDescriptionLibrary.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/query/boost/BoostedDescriptionLibrary.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -5,7 +5,6 @@
 import javax.persistence.Id;
 
 import org.apache.lucene.analysis.standard.StandardAnalyzer;
-
 import org.hibernate.search.annotations.Analyzer;
 import org.hibernate.search.annotations.Boost;
 import org.hibernate.search.annotations.DocumentId;

Modified: search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/query/boost/BoostedFieldDescriptionLibrary.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/query/boost/BoostedFieldDescriptionLibrary.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/query/boost/BoostedFieldDescriptionLibrary.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -5,7 +5,6 @@
 import javax.persistence.Id;
 
 import org.apache.lucene.analysis.standard.StandardAnalyzer;
-
 import org.hibernate.search.annotations.Analyzer;
 import org.hibernate.search.annotations.Boost;
 import org.hibernate.search.annotations.DocumentId;

Modified: search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/query/boost/BoostedGetDescriptionLibrary.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/query/boost/BoostedGetDescriptionLibrary.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/query/boost/BoostedGetDescriptionLibrary.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -5,7 +5,6 @@
 import javax.persistence.Id;
 
 import org.apache.lucene.analysis.standard.StandardAnalyzer;
-
 import org.hibernate.search.annotations.Analyzer;
 import org.hibernate.search.annotations.Boost;
 import org.hibernate.search.annotations.DocumentId;

Modified: search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/query/boost/DynamicBoostedDescriptionLibrary.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/query/boost/DynamicBoostedDescriptionLibrary.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/query/boost/DynamicBoostedDescriptionLibrary.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -30,10 +30,10 @@
 import javax.persistence.Table;
 
 import org.hibernate.search.annotations.DocumentId;
+import org.hibernate.search.annotations.DynamicBoost;
 import org.hibernate.search.annotations.Field;
 import org.hibernate.search.annotations.Indexed;
 import org.hibernate.search.annotations.Store;
-import org.hibernate.search.annotations.DynamicBoost;
 
 /**
  * Test entity using a custom <code>CustomBoostStrategy</code> to set

Modified: search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/query/boost/DynamicBoostingTest.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/query/boost/DynamicBoostingTest.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/query/boost/DynamicBoostingTest.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -29,14 +29,13 @@
 import org.apache.lucene.index.Term;
 import org.apache.lucene.search.Query;
 import org.apache.lucene.search.TermQuery;
-import org.slf4j.Logger;
-
 import org.hibernate.Session;
 import org.hibernate.search.FullTextSession;
 import org.hibernate.search.ProjectionConstants;
 import org.hibernate.search.Search;
 import org.hibernate.search.test.SearchTestCase;
 import org.hibernate.search.util.LoggerFactory;
+import org.slf4j.Logger;
 
 public class DynamicBoostingTest extends SearchTestCase {
 

Modified: search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/query/boost/FieldBoostTest.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/query/boost/FieldBoostTest.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/query/boost/FieldBoostTest.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -7,7 +7,6 @@
 import org.apache.lucene.search.BooleanClause;
 import org.apache.lucene.search.BooleanQuery;
 import org.apache.lucene.search.Query;
-
 import org.hibernate.Transaction;
 import org.hibernate.search.FullTextSession;
 import org.hibernate.search.Search;

Modified: search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/query/criteria/Bike.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/query/criteria/Bike.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/query/criteria/Bike.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -1,14 +1,9 @@
 //$Id$
 package org.hibernate.search.test.query.criteria;
 
-import javax.persistence.DiscriminatorColumn;
-import javax.persistence.DiscriminatorType;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
-import javax.persistence.Inheritance;
-import javax.persistence.InheritanceType;
-import javax.persistence.Table;
 
 import org.hibernate.search.annotations.Field;
 

Modified: search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/query/criteria/MixedCriteriaTest.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/query/criteria/MixedCriteriaTest.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/query/criteria/MixedCriteriaTest.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -6,7 +6,6 @@
 import org.apache.lucene.analysis.standard.StandardAnalyzer;
 import org.apache.lucene.queryParser.MultiFieldQueryParser;
 import org.apache.lucene.search.Query;
-
 import org.hibernate.Criteria;
 import org.hibernate.Session;
 import org.hibernate.Transaction;

Modified: search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/query/explain/Dvd.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/query/explain/Dvd.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/query/explain/Dvd.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -2,12 +2,12 @@
 package org.hibernate.search.test.query.explain;
 
 import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
-import javax.persistence.GeneratedValue;
 
-import org.hibernate.search.annotations.Indexed;
 import org.hibernate.search.annotations.DocumentId;
 import org.hibernate.search.annotations.Field;
+import org.hibernate.search.annotations.Indexed;
 
 /**
  * @author Emmanuel Bernard

Modified: search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/query/explain/ExplanationTest.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/query/explain/ExplanationTest.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/query/explain/ExplanationTest.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -1,18 +1,18 @@
 // $Id$
 package org.hibernate.search.test.query.explain;
 
-import java.util.Map;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
-import org.hibernate.search.test.SearchTestCase;
+import org.apache.lucene.analysis.standard.StandardAnalyzer;
+import org.apache.lucene.queryParser.MultiFieldQueryParser;
+import org.apache.lucene.search.Query;
+import org.hibernate.Transaction;
+import org.hibernate.search.FullTextQuery;
 import org.hibernate.search.FullTextSession;
 import org.hibernate.search.Search;
-import org.hibernate.search.FullTextQuery;
-import org.hibernate.Transaction;
-import org.apache.lucene.search.Query;
-import org.apache.lucene.queryParser.MultiFieldQueryParser;
-import org.apache.lucene.analysis.standard.StandardAnalyzer;
+import org.hibernate.search.test.SearchTestCase;
 
 /**
  * @author Emmanuel Bernard

Modified: search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/reader/Detective.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/reader/Detective.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/reader/Detective.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -2,13 +2,13 @@
 package org.hibernate.search.test.reader;
 
 import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
-import javax.persistence.GeneratedValue;
 
-import org.hibernate.search.annotations.Indexed;
 import org.hibernate.search.annotations.DocumentId;
 import org.hibernate.search.annotations.Field;
 import org.hibernate.search.annotations.Index;
+import org.hibernate.search.annotations.Indexed;
 
 /**
  * @author Emmanuel Bernard

Modified: search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/reader/ReaderPerfTestCase.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/reader/ReaderPerfTestCase.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/reader/ReaderPerfTestCase.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -13,8 +13,6 @@
 import org.apache.lucene.queryParser.ParseException;
 import org.apache.lucene.queryParser.QueryParser;
 import org.apache.lucene.search.Query;
-import org.slf4j.Logger;
-
 import org.hibernate.Session;
 import org.hibernate.SessionFactory;
 import org.hibernate.Transaction;
@@ -25,6 +23,7 @@
 import org.hibernate.search.test.SearchTestCase;
 import org.hibernate.search.util.FileHelper;
 import org.hibernate.search.util.LoggerFactory;
+import org.slf4j.Logger;
 
 /**
  * @author Emmanuel Bernard

Modified: search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/reader/Suspect.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/reader/Suspect.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/reader/Suspect.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -1,10 +1,10 @@
 //$Id$
 package org.hibernate.search.test.reader;
 
+import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Column;
 
 import org.hibernate.search.annotations.DocumentId;
 import org.hibernate.search.annotations.Field;

Modified: search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/reader/functionality/SharingBufferIndexProviderTest.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/reader/functionality/SharingBufferIndexProviderTest.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/reader/functionality/SharingBufferIndexProviderTest.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -10,11 +10,11 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 
+import junit.framework.TestCase;
+
 import org.apache.lucene.index.IndexReader;
 import org.hibernate.search.store.DirectoryProvider;
 
-import junit.framework.TestCase;
-
 /**
  * @author Sanne Grinovero
  */

Modified: search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/session/Categorie.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/session/Categorie.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/session/Categorie.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -2,14 +2,14 @@
 package org.hibernate.search.test.session;
 
 import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
-import javax.persistence.GeneratedValue;
 
+import org.hibernate.search.annotations.DocumentId;
 import org.hibernate.search.annotations.Field;
-import org.hibernate.search.annotations.DocumentId;
 import org.hibernate.search.annotations.Index;
+import org.hibernate.search.annotations.Indexed;
 import org.hibernate.search.annotations.Store;
-import org.hibernate.search.annotations.Indexed;
 
 /**
  * @author Emmanuel Bernard

Modified: search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/session/DelegationWrapper.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/session/DelegationWrapper.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/session/DelegationWrapper.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -1,10 +1,10 @@
 //$Id$
 package org.hibernate.search.test.session;
 
+import java.io.Serializable;
+import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
-import java.lang.reflect.InvocationHandler;
-import java.io.Serializable;
 
 import org.hibernate.Session;
 

Modified: search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/session/Domain.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/session/Domain.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/session/Domain.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -4,9 +4,9 @@
 import javax.persistence.Entity;
 import javax.persistence.Id;
 
-import org.hibernate.search.annotations.Indexed;
 import org.hibernate.search.annotations.DocumentId;
 import org.hibernate.search.annotations.Field;
+import org.hibernate.search.annotations.Indexed;
 
 /**
  * @author Emmanuel Bernard

Modified: search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/session/Email.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/session/Email.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/session/Email.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -2,14 +2,14 @@
 package org.hibernate.search.test.session;
 
 import javax.persistence.Entity;
+import javax.persistence.FetchType;
 import javax.persistence.Id;
 import javax.persistence.ManyToOne;
-import javax.persistence.FetchType;
 
-import org.hibernate.search.annotations.Indexed;
 import org.hibernate.search.annotations.DocumentId;
 import org.hibernate.search.annotations.Field;
 import org.hibernate.search.annotations.Index;
+import org.hibernate.search.annotations.Indexed;
 import org.hibernate.search.annotations.IndexedEmbedded;
 
 /**

Modified: search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/session/Entite.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/session/Entite.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/session/Entite.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -2,16 +2,16 @@
 package org.hibernate.search.test.session;
 
 import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
-import javax.persistence.GeneratedValue;
 import javax.persistence.ManyToOne;
-import javax.persistence.FetchType;
 
-import org.hibernate.search.annotations.IndexedEmbedded;
-import org.hibernate.search.annotations.Indexed;
-import org.hibernate.search.annotations.Index;
 import org.hibernate.search.annotations.DocumentId;
 import org.hibernate.search.annotations.Field;
+import org.hibernate.search.annotations.Index;
+import org.hibernate.search.annotations.Indexed;
+import org.hibernate.search.annotations.IndexedEmbedded;
 import org.hibernate.search.annotations.Store;
 
 /**

Modified: search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/session/MassIndexTest.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/session/MassIndexTest.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/session/MassIndexTest.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -2,8 +2,8 @@
 package org.hibernate.search.test.session;
 
 import java.sql.Statement;
+import java.util.Iterator;
 import java.util.List;
-import java.util.Iterator;
 
 import org.apache.lucene.analysis.StopAnalyzer;
 import org.apache.lucene.index.Term;

Modified: search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/session/MassIndexUsingManualFlushTest.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/session/MassIndexUsingManualFlushTest.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/session/MassIndexUsingManualFlushTest.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -4,16 +4,16 @@
 import java.sql.Statement;
 import java.util.List;
 
+import org.apache.lucene.analysis.StopAnalyzer;
+import org.apache.lucene.queryParser.QueryParser;
+import org.hibernate.ScrollMode;
+import org.hibernate.ScrollableResults;
+import org.hibernate.Transaction;
+import org.hibernate.search.Environment;
 import org.hibernate.search.FullTextSession;
 import org.hibernate.search.Search;
-import org.hibernate.search.Environment;
+import org.hibernate.search.impl.FullTextSessionImpl;
 import org.hibernate.search.test.SearchTestCase;
-import org.hibernate.search.impl.FullTextSessionImpl;
-import org.hibernate.Transaction;
-import org.hibernate.ScrollableResults;
-import org.hibernate.ScrollMode;
-import org.apache.lucene.queryParser.QueryParser;
-import org.apache.lucene.analysis.StopAnalyzer;
 
 /**
  * @author Emmanuel Bernard

Modified: search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/session/SessionTest.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/session/SessionTest.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/session/SessionTest.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -4,12 +4,12 @@
 import java.lang.reflect.Proxy;
 import java.util.List;
 
-import org.hibernate.search.test.SearchTestCase;
-import org.hibernate.search.Search;
-import org.hibernate.search.FullTextSession;
+import org.hibernate.Criteria;
 import org.hibernate.Session;
-import org.hibernate.Criteria;
 import org.hibernate.criterion.DetachedCriteria;
+import org.hibernate.search.FullTextSession;
+import org.hibernate.search.Search;
+import org.hibernate.search.test.SearchTestCase;
 
 /**
  * @author Emmanuel Bernard

Modified: search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/shards/Animal.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/shards/Animal.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/shards/Animal.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -4,10 +4,10 @@
 import javax.persistence.Entity;
 import javax.persistence.Id;
 
-import org.hibernate.search.annotations.Indexed;
 import org.hibernate.search.annotations.DocumentId;
 import org.hibernate.search.annotations.Field;
 import org.hibernate.search.annotations.Index;
+import org.hibernate.search.annotations.Indexed;
 
 /**
  * @author Emmanuel Bernard

Modified: search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/shards/Furniture.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/shards/Furniture.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/shards/Furniture.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -2,12 +2,12 @@
 package org.hibernate.search.test.shards;
 
 import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
-import javax.persistence.GeneratedValue;
 
-import org.hibernate.search.annotations.Indexed;
 import org.hibernate.search.annotations.DocumentId;
 import org.hibernate.search.annotations.Field;
+import org.hibernate.search.annotations.Indexed;
 
 /**
  * @author Emmanuel Bernard

Modified: search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/shards/IdShardingStrategyTest.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/shards/IdShardingStrategyTest.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/shards/IdShardingStrategyTest.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -1,12 +1,12 @@
 // $Id$
 package org.hibernate.search.test.shards;
 
+import junit.framework.TestCase;
+
 import org.hibernate.search.store.DirectoryProvider;
 import org.hibernate.search.store.IdHashShardingStrategy;
 import org.hibernate.search.store.RAMDirectoryProvider;
 
-import junit.framework.TestCase;
-
 /**
  * @author Sanne Grinovero
  */

Modified: search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/shards/ShardsTest.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/shards/ShardsTest.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/shards/ShardsTest.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -4,23 +4,23 @@
 import java.io.File;
 import java.util.List;
 
-import org.hibernate.search.test.SearchTestCase;
-import org.hibernate.search.util.FileHelper;
-import org.hibernate.search.store.RAMDirectoryProvider;
-import org.hibernate.search.store.FSDirectoryProvider;
-import org.hibernate.search.store.IdHashShardingStrategy;
-import org.hibernate.search.store.DirectoryProvider;
+import org.apache.lucene.analysis.StopAnalyzer;
+import org.apache.lucene.index.IndexReader;
+import org.apache.lucene.index.Term;
+import org.apache.lucene.index.TermDocs;
+import org.apache.lucene.queryParser.QueryParser;
+import org.hibernate.Session;
+import org.hibernate.Transaction;
+import org.hibernate.cfg.Configuration;
 import org.hibernate.search.Environment;
 import org.hibernate.search.FullTextSession;
 import org.hibernate.search.Search;
-import org.hibernate.cfg.Configuration;
-import org.hibernate.Session;
-import org.hibernate.Transaction;
-import org.apache.lucene.analysis.StopAnalyzer;
-import org.apache.lucene.queryParser.QueryParser;
-import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.index.TermDocs;
-import org.apache.lucene.index.Term;
+import org.hibernate.search.store.DirectoryProvider;
+import org.hibernate.search.store.FSDirectoryProvider;
+import org.hibernate.search.store.IdHashShardingStrategy;
+import org.hibernate.search.store.RAMDirectoryProvider;
+import org.hibernate.search.test.SearchTestCase;
+import org.hibernate.search.util.FileHelper;
 
 /**
  * @author Emmanuel Bernard

Modified: search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/similarity/SimilarityTest.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/similarity/SimilarityTest.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/similarity/SimilarityTest.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -3,16 +3,16 @@
 
 import java.util.List;
 
-import org.hibernate.search.test.SearchTestCase;
-import org.hibernate.search.Search;
-import org.hibernate.search.FullTextSession;
-import org.hibernate.search.FullTextQuery;
-import org.hibernate.search.Environment;
+import org.apache.lucene.index.Term;
+import org.apache.lucene.search.TermQuery;
 import org.hibernate.Session;
 import org.hibernate.Transaction;
 import org.hibernate.cfg.Configuration;
-import org.apache.lucene.search.TermQuery;
-import org.apache.lucene.index.Term;
+import org.hibernate.search.Environment;
+import org.hibernate.search.FullTextQuery;
+import org.hibernate.search.FullTextSession;
+import org.hibernate.search.Search;
+import org.hibernate.search.test.SearchTestCase;
 
 /**
  * @author Emmanuel Bernard

Modified: search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/similarity/Trash.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/similarity/Trash.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/similarity/Trash.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -1,13 +1,13 @@
 // $Id$
 package org.hibernate.search.test.similarity;
 
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Entity;
 
-import org.hibernate.search.annotations.Indexed;
 import org.hibernate.search.annotations.DocumentId;
 import org.hibernate.search.annotations.Field;
+import org.hibernate.search.annotations.Indexed;
 import org.hibernate.search.annotations.Similarity;
 
 /**

Modified: search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/util/AnalyzerUtils.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/util/AnalyzerUtils.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/util/AnalyzerUtils.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -7,13 +7,13 @@
 import java.util.List;
 
 import junit.framework.Assert;
+
 import org.apache.lucene.analysis.Analyzer;
 import org.apache.lucene.analysis.Token;
 import org.apache.lucene.analysis.TokenStream;
+import org.hibernate.search.util.LoggerFactory;
 import org.slf4j.Logger;
 
-import org.hibernate.search.util.LoggerFactory;
-
 /**
  * Helper class to test analyzers. Taken and modified from <i>Lucene in Action</i>.
  *

Modified: search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/util/FileHelperTest.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/util/FileHelperTest.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/util/FileHelperTest.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -6,10 +6,10 @@
 import java.io.IOException;
 
 import junit.framework.TestCase;
-import org.slf4j.Logger;
 
 import org.hibernate.search.util.FileHelper;
 import org.hibernate.search.util.LoggerFactory;
+import org.slf4j.Logger;
 
 /**
  * @author Emmanuel Bernard

Modified: search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/worker/AsyncWorkerTest.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/worker/AsyncWorkerTest.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/worker/AsyncWorkerTest.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -1,10 +1,10 @@
 //$Id$
 package org.hibernate.search.test.worker;
 
+import org.apache.lucene.analysis.StopAnalyzer;
+import org.hibernate.cfg.Configuration;
+import org.hibernate.search.Environment;
 import org.hibernate.search.store.RAMDirectoryProvider;
-import org.hibernate.search.Environment;
-import org.hibernate.cfg.Configuration;
-import org.apache.lucene.analysis.StopAnalyzer;
 
 /**
  * @author Emmanuel Bernard

Modified: search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/worker/ConcurrencyTest.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/worker/ConcurrencyTest.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/worker/ConcurrencyTest.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -1,8 +1,8 @@
 //$Id$
 package org.hibernate.search.test.worker;
 
+import org.hibernate.Session;
 import org.hibernate.search.test.SearchTestCase;
-import org.hibernate.Session;
 
 /**
  * @author Emmanuel Bernard

Modified: search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/worker/Drink.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/worker/Drink.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/worker/Drink.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -2,13 +2,13 @@
 package org.hibernate.search.test.worker;
 
 import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
-import javax.persistence.GeneratedValue;
 
-import org.hibernate.search.annotations.Indexed;
 import org.hibernate.search.annotations.DocumentId;
 import org.hibernate.search.annotations.Field;
 import org.hibernate.search.annotations.Index;
+import org.hibernate.search.annotations.Indexed;
 
 /**
  * @author Emmanuel Bernard

Modified: search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/worker/Employee.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/worker/Employee.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/worker/Employee.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -2,13 +2,13 @@
 package org.hibernate.search.test.worker;
 
 import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
-import javax.persistence.GeneratedValue;
 
-import org.hibernate.search.annotations.Indexed;
 import org.hibernate.search.annotations.DocumentId;
 import org.hibernate.search.annotations.Field;
 import org.hibernate.search.annotations.Index;
+import org.hibernate.search.annotations.Indexed;
 
 /**
  * @author Emmanuel Bernard

Modified: search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/worker/Employer.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/worker/Employer.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/worker/Employer.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -2,13 +2,13 @@
 package org.hibernate.search.test.worker;
 
 import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
-import javax.persistence.GeneratedValue;
 
-import org.hibernate.search.annotations.Indexed;
+import org.hibernate.search.annotations.DocumentId;
 import org.hibernate.search.annotations.Field;
 import org.hibernate.search.annotations.Index;
-import org.hibernate.search.annotations.DocumentId;
+import org.hibernate.search.annotations.Indexed;
 
 /**
  * @author Emmanuel Bernard

Modified: search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/worker/Food.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/worker/Food.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/worker/Food.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -2,13 +2,13 @@
 package org.hibernate.search.test.worker;
 
 import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
-import javax.persistence.GeneratedValue;
 
-import org.hibernate.search.annotations.Indexed;
 import org.hibernate.search.annotations.DocumentId;
 import org.hibernate.search.annotations.Field;
 import org.hibernate.search.annotations.Index;
+import org.hibernate.search.annotations.Indexed;
 
 /**
  * @author Emmanuel Bernard

Modified: search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/worker/SyncWorkerTest.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/worker/SyncWorkerTest.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/worker/SyncWorkerTest.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -1,10 +1,10 @@
 //$Id$
 package org.hibernate.search.test.worker;
 
+import org.apache.lucene.analysis.StopAnalyzer;
 import org.hibernate.cfg.Configuration;
+import org.hibernate.search.Environment;
 import org.hibernate.search.store.RAMDirectoryProvider;
-import org.hibernate.search.Environment;
-import org.apache.lucene.analysis.StopAnalyzer;
 
 /**
  * @author Emmanuel Bernard

Modified: search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/worker/duplication/EmailAddress.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/worker/duplication/EmailAddress.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/worker/duplication/EmailAddress.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -2,6 +2,7 @@
 package org.hibernate.search.test.worker.duplication;
 
 import java.io.Serializable;
+
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;

Modified: search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/worker/duplication/Person.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/worker/duplication/Person.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/worker/duplication/Person.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -1,18 +1,18 @@
 // $Id:$
 package org.hibernate.search.test.worker.duplication;
 
+import javax.persistence.CascadeType;
 import javax.persistence.DiscriminatorColumn;
 import javax.persistence.DiscriminatorType;
 import javax.persistence.Entity;
+import javax.persistence.FetchType;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
 import javax.persistence.Inheritance;
 import javax.persistence.InheritanceType;
+import javax.persistence.JoinColumn;
+import javax.persistence.OneToOne;
 import javax.persistence.Table;
-import javax.persistence.OneToOne;
-import javax.persistence.JoinColumn;
-import javax.persistence.CascadeType;
-import javax.persistence.FetchType;
 
 import org.hibernate.search.annotations.DocumentId;
 import org.hibernate.search.annotations.Field;

Modified: search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/worker/duplication/SpecialPerson.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/worker/duplication/SpecialPerson.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/worker/duplication/SpecialPerson.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -3,6 +3,7 @@
 
 import java.util.HashSet;
 import java.util.Set;
+
 import javax.persistence.CascadeType;
 import javax.persistence.DiscriminatorValue;
 import javax.persistence.Entity;

Modified: search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/worker/duplication/WorkDuplicationTest.java
===================================================================
--- search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/worker/duplication/WorkDuplicationTest.java	2010-08-04 05:41:23 UTC (rev 20105)
+++ search/branches/v3_1_1_GA_CP/src/test/java/org/hibernate/search/test/worker/duplication/WorkDuplicationTest.java	2010-08-04 06:31:38 UTC (rev 20106)
@@ -1,23 +1,22 @@
 // $Id$
 package org.hibernate.search.test.worker.duplication;
 
-import java.util.List;
 import java.util.ArrayList;
+import java.util.List;
 
 import org.apache.lucene.analysis.standard.StandardAnalyzer;
 import org.apache.lucene.index.IndexReader;
 import org.apache.lucene.queryParser.QueryParser;
-import org.apache.lucene.search.Query;
 import org.apache.lucene.search.IndexSearcher;
+import org.apache.lucene.search.Query;
 import org.apache.lucene.search.TopDocs;
-
 import org.hibernate.Transaction;
 import org.hibernate.search.FullTextQuery;
 import org.hibernate.search.FullTextSession;
-import org.hibernate.search.backend.WorkType;
-import org.hibernate.search.backend.LuceneWork;
 import org.hibernate.search.backend.AddLuceneWork;
 import org.hibernate.search.backend.DeleteLuceneWork;
+import org.hibernate.search.backend.LuceneWork;
+import org.hibernate.search.backend.WorkType;
 import org.hibernate.search.engine.DocumentBuilderIndexedEntity;
 import org.hibernate.search.impl.SearchFactoryImpl;
 import org.hibernate.search.reader.ReaderProvider;



More information about the hibernate-commits mailing list