lucenenet-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nightowl...@apache.org
Subject [4/5] lucenenet git commit: SWEEP: Added using statement for Lucene.Net.Support.SystemConsole to replace Console so we have the ability to change the output/error TextWriters solution wide (required by Benchmarks tests, but a nice feature for end users).
Date Tue, 19 Sep 2017 07:36:54 GMT
SWEEP: Added using statement for Lucene.Net.Support.SystemConsole to replace Console so we have the ability to change the output/error TextWriters solution wide (required by Benchmarks tests, but a nice feature for end users).


Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/81e464dd
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/81e464dd
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/81e464dd

Branch: refs/heads/master
Commit: 81e464dd0ea5d499cb0a8f6d2970aad3dd52d681
Parents: cb25648
Author: Shad Storhaug <shad@shadstorhaug.com>
Authored: Mon Sep 18 22:26:22 2017 +0700
Committer: Shad Storhaug <shad@shadstorhaug.com>
Committed: Mon Sep 18 22:59:25 2017 +0700

----------------------------------------------------------------------
 .../JapaneseTokenizer.cs                        |  1 +
 .../Tools/DictionaryBuilder.cs                  |  1 +
 .../Tools/TokenInfoDictionaryBuilder.cs         |  1 +
 .../Egothor.Stemmer/Compile.cs                  |  3 ++-
 .../Egothor.Stemmer/DiffIt.cs                   |  1 +
 src/Lucene.Net.Benchmark/ByTask/Benchmark.cs    | 28 +++++++++++---------
 .../ByTask/Feeds/ContentItemsSource.cs          |  3 ++-
 .../ByTask/Feeds/EnwikiQueryMaker.cs            |  6 ++---
 .../ByTask/Feeds/FileBasedQueryMaker.cs         |  5 ++--
 .../ByTask/Feeds/ReutersQueryMaker.cs           |  5 ++--
 .../ByTask/Feeds/SpatialDocMaker.cs             |  6 ++---
 .../ByTask/Feeds/TrecContentSource.cs           | 11 ++++----
 src/Lucene.Net.Benchmark/ByTask/PerfRunData.cs  |  6 ++---
 .../ByTask/Programmatic/Sample.cs               |  4 +--
 .../ByTask/Tasks/CloseReaderTask.cs             |  4 +--
 .../ByTask/Tasks/CloseTaxonomyReaderTask.cs     |  4 +--
 .../ByTask/Tasks/CreateIndexTask.cs             |  9 ++++---
 .../ByTask/Tasks/NearRealtimeReaderTask.cs      |  8 +++---
 .../ByTask/Tasks/NewCollationAnalyzerTask.cs    |  3 ++-
 .../ByTask/Tasks/NewLocaleTask.cs               |  3 ++-
 .../ByTask/Tasks/PerfTask.cs                    |  6 ++---
 .../ByTask/Tasks/PrintReaderTask.cs             |  4 +--
 .../ByTask/Tasks/ReadTask.cs                    | 10 +++----
 .../ByTask/Tasks/RepAllTask.cs                  | 10 +++----
 .../ByTask/Tasks/RepSelectByPrefTask.cs         | 10 +++----
 .../ByTask/Tasks/RepSumByNameRoundTask.cs       |  9 ++++---
 .../ByTask/Tasks/RepSumByNameTask.cs            |  9 ++++---
 .../ByTask/Tasks/RepSumByPrefRoundTask.cs       |  1 +
 .../ByTask/Tasks/RepSumByPrefTask.cs            |  9 ++++---
 src/Lucene.Net.Benchmark/ByTask/Utils/Config.cs | 13 ++++-----
 .../Quality/Trec/QueryDriver.cs                 | 22 ++++++++-------
 .../Quality/Utils/QualityQueriesFinder.cs       | 12 +++++----
 .../Utils/ExtractReuters.cs                     | 12 +++++----
 .../Utils/ExtractWikipedia.cs                   | 26 +++++++++---------
 .../Index/CompoundFileExtractor.cs              |  1 +
 src/Lucene.Net.Misc/Index/IndexSplitter.cs      |  1 +
 .../Index/MultiPassIndexSplitter.cs             |  1 +
 src/Lucene.Net.Misc/Misc/GetTermInfo.cs         |  2 +-
 src/Lucene.Net.Misc/Misc/HighFreqTerms.cs       |  1 +
 src/Lucene.Net.Misc/Misc/IndexMergeTool.cs      |  1 +
 .../Classic/FastCharStream.cs                   |  3 ++-
 .../Parser/StandardSyntaxParserTokenManager.cs  |  2 +-
 .../Surround/Parser/FastCharStream.cs           |  3 ++-
 .../Analysis/BaseTokenStreamTestCase.cs         |  1 +
 .../Analysis/LookaheadTokenFilter.cs            |  1 +
 .../Analysis/MockAnalyzer.cs                    |  6 ++---
 .../Analysis/MockGraphTokenFilter.cs            |  1 +
 .../Analysis/MockRandomLookaheadTokenFilter.cs  |  1 +
 .../Analysis/TokenStreamToDot.cs                |  1 +
 .../Codecs/Lucene3x/PreFlexRWPostingsFormat.cs  |  3 +--
 .../MockRandom/MockRandomPostingsFormat.cs      |  1 +
 .../Index/BasePostingsFormatTestCase.cs         |  3 ++-
 .../Index/BaseStoredFieldsFormatTestCase.cs     |  1 +
 .../Index/RandomCodec.cs                        |  1 +
 .../Index/RandomIndexWriter.cs                  |  4 +--
 .../ThreadedIndexingAndSearchingTestCase.cs     |  1 +
 .../JavaCompatibility/SystemTypesHelpers.cs     |  1 +
 .../Search/ShardSearchingTestBase.cs            |  1 +
 .../Store/MockDirectoryWrapper.cs               |  1 +
 .../Store/MockIndexOutputWrapper.cs             |  1 +
 .../Support/ApiScanTestBase.cs                  |  1 +
 .../Util/Fst/FSTTester.cs                       |  1 +
 .../Util/LineFileDocs.cs                        |  6 ++---
 .../Util/LuceneTestCase.cs                      |  1 +
 .../Util/RunListenerPrintReproduceInfo.cs       |  1 +
 .../Util/TestRuleAssertionsRequired.cs          |  1 +
 .../Util/TestRuleSetupAndRestoreClassEnv.cs     |  1 +
 src/Lucene.Net.TestFramework/Util/TestUtil.cs   |  1 +
 .../CharFilters/TestMappingCharFilter.cs        |  1 +
 .../Analysis/Core/TestBugInSomething.cs         |  1 +
 .../Analysis/Core/TestRandomChains.cs           |  1 +
 .../Analysis/Core/TestStopFilter.cs             |  1 +
 .../Analysis/Core/TestTypeTokenFilter.cs        |  1 +
 .../Analysis/Hunspell/TestAllDictionaries.cs    |  1 +
 .../Analysis/Hunspell/TestAllDictionaries2.cs   |  1 +
 .../Pattern/TestPatternReplaceCharFilter.cs     |  1 +
 .../Analysis/Sinks/TestTeeSinkTokenFilter.cs    |  1 +
 .../Analysis/Snowball/TestSnowballVocab.cs      |  1 +
 .../Analysis/Synonym/TestSynonymMapFilter.cs    |  1 +
 .../Analysis/Util/TestRollingCharBuffer.cs      |  1 +
 .../Dict/TestTokenInfoDictionary.cs             |  1 +
 .../TestJapaneseTokenizer.cs                    |  1 +
 .../TestSearchMode.cs                           |  1 +
 .../Bm/CacheSubSequencePerformanceTest.cs       |  1 +
 .../Bm/PhoneticEnginePerformanceTest.cs         |  1 +
 .../BenchmarkTestCase.cs                        |  1 +
 .../ByTask/Tasks/CreateIndexTaskTest.cs         | 14 +++++-----
 src/Lucene.Net.Tests.Facet/FacetTestCase.cs     |  1 +
 .../Range/TestRangeFacetCounts.cs               |  1 +
 .../SortedSet/TestSortedSetDocValuesFacets.cs   |  1 +
 .../Directory/TestConcurrentFacetedIndexing.cs  |  1 +
 .../Directory/TestDirectoryTaxonomyWriter.cs    |  1 +
 .../Taxonomy/TestSearcherTaxonomyManager.cs     |  1 +
 .../Taxonomy/TestTaxonomyFacetCounts.cs         |  1 +
 .../Taxonomy/TestTaxonomyFacetSumValueSource.cs |  1 +
 .../WriterCache/TestCompactLabelToOrdinal.cs    |  1 +
 src/Lucene.Net.Tests.Facet/TestDrillSideways.cs |  1 +
 .../AllGroupHeadsCollectorTest.cs               |  1 +
 .../AllGroupsCollectorTest.cs                   |  1 +
 .../DistinctValuesCollectorTest.cs              |  1 +
 .../GroupFacetCollectorTest.cs                  |  1 +
 src/Lucene.Net.Tests.Grouping/TestGrouping.cs   |  1 +
 .../Custom/HighlightCustomQueryTest.cs          |  1 +
 .../Highlight/HighlighterTest.cs                |  1 +
 .../SimpleFragListBuilderTest.cs                |  1 +
 src/Lucene.Net.Tests.Join/TestBlockJoin.cs      |  1 +
 src/Lucene.Net.Tests.Join/TestJoinUtil.cs       |  1 +
 .../Index/Memory/MemoryIndexTest.cs             |  1 +
 .../Document/TestLazyDocument.cs                |  1 +
 .../Index/Sorter/IndexSortingTest.cs            |  1 +
 .../Index/Sorter/SorterTestBase.cs              |  1 +
 .../Index/Sorter/SortingAtomicReaderTest.cs     |  1 +
 .../Util/Fst/TestFSTsMisc.cs                    |  1 +
 .../Function/FunctionTestSetup.cs               |  1 +
 .../Spans/TestSpanQueryParserSimpleSample.cs    |  1 +
 .../Flexible/Standard/TestNumericQueryParser.cs |  1 +
 .../Flexible/Standard/TestQPHelper.cs           |  1 +
 .../Surround/Query/BooleanQueryTst.cs           |  1 +
 .../Surround/Query/ExceptionQueryTst.cs         |  1 +
 .../Util/QueryParserTestBase.cs                 |  1 +
 .../Xml/TestParser.cs                           |  1 +
 .../IndexAndTaxonomyReplicationClientTest.cs    |  1 +
 .../IndexReplicationClientTest.cs               |  1 +
 .../Queries/TestSlowFuzzyQuery2.cs              |  1 +
 .../Prefix/NtsPolygonTest.cs                    |  1 +
 .../Prefix/SpatialOpRecursivePrefixTreeTest.cs  |  1 +
 .../Prefix/Tree/SpatialPrefixTreeTest.cs        |  1 +
 .../Analyzing/AnalyzingInfixSuggesterTest.cs    |  1 +
 .../Suggest/Analyzing/AnalyzingSuggesterTest.cs |  1 +
 .../Analyzing/BlendedInfixSuggesterTest.cs      |  1 +
 .../Suggest/Analyzing/FuzzySuggesterTest.cs     |  1 +
 .../Suggest/Analyzing/TestFreeTextSuggester.cs  |  2 +-
 .../Suggest/Fst/FSTCompletionTest.cs            |  1 +
 .../Suggest/Fst/LargeInputFST.cs                |  1 +
 .../Suggest/LookupBenchmarkTest.cs              |  1 +
 .../Analysis/TestGraphTokenizers.cs             |  8 +++---
 .../Codecs/Lucene3x/TestSurrogates.cs           | 19 +++++++------
 .../PerField/TestPerFieldPostingsFormat2.cs     |  1 +
 .../Index/Test2BBinaryDocValues.cs              |  1 +
 .../Index/Test2BNumericDocValues.cs             |  1 +
 src/Lucene.Net.Tests/Index/Test2BPositions.cs   |  1 +
 src/Lucene.Net.Tests/Index/Test2BPostings.cs    |  1 +
 .../Index/Test2BSortedDocValues.cs              |  1 +
 src/Lucene.Net.Tests/Index/Test2BTerms.cs       |  1 +
 .../Index/Test4GBStoredFields.cs                |  5 ++--
 src/Lucene.Net.Tests/Index/TestAddIndexes.cs    |  1 +
 src/Lucene.Net.Tests/Index/TestAtomicUpdate.cs  |  1 +
 .../Index/TestBackwardsCompatibility.cs         |  1 +
 .../Index/TestBackwardsCompatibility3x.cs       |  1 +
 .../Index/TestBagOfPositions.cs                 |  1 +
 src/Lucene.Net.Tests/Index/TestBagOfPostings.cs |  1 +
 .../Index/TestBinaryDocValuesUpdates.cs         |  3 ++-
 src/Lucene.Net.Tests/Index/TestByteSlices.cs    |  1 +
 src/Lucene.Net.Tests/Index/TestCheckIndex.cs    |  1 +
 src/Lucene.Net.Tests/Index/TestCodecs.cs        |  1 +
 .../Index/TestConcurrentMergeScheduler.cs       |  1 +
 src/Lucene.Net.Tests/Index/TestCrash.cs         |  1 +
 .../Index/TestCrashCausesCorruptIndex.cs        |  7 ++---
 .../Index/TestDeletionPolicy.cs                 |  9 ++++---
 .../Index/TestDirectoryReader.cs                |  1 +
 .../Index/TestDirectoryReaderReopen.cs          |  1 +
 src/Lucene.Net.Tests/Index/TestDoc.cs           |  5 ++--
 src/Lucene.Net.Tests/Index/TestDocTermOrds.cs   | 12 ++++-----
 .../Index/TestDocValuesWithThreads.cs           |  1 +
 .../Index/TestDocumentsWriterStallControl.cs    |  1 +
 .../Index/TestFlushByRamOrCountsPolicy.cs       |  1 +
 .../Index/TestForceMergeForever.cs              |  1 +
 src/Lucene.Net.Tests/Index/TestIndexWriter.cs   |  1 +
 .../Index/TestIndexWriterCommit.cs              |  1 +
 .../Index/TestIndexWriterDelete.cs              |  1 +
 .../Index/TestIndexWriterExceptions.cs          |  1 +
 .../Index/TestIndexWriterForceMerge.cs          |  3 ++-
 .../Index/TestIndexWriterMerging.cs             |  1 +
 .../Index/TestIndexWriterNRTIsCurrent.cs        |  1 +
 .../Index/TestIndexWriterOnDiskFull.cs          |  7 ++---
 .../Index/TestIndexWriterOnJRECrash.cs          |  1 +
 .../TestIndexWriterOutOfFileDescriptors.cs      |  7 ++---
 .../Index/TestIndexWriterReader.cs              |  1 +
 .../Index/TestIndexWriterWithThreads.cs         |  1 +
 .../Index/TestIndexableField.cs                 |  8 +++---
 src/Lucene.Net.Tests/Index/TestLongPostings.cs  | 11 ++++----
 src/Lucene.Net.Tests/Index/TestMixedCodecs.cs   |  9 ++++---
 src/Lucene.Net.Tests/Index/TestMultiFields.cs   | 11 ++++----
 .../Index/TestNRTReaderWithThreads.cs           |  1 +
 src/Lucene.Net.Tests/Index/TestNRTThreads.cs    |  7 ++---
 src/Lucene.Net.Tests/Index/TestNeverDelete.cs   |  1 +
 .../Index/TestParallelReaderEmptyIndex.cs       |  3 ++-
 src/Lucene.Net.Tests/Index/TestPayloads.cs      |  1 +
 .../Index/TestPerSegmentDeletes.cs              |  5 ++--
 .../Index/TestRollingUpdates.cs                 |  1 +
 .../Index/TestSnapshotDeletionPolicy.cs         |  1 +
 src/Lucene.Net.Tests/Index/TestStressAdvance.cs |  1 +
 .../Index/TestStressIndexing.cs                 |  1 +
 .../Index/TestStressIndexing2.cs                |  1 +
 src/Lucene.Net.Tests/Index/TestStressNRT.cs     |  1 +
 src/Lucene.Net.Tests/Index/TestSumDocFreq.cs    |  3 ++-
 .../Index/TestTaskMergeSchedulerExternal.cs     |  5 ++--
 src/Lucene.Net.Tests/Index/TestTermdocPerf.cs   |  1 +
 src/Lucene.Net.Tests/Index/TestTermsEnum.cs     |  1 +
 .../Index/TestThreadedForceMerge.cs             |  1 +
 .../Index/TestTieredMergePolicy.cs              |  1 +
 src/Lucene.Net.Tests/Index/TestTransactions.cs  |  1 +
 .../Search/Payloads/TestPayloadNearQuery.cs     |  1 +
 .../Search/Spans/TestPayloadSpans.cs            |  1 +
 .../Search/Spans/TestSpansAdvanced.cs           |  1 +
 .../Search/TestAutomatonQuery.cs                |  1 +
 src/Lucene.Net.Tests/Search/TestBoolean2.cs     |  1 +
 .../Search/TestBooleanMinShouldMatch.cs         |  1 +
 src/Lucene.Net.Tests/Search/TestBooleanQuery.cs |  1 +
 .../TestControlledRealTimeReopenThread.cs       |  1 +
 .../Search/TestCustomSearcherSort.cs            |  1 +
 .../Search/TestDisjunctionMaxQuery.cs           |  1 +
 src/Lucene.Net.Tests/Search/TestDocBoost.cs     |  1 +
 src/Lucene.Net.Tests/Search/TestDocIdSet.cs     |  1 +
 .../Search/TestDocTermOrdsRangeFilter.cs        |  1 +
 .../Search/TestDocTermOrdsRewriteMethod.cs      |  1 +
 src/Lucene.Net.Tests/Search/TestFieldCache.cs   |  1 +
 .../Search/TestLiveFieldValues.cs               |  1 +
 .../Search/TestMultiPhraseQuery.cs              |  3 ++-
 .../Search/TestMultiTermConstantScore.cs        |  1 +
 .../Search/TestMultiTermQueryRewrites.cs        |  1 +
 .../Search/TestMultiThreadTermVectors.cs        |  1 +
 .../Search/TestNumericRangeQuery32.cs           |  1 +
 .../Search/TestNumericRangeQuery64.cs           |  1 +
 .../Search/TestPositionIncrement.cs             |  1 +
 .../Search/TestRegexpRandom2.cs                 |  1 +
 src/Lucene.Net.Tests/Search/TestScorerPerf.cs   |  1 +
 src/Lucene.Net.Tests/Search/TestSearchAfter.cs  |  7 ++---
 .../Search/TestSearchWithThreads.cs             |  1 +
 .../Search/TestSearcherManager.cs               |  1 +
 .../Search/TestShardSearching.cs                |  1 +
 src/Lucene.Net.Tests/Search/TestSortRandom.cs   |  1 +
 .../Search/TestTimeLimitingCollector.cs         |  1 +
 src/Lucene.Net.Tests/Search/TestTopDocsMerge.cs |  1 +
 src/Lucene.Net.Tests/Search/TestWildcard.cs     |  1 +
 .../Search/TestWildcardRandom.cs                |  1 +
 src/Lucene.Net.Tests/Store/TestCopyBytes.cs     |  1 +
 src/Lucene.Net.Tests/Store/TestDirectory.cs     |  1 +
 src/Lucene.Net.Tests/Store/TestLockFactory.cs   |  1 +
 .../Store/TestNRTCachingDirectory.cs            |  1 +
 src/Lucene.Net.Tests/TestExternalCodecs.cs      |  1 +
 .../TestMergeSchedulerExternal.cs               |  1 +
 src/Lucene.Net.Tests/TestSearch.cs              |  1 +
 src/Lucene.Net.Tests/TestSearchForDuplicates.cs |  1 +
 .../TestWorstCaseTestBehavior.cs                |  1 +
 .../Util/Automaton/TestBasicOperations.cs       |  1 +
 .../Util/Automaton/TestCompiledAutomaton.cs     |  1 +
 .../Util/Automaton/TestMinimize.cs              |  1 +
 .../Util/Automaton/TestUTF32ToUTF8.cs           |  1 +
 src/Lucene.Net.Tests/Util/Fst/Test2BFST.cs      |  1 +
 src/Lucene.Net.Tests/Util/Fst/TestBytesStore.cs |  1 +
 src/Lucene.Net.Tests/Util/Fst/TestFSTs.cs       |  1 +
 .../Util/Packed/TestPackedInts.cs               |  1 +
 .../Util/StressRamUsageEstimator.cs             |  1 +
 src/Lucene.Net.Tests/Util/TestArrayUtil.cs      |  1 +
 src/Lucene.Net.Tests/Util/TestConstants.cs      |  1 +
 .../Util/TestFieldCacheSanityChecker.cs         |  1 +
 src/Lucene.Net.Tests/Util/TestPriorityQueue.cs  | 15 ++++++-----
 src/Lucene.Net.Tests/Util/TestRollingBuffer.cs  |  1 +
 src/Lucene.Net.Tests/Util/TestUnicodeUtil.cs    |  1 +
 .../Codecs/Lucene3x/Lucene3xFields.cs           |  1 +
 src/Lucene.Net/Index/CheckIndex.cs              |  1 +
 src/Lucene.Net/Index/IndexUpgrader.cs           |  1 +
 src/Lucene.Net/Store/LockStressTest.cs          |  1 +
 src/Lucene.Net/Store/LockVerifyServer.cs        |  1 +
 src/Lucene.Net/Store/NRTCachingDirectory.cs     |  1 +
 src/Lucene.Net/Support/SystemConsole.cs         |  3 ---
 src/Lucene.Net/Util/PrintStreamInfoStream.cs    |  5 ++--
 .../Support/TestIcuBreakIterator.cs             |  1 +
 .../CommandLine/CommandLineApplication.cs       |  1 +
 270 files changed, 466 insertions(+), 227 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucenenet/blob/81e464dd/src/Lucene.Net.Analysis.Kuromoji/JapaneseTokenizer.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Analysis.Kuromoji/JapaneseTokenizer.cs b/src/Lucene.Net.Analysis.Kuromoji/JapaneseTokenizer.cs
index 4690549..8aa7504 100644
--- a/src/Lucene.Net.Analysis.Kuromoji/JapaneseTokenizer.cs
+++ b/src/Lucene.Net.Analysis.Kuromoji/JapaneseTokenizer.cs
@@ -12,6 +12,7 @@ using System.Globalization;
 using System.IO;
 using System.Linq;
 using System.Threading;
+using Console = Lucene.Net.Support.SystemConsole;
 
 namespace Lucene.Net.Analysis.Ja
 {

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/81e464dd/src/Lucene.Net.Analysis.Kuromoji/Tools/DictionaryBuilder.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Analysis.Kuromoji/Tools/DictionaryBuilder.cs b/src/Lucene.Net.Analysis.Kuromoji/Tools/DictionaryBuilder.cs
index 07e92f7..09fdc43 100644
--- a/src/Lucene.Net.Analysis.Kuromoji/Tools/DictionaryBuilder.cs
+++ b/src/Lucene.Net.Analysis.Kuromoji/Tools/DictionaryBuilder.cs
@@ -1,4 +1,5 @@
 using System;
+using Console = Lucene.Net.Support.SystemConsole;
 
 namespace Lucene.Net.Analysis.Ja.Util
 {

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/81e464dd/src/Lucene.Net.Analysis.Kuromoji/Tools/TokenInfoDictionaryBuilder.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Analysis.Kuromoji/Tools/TokenInfoDictionaryBuilder.cs b/src/Lucene.Net.Analysis.Kuromoji/Tools/TokenInfoDictionaryBuilder.cs
index 0406083..6c07b40 100644
--- a/src/Lucene.Net.Analysis.Kuromoji/Tools/TokenInfoDictionaryBuilder.cs
+++ b/src/Lucene.Net.Analysis.Kuromoji/Tools/TokenInfoDictionaryBuilder.cs
@@ -6,6 +6,7 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Text;
+using Console = Lucene.Net.Support.SystemConsole;
 
 namespace Lucene.Net.Analysis.Ja.Util
 {

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/81e464dd/src/Lucene.Net.Analysis.Stempel/Egothor.Stemmer/Compile.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Analysis.Stempel/Egothor.Stemmer/Compile.cs b/src/Lucene.Net.Analysis.Stempel/Egothor.Stemmer/Compile.cs
index 04fd5a4..decdd7e 100644
--- a/src/Lucene.Net.Analysis.Stempel/Egothor.Stemmer/Compile.cs
+++ b/src/Lucene.Net.Analysis.Stempel/Egothor.Stemmer/Compile.cs
@@ -4,6 +4,7 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Text;
+using Console = Lucene.Net.Support.SystemConsole;
 
 /*
                     Egothor Software License version 1.00
@@ -227,7 +228,7 @@ namespace Egothor.Stemmer
                         default:
                             continue;
                     }
-                    trie.PrintInfo(System.Console.Out, prefix + " ");
+                    trie.PrintInfo(Console.Out, prefix + " ");
                 }
 
                 using (DataOutputStream os = new DataOutputStream(

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/81e464dd/src/Lucene.Net.Analysis.Stempel/Egothor.Stemmer/DiffIt.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Analysis.Stempel/Egothor.Stemmer/DiffIt.cs b/src/Lucene.Net.Analysis.Stempel/Egothor.Stemmer/DiffIt.cs
index 4d29472..62937a3 100644
--- a/src/Lucene.Net.Analysis.Stempel/Egothor.Stemmer/DiffIt.cs
+++ b/src/Lucene.Net.Analysis.Stempel/Egothor.Stemmer/DiffIt.cs
@@ -3,6 +3,7 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Text;
+using Console = Lucene.Net.Support.SystemConsole;
 
 /*
                     Egothor Software License version 1.00

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/81e464dd/src/Lucene.Net.Benchmark/ByTask/Benchmark.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Benchmark/ByTask/Benchmark.cs b/src/Lucene.Net.Benchmark/ByTask/Benchmark.cs
index 9f3ad70..151b9c9 100644
--- a/src/Lucene.Net.Benchmark/ByTask/Benchmark.cs
+++ b/src/Lucene.Net.Benchmark/ByTask/Benchmark.cs
@@ -1,9 +1,9 @@
 using Lucene.Net.Benchmarks.ByTask.Utils;
-using Lucene.Net.Support;
 using Lucene.Net.Util;
 using System;
 using System.IO;
 using System.Text;
+using Console = Lucene.Net.Support.SystemConsole;
 
 namespace Lucene.Net.Benchmarks.ByTask
 {
@@ -107,19 +107,21 @@ namespace Lucene.Net.Benchmarks.ByTask
             // verify command line args
             if (args.Length < 1)
             {
-                SystemConsole.WriteLine("Usage: java Benchmark <algorithm file>");
-                Environment.Exit(1);
+                // LUCENENET specific - usage info printed by our wrapper console
+                throw new ArgumentException();
+                //Console.WriteLine("Usage: java Benchmark <algorithm file>");
+                //Environment.Exit(1);
             }
 
             // verify input files 
             FileInfo algFile = new FileInfo(args[0]);
             if (!algFile.Exists /*|| !algFile.isFile() ||!algFile.canRead()*/ )
             {
-                SystemConsole.WriteLine("cannot find/read algorithm file: " + algFile.FullName);
+                Console.WriteLine("cannot find/read algorithm file: " + algFile.FullName);
                 Environment.Exit(1);
             }
 
-            SystemConsole.WriteLine("Running algorithm from: " + algFile.FullName);
+            Console.WriteLine("Running algorithm from: " + algFile.FullName);
 
             Benchmark benchmark = null;
             try
@@ -128,12 +130,12 @@ namespace Lucene.Net.Benchmarks.ByTask
             }
             catch (Exception e)
             {
-                SystemConsole.WriteLine(e.ToString());
+                Console.WriteLine(e.ToString());
                 Environment.Exit(1);
             }
 
-            SystemConsole.WriteLine("------------> algorithm:");
-            SystemConsole.WriteLine(benchmark.Algorithm.ToString());
+            Console.WriteLine("------------> algorithm:");
+            Console.WriteLine(benchmark.Algorithm.ToString());
 
             // execute
             try
@@ -142,13 +144,13 @@ namespace Lucene.Net.Benchmarks.ByTask
             }
             catch (Exception e)
             {
-                SystemConsole.WriteLine("Error: cannot execute the algorithm! " + e.Message);
-                SystemConsole.WriteLine(e.StackTrace);
+                Console.WriteLine("Error: cannot execute the algorithm! " + e.Message);
+                Console.WriteLine(e.StackTrace);
             }
 
-            SystemConsole.WriteLine("####################");
-            SystemConsole.WriteLine("###  D O N E !!! ###");
-            SystemConsole.WriteLine("####################");
+            Console.WriteLine("####################");
+            Console.WriteLine("###  D O N E !!! ###");
+            Console.WriteLine("####################");
         }
 
         /// <summary>

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/81e464dd/src/Lucene.Net.Benchmark/ByTask/Feeds/ContentItemsSource.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Benchmark/ByTask/Feeds/ContentItemsSource.cs b/src/Lucene.Net.Benchmark/ByTask/Feeds/ContentItemsSource.cs
index c0f06ef..84a1d7c 100644
--- a/src/Lucene.Net.Benchmark/ByTask/Feeds/ContentItemsSource.cs
+++ b/src/Lucene.Net.Benchmark/ByTask/Feeds/ContentItemsSource.cs
@@ -5,6 +5,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Reflection;
 using System.Text;
+using Console = Lucene.Net.Support.SystemConsole;
 
 namespace Lucene.Net.Benchmarks.ByTask.Feeds
 {
@@ -219,7 +220,7 @@ namespace Lucene.Net.Benchmarks.ByTask.Feeds
             }
             if (print)
             {
-                SystemConsole.WriteLine(sb.Append(newline).ToString());
+                Console.WriteLine(sb.Append(newline).ToString());
                 printNum++;
             }
         }

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/81e464dd/src/Lucene.Net.Benchmark/ByTask/Feeds/EnwikiQueryMaker.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Benchmark/ByTask/Feeds/EnwikiQueryMaker.cs b/src/Lucene.Net.Benchmark/ByTask/Feeds/EnwikiQueryMaker.cs
index 77a86a1..da37e5a 100644
--- a/src/Lucene.Net.Benchmark/ByTask/Feeds/EnwikiQueryMaker.cs
+++ b/src/Lucene.Net.Benchmark/ByTask/Feeds/EnwikiQueryMaker.cs
@@ -5,11 +5,11 @@ using Lucene.Net.Index;
 using Lucene.Net.QueryParsers.Classic;
 using Lucene.Net.Search;
 using Lucene.Net.Search.Spans;
-using Lucene.Net.Support;
 using Lucene.Net.Util;
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Console = Lucene.Net.Support.SystemConsole;
 
 namespace Lucene.Net.Benchmarks.ByTask.Feeds
 {
@@ -113,7 +113,7 @@ namespace Lucene.Net.Benchmarks.ByTask.Feeds
                     }
                     else
                     {
-                        SystemConsole.WriteLine("Unsupported Query Type: " + query);
+                        Console.WriteLine("Unsupported Query Type: " + query);
                     }
 
                     if (q != null)
@@ -124,7 +124,7 @@ namespace Lucene.Net.Benchmarks.ByTask.Feeds
                 }
                 catch (Exception e)
                 {
-                    SystemConsole.WriteLine(e.ToString());
+                    Console.WriteLine(e.ToString());
                 }
             }
 

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/81e464dd/src/Lucene.Net.Benchmark/ByTask/Feeds/FileBasedQueryMaker.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Benchmark/ByTask/Feeds/FileBasedQueryMaker.cs b/src/Lucene.Net.Benchmark/ByTask/Feeds/FileBasedQueryMaker.cs
index bf287e0..3a49c96 100644
--- a/src/Lucene.Net.Benchmark/ByTask/Feeds/FileBasedQueryMaker.cs
+++ b/src/Lucene.Net.Benchmark/ByTask/Feeds/FileBasedQueryMaker.cs
@@ -9,6 +9,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Reflection;
 using System.Text;
+using Console = Lucene.Net.Support.SystemConsole;
 
 namespace Lucene.Net.Benchmarks.ByTask.Feeds
 {
@@ -98,7 +99,7 @@ namespace Lucene.Net.Benchmarks.ByTask.Feeds
                                 }
                                 catch (ParseException e)
                                 {
-                                    SystemConsole.Error.WriteLine("Exception: " + e.Message + " occurred while parsing line: " + lineNum + " Text: " + line);
+                                    Console.Error.WriteLine("Exception: " + e.Message + " occurred while parsing line: " + lineNum + " Text: " + line);
                                 }
                             }
                             lineNum++;
@@ -111,7 +112,7 @@ namespace Lucene.Net.Benchmarks.ByTask.Feeds
                 }
                 else
                 {
-                    SystemConsole.Error.WriteLine("No Reader available for: " + fileName);
+                    Console.Error.WriteLine("No Reader available for: " + fileName);
                 }
 
             }

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/81e464dd/src/Lucene.Net.Benchmark/ByTask/Feeds/ReutersQueryMaker.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Benchmark/ByTask/Feeds/ReutersQueryMaker.cs b/src/Lucene.Net.Benchmark/ByTask/Feeds/ReutersQueryMaker.cs
index a53a2ec..4d6ab5f 100644
--- a/src/Lucene.Net.Benchmark/ByTask/Feeds/ReutersQueryMaker.cs
+++ b/src/Lucene.Net.Benchmark/ByTask/Feeds/ReutersQueryMaker.cs
@@ -8,6 +8,7 @@ using Lucene.Net.Support;
 using Lucene.Net.Util;
 using System;
 using System.Collections.Generic;
+using Console = Lucene.Net.Support.SystemConsole;
 
 namespace Lucene.Net.Benchmarks.ByTask.Feeds
 {
@@ -93,7 +94,7 @@ namespace Lucene.Net.Benchmarks.ByTask.Feeds
                     }
                     else
                     {
-                        SystemConsole.Error.WriteLine("Unsupported Query Type: " + query);
+                        Console.Error.WriteLine("Unsupported Query Type: " + query);
                     }
 
                     if (q != null)
@@ -104,7 +105,7 @@ namespace Lucene.Net.Benchmarks.ByTask.Feeds
                 }
                 catch (Exception e)
                 {
-                    SystemConsole.Error.WriteLine(e.ToString());
+                    Console.Error.WriteLine(e.ToString());
                 }
             }
 

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/81e464dd/src/Lucene.Net.Benchmark/ByTask/Feeds/SpatialDocMaker.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Benchmark/ByTask/Feeds/SpatialDocMaker.cs b/src/Lucene.Net.Benchmark/ByTask/Feeds/SpatialDocMaker.cs
index 9b979cc..f829ef1 100644
--- a/src/Lucene.Net.Benchmark/ByTask/Feeds/SpatialDocMaker.cs
+++ b/src/Lucene.Net.Benchmark/ByTask/Feeds/SpatialDocMaker.cs
@@ -3,11 +3,11 @@ using Lucene.Net.Documents;
 using Lucene.Net.Spatial;
 using Lucene.Net.Spatial.Prefix;
 using Lucene.Net.Spatial.Prefix.Tree;
-using Lucene.Net.Support;
 using Spatial4n.Core.Context;
 using Spatial4n.Core.Shapes;
 using System;
 using System.Collections.Generic;
+using Console = Lucene.Net.Support.SystemConsole;
 
 namespace Lucene.Net.Benchmarks.ByTask.Feeds
 {
@@ -132,7 +132,7 @@ namespace Lucene.Net.Benchmarks.ByTask.Feeds
                 spatialStrategyCache[config.RoundNumber] = strategy;
                 //TODO remove previous round config?
                 shapeConverter = MakeShapeConverter(strategy, config, "doc.spatial.");
-                SystemConsole.WriteLine("Spatial Strategy: " + strategy);
+                Console.WriteLine("Spatial Strategy: " + strategy);
             }
         }
 
@@ -224,7 +224,7 @@ namespace Lucene.Net.Benchmarks.ByTask.Feeds
                 }
                 catch (Exception e)
                 {//InvalidShapeException TODO
-                    SystemConsole.Error.WriteLine("Shape " + name + " wasn't parseable: " + e + "  (skipping it)");
+                    Console.Error.WriteLine("Shape " + name + " wasn't parseable: " + e + "  (skipping it)");
                     return null;
                 }
             }

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/81e464dd/src/Lucene.Net.Benchmark/ByTask/Feeds/TrecContentSource.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Benchmark/ByTask/Feeds/TrecContentSource.cs b/src/Lucene.Net.Benchmark/ByTask/Feeds/TrecContentSource.cs
index d84a25d..d34f235 100644
--- a/src/Lucene.Net.Benchmark/ByTask/Feeds/TrecContentSource.cs
+++ b/src/Lucene.Net.Benchmark/ByTask/Feeds/TrecContentSource.cs
@@ -6,6 +6,7 @@ using System.Globalization;
 using System.IO;
 using System.Text;
 using System.Threading;
+using Console = Lucene.Net.Support.SystemConsole;
 
 namespace Lucene.Net.Benchmarks.ByTask.Feeds
 {
@@ -177,7 +178,7 @@ namespace Lucene.Net.Benchmarks.ByTask.Feeds
                 FileInfo f = inputFiles[nextFile++];
                 if (m_verbose)
                 {
-                    SystemConsole.WriteLine("opening: " + f + " length: " + f.Length);
+                    Console.WriteLine("opening: " + f + " length: " + f.Length);
                 }
                 try
                 {
@@ -190,7 +191,7 @@ namespace Lucene.Net.Benchmarks.ByTask.Feeds
                 {
                     if (m_verbose)
                     {
-                        SystemConsole.WriteLine("Skipping 'bad' file " + f.FullName + " due to " + e.Message);
+                        Console.WriteLine("Skipping 'bad' file " + f.FullName + " due to " + e.Message);
                         continue;
                     }
                     throw new NoMoreDataException();
@@ -214,7 +215,7 @@ namespace Lucene.Net.Benchmarks.ByTask.Feeds
             // do not fail test just because a date could not be parsed
             if (m_verbose)
             {
-                SystemConsole.WriteLine("failed to parse date (assigning 'now') for: " + dateStr);
+                Console.WriteLine("failed to parse date (assigning 'now') for: " + dateStr);
             }
             return null;
         }
@@ -234,8 +235,8 @@ namespace Lucene.Net.Benchmarks.ByTask.Feeds
             {
                 if (m_verbose)
                 {
-                    SystemConsole.WriteLine("failed to dispose reader !");
-                    SystemConsole.WriteLine(e.ToString());
+                    Console.WriteLine("failed to dispose reader !");
+                    Console.WriteLine(e.ToString());
                 }
             }
             reader = null;

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/81e464dd/src/Lucene.Net.Benchmark/ByTask/PerfRunData.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Benchmark/ByTask/PerfRunData.cs b/src/Lucene.Net.Benchmark/ByTask/PerfRunData.cs
index e5b334c..c31bff4 100644
--- a/src/Lucene.Net.Benchmark/ByTask/PerfRunData.cs
+++ b/src/Lucene.Net.Benchmark/ByTask/PerfRunData.cs
@@ -7,12 +7,12 @@ using Lucene.Net.Facet.Taxonomy;
 using Lucene.Net.Index;
 using Lucene.Net.Search;
 using Lucene.Net.Store;
-using Lucene.Net.Support;
 using Lucene.Net.Util;
 using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
+using Console = Lucene.Net.Support.SystemConsole;
 
 namespace Lucene.Net.Benchmarks.ByTask
 {
@@ -123,8 +123,8 @@ namespace Lucene.Net.Benchmarks.ByTask
 
             if (bool.Parse(config.Get("log.queries", "false")))
             {
-                SystemConsole.WriteLine("------------> queries:");
-                SystemConsole.WriteLine(GetQueryMaker(new SearchTask(this)).PrintQueries());
+                Console.WriteLine("------------> queries:");
+                Console.WriteLine(GetQueryMaker(new SearchTask(this)).PrintQueries());
             }
         }
 

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/81e464dd/src/Lucene.Net.Benchmark/ByTask/Programmatic/Sample.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Benchmark/ByTask/Programmatic/Sample.cs b/src/Lucene.Net.Benchmark/ByTask/Programmatic/Sample.cs
index 3dbb07b..116de87 100644
--- a/src/Lucene.Net.Benchmark/ByTask/Programmatic/Sample.cs
+++ b/src/Lucene.Net.Benchmark/ByTask/Programmatic/Sample.cs
@@ -1,7 +1,7 @@
 using Lucene.Net.Benchmarks.ByTask.Tasks;
 using Lucene.Net.Benchmarks.ByTask.Utils;
-using Lucene.Net.Support;
 using System.Collections.Generic;
+using Console = Lucene.Net.Support.SystemConsole;
 
 namespace Lucene.Net.Benchmarks.ByTask.Programmatic
 {
@@ -60,7 +60,7 @@ namespace Lucene.Net.Benchmarks.ByTask.Programmatic
             top.AddTask(rep);
 
             // print algorithm
-            SystemConsole.WriteLine(top.ToString());
+            Console.WriteLine(top.ToString());
 
             // execute
             top.DoLogic();

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/81e464dd/src/Lucene.Net.Benchmark/ByTask/Tasks/CloseReaderTask.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Benchmark/ByTask/Tasks/CloseReaderTask.cs b/src/Lucene.Net.Benchmark/ByTask/Tasks/CloseReaderTask.cs
index 7a8c61c..f2d0b4d 100644
--- a/src/Lucene.Net.Benchmark/ByTask/Tasks/CloseReaderTask.cs
+++ b/src/Lucene.Net.Benchmark/ByTask/Tasks/CloseReaderTask.cs
@@ -1,5 +1,5 @@
 using Lucene.Net.Index;
-using Lucene.Net.Support;
+using Console = Lucene.Net.Support.SystemConsole;
 
 namespace Lucene.Net.Benchmarks.ByTask.Tasks
 {
@@ -40,7 +40,7 @@ namespace Lucene.Net.Benchmarks.ByTask.Tasks
             RunData.SetIndexReader(null);
             if (reader.RefCount != 1)
             {
-                SystemConsole.WriteLine("WARNING: CloseReader: reference count is currently " + reader.RefCount);
+                Console.WriteLine("WARNING: CloseReader: reference count is currently " + reader.RefCount);
             }
             reader.DecRef();
             return 1;

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/81e464dd/src/Lucene.Net.Benchmark/ByTask/Tasks/CloseTaxonomyReaderTask.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Benchmark/ByTask/Tasks/CloseTaxonomyReaderTask.cs b/src/Lucene.Net.Benchmark/ByTask/Tasks/CloseTaxonomyReaderTask.cs
index fc1ab27..b5e714a 100644
--- a/src/Lucene.Net.Benchmark/ByTask/Tasks/CloseTaxonomyReaderTask.cs
+++ b/src/Lucene.Net.Benchmark/ByTask/Tasks/CloseTaxonomyReaderTask.cs
@@ -1,5 +1,5 @@
 using Lucene.Net.Facet.Taxonomy;
-using Lucene.Net.Support;
+using Console = Lucene.Net.Support.SystemConsole;
 
 namespace Lucene.Net.Benchmarks.ByTask.Tasks
 {
@@ -38,7 +38,7 @@ namespace Lucene.Net.Benchmarks.ByTask.Tasks
             RunData.SetTaxonomyReader(null);
             if (taxoReader.RefCount != 1)
             {
-                SystemConsole.WriteLine("WARNING: CloseTaxonomyReader: reference count is currently " + taxoReader.RefCount);
+                Console.WriteLine("WARNING: CloseTaxonomyReader: reference count is currently " + taxoReader.RefCount);
             }
             taxoReader.Dispose();
             return 1;

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/81e464dd/src/Lucene.Net.Benchmark/ByTask/Tasks/CreateIndexTask.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Benchmark/ByTask/Tasks/CreateIndexTask.cs b/src/Lucene.Net.Benchmark/ByTask/Tasks/CreateIndexTask.cs
index 9705c7a..a8efda0 100644
--- a/src/Lucene.Net.Benchmark/ByTask/Tasks/CreateIndexTask.cs
+++ b/src/Lucene.Net.Benchmark/ByTask/Tasks/CreateIndexTask.cs
@@ -6,6 +6,7 @@ using Lucene.Net.Util;
 using System;
 using System.IO;
 using System.Text;
+using Console = Lucene.Net.Support.SystemConsole;
 
 namespace Lucene.Net.Benchmarks.ByTask.Tasks
 {
@@ -48,8 +49,8 @@ namespace Lucene.Net.Benchmarks.ByTask.Tasks
     /// This task also supports a "writer.info.stream" property with the following
     /// values:
     /// <list type="bullet">
-    ///     <item><term>SystemOut</term><description>Sets <see cref="IndexWriterConfig.SetInfoStream(InfoStream)"/> to <see cref="SystemConsole.Out"/>.</description></item>
-    ///     <item><term>SystemErr</term><description>Sets <see cref="IndexWriterConfig.SetInfoStream(InfoStream)"/> to <see cref="SystemConsole.Error"/></description></item>
+    ///     <item><term>SystemOut</term><description>Sets <see cref="IndexWriterConfig.SetInfoStream(InfoStream)"/> to <see cref="Console.Out"/>.</description></item>
+    ///     <item><term>SystemErr</term><description>Sets <see cref="IndexWriterConfig.SetInfoStream(InfoStream)"/> to <see cref="Console.Error"/></description></item>
     ///     <item><term>&lt;file_name&gt;</term><description>
     ///     Attempts to create a file given that name and sets <see cref="IndexWriterConfig.SetInfoStream(InfoStream)"/>
     ///     to that file. If this denotes an invalid file name, or some error occurs, an exception will be thrown.
@@ -220,11 +221,11 @@ namespace Lucene.Net.Benchmarks.ByTask.Tasks
             {
                 if (infoStreamVal.Equals("SystemOut", StringComparison.Ordinal))
                 {
-                    iwc.SetInfoStream(SystemConsole.Out);
+                    iwc.SetInfoStream(Console.Out);
                 }
                 else if (infoStreamVal.Equals("SystemErr", StringComparison.Ordinal))
                 {
-                    iwc.SetInfoStream(SystemConsole.Error);
+                    iwc.SetInfoStream(Console.Error);
                 }
                 else
                 {

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/81e464dd/src/Lucene.Net.Benchmark/ByTask/Tasks/NearRealtimeReaderTask.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Benchmark/ByTask/Tasks/NearRealtimeReaderTask.cs b/src/Lucene.Net.Benchmark/ByTask/Tasks/NearRealtimeReaderTask.cs
index 411f285..7942156 100644
--- a/src/Lucene.Net.Benchmark/ByTask/Tasks/NearRealtimeReaderTask.cs
+++ b/src/Lucene.Net.Benchmark/ByTask/Tasks/NearRealtimeReaderTask.cs
@@ -1,9 +1,9 @@
 using Lucene.Net.Index;
-using Lucene.Net.Support;
 using Lucene.Net.Util;
 using System;
 using System.Globalization;
 using System.Threading;
+using Console = Lucene.Net.Support.SystemConsole;
 
 namespace Lucene.Net.Benchmarks.ByTask.Tasks
 {
@@ -115,12 +115,12 @@ namespace Lucene.Net.Benchmarks.ByTask.Tasks
         {
             if (disposing)
             {
-                SystemConsole.WriteLine("NRT reopen times:");
+                Console.WriteLine("NRT reopen times:");
                 for (int i = 0; i < reopenCount; i++)
                 {
-                    SystemConsole.Write(" " + reopenTimes[i]);
+                    Console.Write(" " + reopenTimes[i]);
                 }
-                SystemConsole.WriteLine();
+                Console.WriteLine();
             }
         }
 

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/81e464dd/src/Lucene.Net.Benchmark/ByTask/Tasks/NewCollationAnalyzerTask.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Benchmark/ByTask/Tasks/NewCollationAnalyzerTask.cs b/src/Lucene.Net.Benchmark/ByTask/Tasks/NewCollationAnalyzerTask.cs
index 4ff00c1..f2dab7b 100644
--- a/src/Lucene.Net.Benchmark/ByTask/Tasks/NewCollationAnalyzerTask.cs
+++ b/src/Lucene.Net.Benchmark/ByTask/Tasks/NewCollationAnalyzerTask.cs
@@ -4,6 +4,7 @@ using Lucene.Net.Support;
 using Lucene.Net.Util;
 using System;
 using System.Globalization;
+using Console = Lucene.Net.Support.SystemConsole;
 
 namespace Lucene.Net.Benchmarks.ByTask.Tasks
 {
@@ -102,7 +103,7 @@ namespace Lucene.Net.Benchmarks.ByTask.Tasks
                     "Locale must be set with the NewLocale task!");
                 Analyzer analyzer = CreateAnalyzer(locale, impl);
                 RunData.Analyzer = analyzer;
-                SystemConsole.WriteLine("Changed Analyzer to: "
+                Console.WriteLine("Changed Analyzer to: "
                     + analyzer.GetType().Name + "(" + locale + ")");
             }
             catch (Exception e)

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/81e464dd/src/Lucene.Net.Benchmark/ByTask/Tasks/NewLocaleTask.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Benchmark/ByTask/Tasks/NewLocaleTask.cs b/src/Lucene.Net.Benchmark/ByTask/Tasks/NewLocaleTask.cs
index a961207..69d5eb4 100644
--- a/src/Lucene.Net.Benchmark/ByTask/Tasks/NewLocaleTask.cs
+++ b/src/Lucene.Net.Benchmark/ByTask/Tasks/NewLocaleTask.cs
@@ -1,6 +1,7 @@
 using Lucene.Net.Support;
 using System;
 using System.Globalization;
+using Console = Lucene.Net.Support.SystemConsole;
 
 namespace Lucene.Net.Benchmarks.ByTask.Tasks
 {
@@ -67,7 +68,7 @@ namespace Lucene.Net.Benchmarks.ByTask.Tasks
         {
             CultureInfo locale = CreateLocale(culture /*language, country, variant*/);
             RunData.Locale = locale;
-            SystemConsole.WriteLine("Changed Locale to: " +
+            Console.WriteLine("Changed Locale to: " +
                 (locale == null ? "null" :
                 (locale.EnglishName.Length == 0) ? "root locale" : locale.ToString()));
             return 1;

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/81e464dd/src/Lucene.Net.Benchmark/ByTask/Tasks/PerfTask.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Benchmark/ByTask/Tasks/PerfTask.cs b/src/Lucene.Net.Benchmark/ByTask/Tasks/PerfTask.cs
index 099e0e1..bc4970c 100644
--- a/src/Lucene.Net.Benchmark/ByTask/Tasks/PerfTask.cs
+++ b/src/Lucene.Net.Benchmark/ByTask/Tasks/PerfTask.cs
@@ -1,11 +1,11 @@
 using Lucene.Net.Benchmarks.ByTask.Stats;
 using Lucene.Net.Benchmarks.ByTask.Utils;
-using Lucene.Net.Support;
 using System;
 using System.Diagnostics;
 using System.Globalization;
 using System.Text;
 using System.Threading;
+using Console = Lucene.Net.Support.SystemConsole;
 
 namespace Lucene.Net.Benchmarks.ByTask.Tasks
 {
@@ -186,7 +186,7 @@ namespace Lucene.Net.Benchmarks.ByTask.Tasks
             }
             if (reportStats && depth <= maxDepthLogStart && !ShouldNeverLogAtStart)
             {
-                SystemConsole.WriteLine("------------> starting task: " + GetName());
+                Console.WriteLine("------------> starting task: " + GetName());
             }
             Setup();
             Points pnts = runData.Points;
@@ -330,7 +330,7 @@ namespace Lucene.Net.Benchmarks.ByTask.Tasks
             if (++logStepCount % m_logStep == 0)
             {
                 double time = (((Stopwatch.GetTimestamp() / Stopwatch.Frequency) * 1000) - runData.StartTimeMillis) / 1000.0;
-                SystemConsole.WriteLine(string.Format(CultureInfo.InvariantCulture, "{0:0000000.00}", time) + " sec --> "
+                Console.WriteLine(string.Format(CultureInfo.InvariantCulture, "{0:0000000.00}", time) + " sec --> "
                     + Thread.CurrentThread.Name + " " + GetLogMessage(logStepCount));
             }
         }

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/81e464dd/src/Lucene.Net.Benchmark/ByTask/Tasks/PrintReaderTask.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Benchmark/ByTask/Tasks/PrintReaderTask.cs b/src/Lucene.Net.Benchmark/ByTask/Tasks/PrintReaderTask.cs
index 3453fc5..a82e0af 100644
--- a/src/Lucene.Net.Benchmark/ByTask/Tasks/PrintReaderTask.cs
+++ b/src/Lucene.Net.Benchmark/ByTask/Tasks/PrintReaderTask.cs
@@ -1,6 +1,6 @@
 using Lucene.Net.Index;
 using Lucene.Net.Store;
-using Lucene.Net.Support;
+using Console = Lucene.Net.Support.SystemConsole;
 
 namespace Lucene.Net.Benchmarks.ByTask.Tasks
 {
@@ -52,7 +52,7 @@ namespace Lucene.Net.Benchmarks.ByTask.Tasks
                 r = DirectoryReader.Open(dir);
             else
                 r = DirectoryReader.Open(OpenReaderTask.FindIndexCommit(dir, userData));
-            SystemConsole.WriteLine("--> numDocs:" + r.NumDocs + " dels:" + r.NumDeletedDocs);
+            Console.WriteLine("--> numDocs:" + r.NumDocs + " dels:" + r.NumDeletedDocs);
             r.Dispose();
             return 1;
         }

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/81e464dd/src/Lucene.Net.Benchmark/ByTask/Tasks/ReadTask.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Benchmark/ByTask/Tasks/ReadTask.cs b/src/Lucene.Net.Benchmark/ByTask/Tasks/ReadTask.cs
index 3eeda9b..444db69 100644
--- a/src/Lucene.Net.Benchmark/ByTask/Tasks/ReadTask.cs
+++ b/src/Lucene.Net.Benchmark/ByTask/Tasks/ReadTask.cs
@@ -4,10 +4,10 @@ using Lucene.Net.Documents;
 using Lucene.Net.Index;
 using Lucene.Net.Search;
 using Lucene.Net.Store;
-using Lucene.Net.Support;
 using Lucene.Net.Util;
 using System;
 using System.Collections.Generic;
+using Console = Lucene.Net.Support.SystemConsole;
 
 namespace Lucene.Net.Benchmarks.ByTask.Tasks
 {
@@ -140,14 +140,14 @@ namespace Lucene.Net.Benchmarks.ByTask.Tasks
                     string printHitsField = RunData.Config.Get("print.hits.field", null);
                     if (hits != null && printHitsField != null && printHitsField.Length > 0)
                     {
-                        SystemConsole.WriteLine("totalHits = " + hits.TotalHits);
-                        SystemConsole.WriteLine("maxDoc()  = " + reader.MaxDoc);
-                        SystemConsole.WriteLine("numDocs() = " + reader.NumDocs);
+                        Console.WriteLine("totalHits = " + hits.TotalHits);
+                        Console.WriteLine("maxDoc()  = " + reader.MaxDoc);
+                        Console.WriteLine("numDocs() = " + reader.NumDocs);
                         for (int i = 0; i < hits.ScoreDocs.Length; i++)
                         {
                             int docID = hits.ScoreDocs[i].Doc;
                             Document doc = reader.Document(docID);
-                            SystemConsole.WriteLine("  " + i + ": doc=" + docID + " score=" + hits.ScoreDocs[i].Score + " " + printHitsField + " =" + doc.Get(printHitsField));
+                            Console.WriteLine("  " + i + ": doc=" + docID + " score=" + hits.ScoreDocs[i].Score + " " + printHitsField + " =" + doc.Get(printHitsField));
                         }
                     }
 

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/81e464dd/src/Lucene.Net.Benchmark/ByTask/Tasks/RepAllTask.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Benchmark/ByTask/Tasks/RepAllTask.cs b/src/Lucene.Net.Benchmark/ByTask/Tasks/RepAllTask.cs
index e382605..15453c2 100644
--- a/src/Lucene.Net.Benchmark/ByTask/Tasks/RepAllTask.cs
+++ b/src/Lucene.Net.Benchmark/ByTask/Tasks/RepAllTask.cs
@@ -1,7 +1,7 @@
 using Lucene.Net.Benchmarks.ByTask.Stats;
-using Lucene.Net.Support;
 using System.Collections.Generic;
 using System.Text;
+using Console = Lucene.Net.Support.SystemConsole;
 
 namespace Lucene.Net.Benchmarks.ByTask.Tasks
 {
@@ -38,10 +38,10 @@ namespace Lucene.Net.Benchmarks.ByTask.Tasks
         {
             Report rp = ReportAll(RunData.Points.TaskStats);
 
-            SystemConsole.WriteLine();
-            SystemConsole.WriteLine("------------> Report All (" + rp.Count + " out of " + rp.OutOf + ")");
-            SystemConsole.WriteLine(rp.Text);
-            SystemConsole.WriteLine();
+            Console.WriteLine();
+            Console.WriteLine("------------> Report All (" + rp.Count + " out of " + rp.OutOf + ")");
+            Console.WriteLine(rp.Text);
+            Console.WriteLine();
             return 0;
         }
 

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/81e464dd/src/Lucene.Net.Benchmark/ByTask/Tasks/RepSelectByPrefTask.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Benchmark/ByTask/Tasks/RepSelectByPrefTask.cs b/src/Lucene.Net.Benchmark/ByTask/Tasks/RepSelectByPrefTask.cs
index 16aac93..855ac56 100644
--- a/src/Lucene.Net.Benchmark/ByTask/Tasks/RepSelectByPrefTask.cs
+++ b/src/Lucene.Net.Benchmark/ByTask/Tasks/RepSelectByPrefTask.cs
@@ -1,8 +1,8 @@
 using Lucene.Net.Benchmarks.ByTask.Stats;
-using Lucene.Net.Support;
 using System;
 using System.Collections.Generic;
 using System.Text;
+using Console = Lucene.Net.Support.SystemConsole;
 
 namespace Lucene.Net.Benchmarks.ByTask.Tasks
 {
@@ -39,11 +39,11 @@ namespace Lucene.Net.Benchmarks.ByTask.Tasks
         {
             Report rp = ReportSelectByPrefix(RunData.Points.TaskStats);
 
-            SystemConsole.WriteLine();
-            SystemConsole.WriteLine("------------> Report Select By Prefix (" + m_prefix + ") (" +
+            Console.WriteLine();
+            Console.WriteLine("------------> Report Select By Prefix (" + m_prefix + ") (" +
                 rp.Count + " about " + rp.Reported + " out of " + rp.OutOf + ")");
-            SystemConsole.WriteLine(rp.Text);
-            SystemConsole.WriteLine();
+            Console.WriteLine(rp.Text);
+            Console.WriteLine();
 
             return 0;
         }

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/81e464dd/src/Lucene.Net.Benchmark/ByTask/Tasks/RepSumByNameRoundTask.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Benchmark/ByTask/Tasks/RepSumByNameRoundTask.cs b/src/Lucene.Net.Benchmark/ByTask/Tasks/RepSumByNameRoundTask.cs
index bce47ca..7d5a30c 100644
--- a/src/Lucene.Net.Benchmark/ByTask/Tasks/RepSumByNameRoundTask.cs
+++ b/src/Lucene.Net.Benchmark/ByTask/Tasks/RepSumByNameRoundTask.cs
@@ -1,6 +1,7 @@
 using Lucene.Net.Benchmarks.ByTask.Stats;
 using Lucene.Net.Support;
 using System.Collections.Generic;
+using Console = Lucene.Net.Support.SystemConsole;
 
 namespace Lucene.Net.Benchmarks.ByTask.Tasks
 {
@@ -37,11 +38,11 @@ namespace Lucene.Net.Benchmarks.ByTask.Tasks
         {
             Report rp = ReportSumByNameRound(RunData.Points.TaskStats);
 
-            SystemConsole.WriteLine();
-            SystemConsole.WriteLine("------------> Report Sum By (any) Name and Round (" +
+            Console.WriteLine();
+            Console.WriteLine("------------> Report Sum By (any) Name and Round (" +
                 rp.Count + " about " + rp.Reported + " out of " + rp.OutOf + ")");
-            SystemConsole.WriteLine(rp.Text);
-            SystemConsole.WriteLine();
+            Console.WriteLine(rp.Text);
+            Console.WriteLine();
 
             return 0;
         }

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/81e464dd/src/Lucene.Net.Benchmark/ByTask/Tasks/RepSumByNameTask.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Benchmark/ByTask/Tasks/RepSumByNameTask.cs b/src/Lucene.Net.Benchmark/ByTask/Tasks/RepSumByNameTask.cs
index 30d9878..2afce47 100644
--- a/src/Lucene.Net.Benchmark/ByTask/Tasks/RepSumByNameTask.cs
+++ b/src/Lucene.Net.Benchmark/ByTask/Tasks/RepSumByNameTask.cs
@@ -1,6 +1,7 @@
 using Lucene.Net.Benchmarks.ByTask.Stats;
 using Lucene.Net.Support;
 using System.Collections.Generic;
+using Console = Lucene.Net.Support.SystemConsole;
 
 namespace Lucene.Net.Benchmarks.ByTask.Tasks
 {
@@ -37,11 +38,11 @@ namespace Lucene.Net.Benchmarks.ByTask.Tasks
         {
             Report rp = ReportSumByName(RunData.Points.TaskStats);
 
-            SystemConsole.WriteLine();
-            SystemConsole.WriteLine("------------> Report Sum By (any) Name (" +
+            Console.WriteLine();
+            Console.WriteLine("------------> Report Sum By (any) Name (" +
                 rp.Count + " about " + rp.Reported + " out of " + rp.OutOf + ")");
-            SystemConsole.WriteLine(rp.Text);
-            SystemConsole.WriteLine();
+            Console.WriteLine(rp.Text);
+            Console.WriteLine();
 
             return 0;
         }

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/81e464dd/src/Lucene.Net.Benchmark/ByTask/Tasks/RepSumByPrefRoundTask.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Benchmark/ByTask/Tasks/RepSumByPrefRoundTask.cs b/src/Lucene.Net.Benchmark/ByTask/Tasks/RepSumByPrefRoundTask.cs
index ce977a0..2118a0f 100644
--- a/src/Lucene.Net.Benchmark/ByTask/Tasks/RepSumByPrefRoundTask.cs
+++ b/src/Lucene.Net.Benchmark/ByTask/Tasks/RepSumByPrefRoundTask.cs
@@ -2,6 +2,7 @@
 using Lucene.Net.Support;
 using System;
 using System.Collections.Generic;
+using Console = Lucene.Net.Support.SystemConsole;
 
 namespace Lucene.Net.Benchmarks.ByTask.Tasks
 {

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/81e464dd/src/Lucene.Net.Benchmark/ByTask/Tasks/RepSumByPrefTask.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Benchmark/ByTask/Tasks/RepSumByPrefTask.cs b/src/Lucene.Net.Benchmark/ByTask/Tasks/RepSumByPrefTask.cs
index 732e902..5e7eea6 100644
--- a/src/Lucene.Net.Benchmark/ByTask/Tasks/RepSumByPrefTask.cs
+++ b/src/Lucene.Net.Benchmark/ByTask/Tasks/RepSumByPrefTask.cs
@@ -2,6 +2,7 @@
 using Lucene.Net.Support;
 using System;
 using System.Collections.Generic;
+using Console = Lucene.Net.Support.SystemConsole;
 
 namespace Lucene.Net.Benchmarks.ByTask.Tasks
 {
@@ -40,11 +41,11 @@ namespace Lucene.Net.Benchmarks.ByTask.Tasks
         {
             Report rp = ReportSumByPrefix(RunData.Points.TaskStats);
 
-            SystemConsole.WriteLine();
-            SystemConsole.WriteLine("------------> Report Sum By Prefix (" + m_prefix + ") (" +
+            Console.WriteLine();
+            Console.WriteLine("------------> Report Sum By Prefix (" + m_prefix + ") (" +
                 rp.Count + " about " + rp.Reported + " out of " + rp.OutOf + ")");
-            SystemConsole.WriteLine(rp.Text);
-            SystemConsole.WriteLine();
+            Console.WriteLine(rp.Text);
+            Console.WriteLine();
 
             return 0;
         }

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/81e464dd/src/Lucene.Net.Benchmark/ByTask/Utils/Config.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Benchmark/ByTask/Utils/Config.cs b/src/Lucene.Net.Benchmark/ByTask/Utils/Config.cs
index e3190f9..53e8afd 100644
--- a/src/Lucene.Net.Benchmark/ByTask/Utils/Config.cs
+++ b/src/Lucene.Net.Benchmark/ByTask/Utils/Config.cs
@@ -4,6 +4,7 @@ using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
 using System.Text;
+using Console = Lucene.Net.Support.SystemConsole;
 
 namespace Lucene.Net.Benchmarks.ByTask.Utils
 {
@@ -137,14 +138,14 @@ namespace Lucene.Net.Benchmarks.ByTask.Utils
 
         private void PrintProps()
         {
-            SystemConsole.WriteLine("------------> config properties:");
+            Console.WriteLine("------------> config properties:");
             List<string> propKeys = new List<string>(props.Keys);
             propKeys.Sort();
             foreach (string propName in propKeys)
             {
-                SystemConsole.WriteLine(propName + " = " + props[propName]);
+                Console.WriteLine(propName + " = " + props[propName]);
             }
-            SystemConsole.WriteLine("-------------------------------");
+            Console.WriteLine("-------------------------------");
         }
 
         /// <summary>
@@ -376,9 +377,9 @@ namespace Lucene.Net.Benchmarks.ByTask.Utils
                 }
             }
 
-            SystemConsole.WriteLine();
-            SystemConsole.WriteLine(sb.ToString());
-            SystemConsole.WriteLine();
+            Console.WriteLine();
+            Console.WriteLine(sb.ToString());
+            Console.WriteLine();
 
             return roundNumber;
         }

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/81e464dd/src/Lucene.Net.Benchmark/Quality/Trec/QueryDriver.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Benchmark/Quality/Trec/QueryDriver.cs b/src/Lucene.Net.Benchmark/Quality/Trec/QueryDriver.cs
index 0540e62..7fa8389 100644
--- a/src/Lucene.Net.Benchmark/Quality/Trec/QueryDriver.cs
+++ b/src/Lucene.Net.Benchmark/Quality/Trec/QueryDriver.cs
@@ -1,13 +1,13 @@
 using Lucene.Net.Benchmarks.Quality.Utils;
 using Lucene.Net.Index;
 using Lucene.Net.Search;
-using Lucene.Net.Support;
 using Lucene.Net.Util;
 using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Text;
+using Console = Lucene.Net.Support.SystemConsole;
 
 namespace Lucene.Net.Benchmarks.Quality.Trec
 {
@@ -37,14 +37,16 @@ namespace Lucene.Net.Benchmarks.Quality.Trec
         {
             if (args.Length < 4 || args.Length > 5)
             {
-                SystemConsole.Error.WriteLine("Usage: QueryDriver <topicsFile> <qrelsFile> <submissionFile> <indexDir> [querySpec]");
-                SystemConsole.Error.WriteLine("topicsFile: input file containing queries");
-                SystemConsole.Error.WriteLine("qrelsFile: input file containing relevance judgements");
-                SystemConsole.Error.WriteLine("submissionFile: output submission file for trec_eval");
-                SystemConsole.Error.WriteLine("indexDir: index directory");
-                SystemConsole.Error.WriteLine("querySpec: string composed of fields to use in query consisting of T=title,D=description,N=narrative:");
-                SystemConsole.Error.WriteLine("\texample: TD (query on Title + Description). The default is T (title only)");
-                Environment.Exit(1);
+                // LUCENENET specific - our wrapper console shows correct usage
+                throw new ArgumentException();
+                //Console.Error.WriteLine("Usage: QueryDriver <topicsFile> <qrelsFile> <submissionFile> <indexDir> [querySpec]");
+                //Console.Error.WriteLine("topicsFile: input file containing queries");
+                //Console.Error.WriteLine("qrelsFile: input file containing relevance judgements");
+                //Console.Error.WriteLine("submissionFile: output submission file for trec_eval");
+                //Console.Error.WriteLine("indexDir: index directory");
+                //Console.Error.WriteLine("querySpec: string composed of fields to use in query consisting of T=title,D=description,N=narrative:");
+                //Console.Error.WriteLine("\texample: TD (query on Title + Description). The default is T (title only)");
+                //Environment.Exit(1);
             }
 
             FileInfo topicsFile = new FileInfo(args[0]);
@@ -59,7 +61,7 @@ namespace Lucene.Net.Benchmarks.Quality.Trec
                 int maxResults = 1000;
                 string docNameField = "docname";
 
-                TextWriter logger = SystemConsole.Out; //new StreamWriter(SystemConsole, Encoding.GetEncoding(0));
+                TextWriter logger = Console.Out; //new StreamWriter(Console, Encoding.GetEncoding(0));
 
                 // use trec utilities to read trec topics into quality queries
                 TrecTopicsReader qReader = new TrecTopicsReader();

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/81e464dd/src/Lucene.Net.Benchmark/Quality/Utils/QualityQueriesFinder.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Benchmark/Quality/Utils/QualityQueriesFinder.cs b/src/Lucene.Net.Benchmark/Quality/Utils/QualityQueriesFinder.cs
index 062263a..d29228d 100644
--- a/src/Lucene.Net.Benchmark/Quality/Utils/QualityQueriesFinder.cs
+++ b/src/Lucene.Net.Benchmark/Quality/Utils/QualityQueriesFinder.cs
@@ -1,8 +1,8 @@
 using Lucene.Net.Index;
 using Lucene.Net.Store;
-using Lucene.Net.Support;
 using System;
 using System.IO;
+using Console = Lucene.Net.Support.SystemConsole;
 
 namespace Lucene.Net.Benchmarks.Quality.Utils
 {
@@ -50,14 +50,16 @@ namespace Lucene.Net.Benchmarks.Quality.Utils
         {
             if (args.Length < 1)
             {
-                SystemConsole.Error.WriteLine("Usage: java QualityQueriesFinder <index-dir>");
-                Environment.Exit(1);
+                // LUCENENET specific - our wrapper console shows correct usage
+                throw new ArgumentException();
+                //Console.Error.WriteLine("Usage: java QualityQueriesFinder <index-dir>");
+                //Environment.Exit(1);
             }
             QualityQueriesFinder qqf = new QualityQueriesFinder(FSDirectory.Open(new DirectoryInfo(args[0])));
             string[] q = qqf.BestQueries("body", 20);
             for (int i = 0; i < q.Length; i++)
             {
-                SystemConsole.WriteLine(newline + FormatQueryAsTrecTopic(i, q[i], null, null));
+                Console.WriteLine(newline + FormatQueryAsTrecTopic(i, q[i], null, null));
             }
         }
 
@@ -120,7 +122,7 @@ namespace Lucene.Net.Benchmarks.Quality.Utils
             {
                 TermDf tdf = pq.Pop();
                 res[i++] = tdf.word;
-                SystemConsole.WriteLine(i + ".   word:  " + tdf.df + "   " + tdf.word);
+                Console.WriteLine(i + ".   word:  " + tdf.df + "   " + tdf.word);
             }
             return res;
         }

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/81e464dd/src/Lucene.Net.Benchmark/Utils/ExtractReuters.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Benchmark/Utils/ExtractReuters.cs b/src/Lucene.Net.Benchmark/Utils/ExtractReuters.cs
index 8727fa0..83b2cb4 100644
--- a/src/Lucene.Net.Benchmark/Utils/ExtractReuters.cs
+++ b/src/Lucene.Net.Benchmark/Utils/ExtractReuters.cs
@@ -1,8 +1,8 @@
-using Lucene.Net.Support;
-using System;
+using System;
 using System.IO;
 using System.Text;
 using System.Text.RegularExpressions;
+using Console = Lucene.Net.Support.SystemConsole;
 
 namespace Lucene.Net.Benchmarks.Utils
 {
@@ -36,7 +36,7 @@ namespace Lucene.Net.Benchmarks.Utils
         {
             this.reutersDir = reutersDir;
             this.outputDir = outputDir;
-            SystemConsole.WriteLine("Deleting all files in " + outputDir);
+            Console.WriteLine("Deleting all files in " + outputDir);
             foreach (FileInfo f in outputDir.EnumerateFiles())
             {
                 f.Delete();
@@ -55,7 +55,7 @@ namespace Lucene.Net.Benchmarks.Utils
             }
             else
             {
-                SystemConsole.Error.WriteLine("No .sgm files in " + reutersDir);
+                Console.Error.WriteLine("No .sgm files in " + reutersDir);
             }
         }
 
@@ -161,7 +161,9 @@ namespace Lucene.Net.Benchmarks.Utils
 
         private static void Usage(string msg)
         {
-            SystemConsole.Error.WriteLine("Usage: " + msg + " :: java -cp <...> org.apache.lucene.benchmark.utils.ExtractReuters <Path to Reuters SGM files> <Output Path>");
+            // LUCENENET specific - our wrapper console shows correct usage
+            throw new ArgumentException(msg);
+            //Console.Error.WriteLine("Usage: " + msg + " :: java -cp <...> org.apache.lucene.benchmark.utils.ExtractReuters <Path to Reuters SGM files> <Output Path>");
         }
     }
 }

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/81e464dd/src/Lucene.Net.Benchmark/Utils/ExtractWikipedia.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Benchmark/Utils/ExtractWikipedia.cs b/src/Lucene.Net.Benchmark/Utils/ExtractWikipedia.cs
index b61fbc5..b322996 100644
--- a/src/Lucene.Net.Benchmark/Utils/ExtractWikipedia.cs
+++ b/src/Lucene.Net.Benchmark/Utils/ExtractWikipedia.cs
@@ -1,12 +1,12 @@
 using Lucene.Net.Benchmarks.ByTask.Feeds;
 using Lucene.Net.Benchmarks.ByTask.Utils;
 using Lucene.Net.Documents;
-using Lucene.Net.Support;
 using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
 using System.Text;
+using Console = Lucene.Net.Support.SystemConsole;
 
 namespace Lucene.Net.Benchmarks.Utils
 {
@@ -43,7 +43,7 @@ namespace Lucene.Net.Benchmarks.Utils
         {
             this.outputDir = outputDir;
             this.m_docMaker = docMaker;
-            SystemConsole.WriteLine("Deleting all files in " + outputDir);
+            Console.WriteLine("Deleting all files in " + outputDir);
             FileInfo[] files = outputDir.GetFiles();
             for (int i = 0; i < files.Length; i++)
             {
@@ -100,7 +100,7 @@ namespace Lucene.Net.Benchmarks.Utils
         public virtual void Extract()
         {
             Document doc = null;
-            SystemConsole.WriteLine("Starting Extraction");
+            Console.WriteLine("Starting Extraction");
             long start = Support.Time.CurrentTimeMilliseconds();
             try
             {
@@ -115,7 +115,7 @@ namespace Lucene.Net.Benchmarks.Utils
                 //continue
             }
             long finish = Support.Time.CurrentTimeMilliseconds();
-            SystemConsole.WriteLine("Extraction took " + (finish - start) + " ms");
+            Console.WriteLine("Extraction took " + (finish - start) + " ms");
         }
 
         public static void Main(string[] args)
@@ -157,22 +157,24 @@ namespace Lucene.Net.Benchmarks.Utils
             docMaker.ResetInputs();
             if (wikipedia.Exists)
             {
-                SystemConsole.WriteLine("Extracting Wikipedia to: " + outputDir + " using EnwikiContentSource");
+                Console.WriteLine("Extracting Wikipedia to: " + outputDir + " using EnwikiContentSource");
                 outputDir.Create();
                 ExtractWikipedia extractor = new ExtractWikipedia(docMaker, outputDir);
                 extractor.Extract();
             }
             else
             {
-                PrintUsage();
+                // LUCENENET specific - our wrapper console shows correct usage
+                throw new ArgumentException();
+                //PrintUsage();
             }
         }
 
-        private static void PrintUsage()
-        {
-            SystemConsole.Error.WriteLine("Usage: java -cp <...> org.apache.lucene.benchmark.utils.ExtractWikipedia --input|-i <Path to Wikipedia XML file> " +
-                    "[--output|-o <Output Path>] [--discardImageOnlyDocs|-d]");
-            SystemConsole.Error.WriteLine("--discardImageOnlyDocs tells the extractor to skip Wiki docs that contain only images");
-        }
+        //private static void PrintUsage()
+        //{
+        //    Console.Error.WriteLine("Usage: java -cp <...> org.apache.lucene.benchmark.utils.ExtractWikipedia --input|-i <Path to Wikipedia XML file> " +
+        //            "[--output|-o <Output Path>] [--discardImageOnlyDocs|-d]");
+        //    Console.Error.WriteLine("--discardImageOnlyDocs tells the extractor to skip Wiki docs that contain only images");
+        //}
     }
 }

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/81e464dd/src/Lucene.Net.Misc/Index/CompoundFileExtractor.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Misc/Index/CompoundFileExtractor.cs b/src/Lucene.Net.Misc/Index/CompoundFileExtractor.cs
index e8452f5..a6e4da5 100644
--- a/src/Lucene.Net.Misc/Index/CompoundFileExtractor.cs
+++ b/src/Lucene.Net.Misc/Index/CompoundFileExtractor.cs
@@ -2,6 +2,7 @@
 using Lucene.Net.Util;
 using System;
 using System.IO;
+using Console = Lucene.Net.Support.SystemConsole;
 
 namespace Lucene.Net.Index
 {

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/81e464dd/src/Lucene.Net.Misc/Index/IndexSplitter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Misc/Index/IndexSplitter.cs b/src/Lucene.Net.Misc/Index/IndexSplitter.cs
index 1bb3dee..62adab3 100644
--- a/src/Lucene.Net.Misc/Index/IndexSplitter.cs
+++ b/src/Lucene.Net.Misc/Index/IndexSplitter.cs
@@ -4,6 +4,7 @@ using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
 using System.Linq;
+using Console = Lucene.Net.Support.SystemConsole;
 
 namespace Lucene.Net.Index
 {

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/81e464dd/src/Lucene.Net.Misc/Index/MultiPassIndexSplitter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Misc/Index/MultiPassIndexSplitter.cs b/src/Lucene.Net.Misc/Index/MultiPassIndexSplitter.cs
index 2a03d89..79a4bcd 100644
--- a/src/Lucene.Net.Misc/Index/MultiPassIndexSplitter.cs
+++ b/src/Lucene.Net.Misc/Index/MultiPassIndexSplitter.cs
@@ -5,6 +5,7 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
+using Console = Lucene.Net.Support.SystemConsole;
 
 namespace Lucene.Net.Index
 {

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/81e464dd/src/Lucene.Net.Misc/Misc/GetTermInfo.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Misc/Misc/GetTermInfo.cs b/src/Lucene.Net.Misc/Misc/GetTermInfo.cs
index 3ab9792..0bdb873 100644
--- a/src/Lucene.Net.Misc/Misc/GetTermInfo.cs
+++ b/src/Lucene.Net.Misc/Misc/GetTermInfo.cs
@@ -2,6 +2,7 @@
 using Lucene.Net.Store;
 using System;
 using System.IO;
+using Console = Lucene.Net.Support.SystemConsole;
 
 namespace Lucene.Net.Misc
 {
@@ -60,7 +61,6 @@ namespace Lucene.Net.Misc
         // LUCENENET specific - our wrapper console shows the correct usage
         //private static void Usage()
         //{
-        //    // LUCENENET TODO: Usage info is dependant on packaging this into a standalone console application
         //    Console.WriteLine("\n\nusage:\n\t" + "java " + typeof(GetTermInfo).FullName + " <index dir> field term \n\n");
         //}
     }

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/81e464dd/src/Lucene.Net.Misc/Misc/HighFreqTerms.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Misc/Misc/HighFreqTerms.cs b/src/Lucene.Net.Misc/Misc/HighFreqTerms.cs
index 3c74fc0..2803be0 100644
--- a/src/Lucene.Net.Misc/Misc/HighFreqTerms.cs
+++ b/src/Lucene.Net.Misc/Misc/HighFreqTerms.cs
@@ -5,6 +5,7 @@ using Lucene.Net.Util;
 using System;
 using System.Collections.Generic;
 using System.IO;
+using Console = Lucene.Net.Support.SystemConsole;
 
 namespace Lucene.Net.Misc
 {

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/81e464dd/src/Lucene.Net.Misc/Misc/IndexMergeTool.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Misc/Misc/IndexMergeTool.cs b/src/Lucene.Net.Misc/Misc/IndexMergeTool.cs
index dafb743..d4c93f4 100644
--- a/src/Lucene.Net.Misc/Misc/IndexMergeTool.cs
+++ b/src/Lucene.Net.Misc/Misc/IndexMergeTool.cs
@@ -2,6 +2,7 @@
 using Lucene.Net.Store;
 using Lucene.Net.Util;
 using System;
+using Console = Lucene.Net.Support.SystemConsole;
 
 namespace Lucene.Net.Misc
 {

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/81e464dd/src/Lucene.Net.QueryParser/Classic/FastCharStream.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Classic/FastCharStream.cs b/src/Lucene.Net.QueryParser/Classic/FastCharStream.cs
index 302e5bb..0e9c670 100644
--- a/src/Lucene.Net.QueryParser/Classic/FastCharStream.cs
+++ b/src/Lucene.Net.QueryParser/Classic/FastCharStream.cs
@@ -1,4 +1,5 @@
 using System;
+using Console = Lucene.Net.Support.SystemConsole;
 
 namespace Lucene.Net.QueryParsers.Classic
 {
@@ -123,7 +124,7 @@ namespace Lucene.Net.QueryParsers.Classic
 			}
 			catch (System.IO.IOException e)
 			{
-				System.Console.Error.WriteLine("Caught: " + e + "; ignoring.");
+				Console.Error.WriteLine("Caught: " + e + "; ignoring.");
 			}
 		}
 

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/81e464dd/src/Lucene.Net.QueryParser/Flexible/Standard/Parser/StandardSyntaxParserTokenManager.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Flexible/Standard/Parser/StandardSyntaxParserTokenManager.cs b/src/Lucene.Net.QueryParser/Flexible/Standard/Parser/StandardSyntaxParserTokenManager.cs
index c775c4b..582cd24 100644
--- a/src/Lucene.Net.QueryParser/Flexible/Standard/Parser/StandardSyntaxParserTokenManager.cs
+++ b/src/Lucene.Net.QueryParser/Flexible/Standard/Parser/StandardSyntaxParserTokenManager.cs
@@ -1,6 +1,6 @@
 using Lucene.Net.Support.IO;
-using System;
 using System.IO;
+using Console = Lucene.Net.Support.SystemConsole;
 
 namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
 {

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/81e464dd/src/Lucene.Net.QueryParser/Surround/Parser/FastCharStream.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Surround/Parser/FastCharStream.cs b/src/Lucene.Net.QueryParser/Surround/Parser/FastCharStream.cs
index 1c8029e..70d694d1 100644
--- a/src/Lucene.Net.QueryParser/Surround/Parser/FastCharStream.cs
+++ b/src/Lucene.Net.QueryParser/Surround/Parser/FastCharStream.cs
@@ -1,4 +1,5 @@
 using System;
+using Console = Lucene.Net.Support.SystemConsole;
 
 namespace Lucene.Net.QueryParsers.Surround.Parser
 {
@@ -123,7 +124,7 @@ namespace Lucene.Net.QueryParsers.Surround.Parser
             }
             catch (System.IO.IOException e)
             {
-                System.Console.Error.WriteLine("Caught: " + e + "; ignoring.");
+                Console.Error.WriteLine("Caught: " + e + "; ignoring.");
             }
         }
 

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/81e464dd/src/Lucene.Net.TestFramework/Analysis/BaseTokenStreamTestCase.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Analysis/BaseTokenStreamTestCase.cs b/src/Lucene.Net.TestFramework/Analysis/BaseTokenStreamTestCase.cs
index 304b8bc..bc3f6ee 100644
--- a/src/Lucene.Net.TestFramework/Analysis/BaseTokenStreamTestCase.cs
+++ b/src/Lucene.Net.TestFramework/Analysis/BaseTokenStreamTestCase.cs
@@ -11,6 +11,7 @@ using System.IO;
 using System.Linq;
 using System.Text;
 using System.Threading;
+using Console = Lucene.Net.Support.SystemConsole;
 
 namespace Lucene.Net.Analysis
 {

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/81e464dd/src/Lucene.Net.TestFramework/Analysis/LookaheadTokenFilter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Analysis/LookaheadTokenFilter.cs b/src/Lucene.Net.TestFramework/Analysis/LookaheadTokenFilter.cs
index e3a4252..c65fee9 100644
--- a/src/Lucene.Net.TestFramework/Analysis/LookaheadTokenFilter.cs
+++ b/src/Lucene.Net.TestFramework/Analysis/LookaheadTokenFilter.cs
@@ -2,6 +2,7 @@ using Lucene.Net.Analysis.TokenAttributes;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
+using Console = Lucene.Net.Support.SystemConsole;
 
 namespace Lucene.Net.Analysis
 {

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/81e464dd/src/Lucene.Net.TestFramework/Analysis/MockAnalyzer.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Analysis/MockAnalyzer.cs b/src/Lucene.Net.TestFramework/Analysis/MockAnalyzer.cs
index c09e31e..2da6d29 100644
--- a/src/Lucene.Net.TestFramework/Analysis/MockAnalyzer.cs
+++ b/src/Lucene.Net.TestFramework/Analysis/MockAnalyzer.cs
@@ -1,11 +1,10 @@
 using System;
 using System.Collections.Generic;
+using System.IO;
+using Console = Lucene.Net.Support.SystemConsole;
 
 namespace Lucene.Net.Analysis
 {
-    using System.IO;
-    using CharacterRunAutomaton = Lucene.Net.Util.Automaton.CharacterRunAutomaton;
-
     /*
          * Licensed to the Apache Software Foundation (ASF) under one or more
          * contributor license agreements.  See the NOTICE file distributed with
@@ -23,6 +22,7 @@ namespace Lucene.Net.Analysis
          * limitations under the License.
          */
 
+    using CharacterRunAutomaton = Lucene.Net.Util.Automaton.CharacterRunAutomaton;
     using LuceneTestCase = Lucene.Net.Util.LuceneTestCase;
 
     /// <summary>

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/81e464dd/src/Lucene.Net.TestFramework/Analysis/MockGraphTokenFilter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Analysis/MockGraphTokenFilter.cs b/src/Lucene.Net.TestFramework/Analysis/MockGraphTokenFilter.cs
index dc84f7a..7bc03cf 100644
--- a/src/Lucene.Net.TestFramework/Analysis/MockGraphTokenFilter.cs
+++ b/src/Lucene.Net.TestFramework/Analysis/MockGraphTokenFilter.cs
@@ -1,6 +1,7 @@
 using Lucene.Net.Analysis.TokenAttributes;
 using NUnit.Framework;
 using System;
+using Console = Lucene.Net.Support.SystemConsole;
 
 namespace Lucene.Net.Analysis
 {

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/81e464dd/src/Lucene.Net.TestFramework/Analysis/MockRandomLookaheadTokenFilter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Analysis/MockRandomLookaheadTokenFilter.cs b/src/Lucene.Net.TestFramework/Analysis/MockRandomLookaheadTokenFilter.cs
index 9dba8d3..44ac68b 100644
--- a/src/Lucene.Net.TestFramework/Analysis/MockRandomLookaheadTokenFilter.cs
+++ b/src/Lucene.Net.TestFramework/Analysis/MockRandomLookaheadTokenFilter.cs
@@ -1,6 +1,7 @@
 using Lucene.Net.Analysis.TokenAttributes;
 using System;
 using System.Threading;
+using Console = Lucene.Net.Support.SystemConsole;
 
 namespace Lucene.Net.Analysis
 {

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/81e464dd/src/Lucene.Net.TestFramework/Analysis/TokenStreamToDot.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Analysis/TokenStreamToDot.cs b/src/Lucene.Net.TestFramework/Analysis/TokenStreamToDot.cs
index 0ca122e..cd229fd 100644
--- a/src/Lucene.Net.TestFramework/Analysis/TokenStreamToDot.cs
+++ b/src/Lucene.Net.TestFramework/Analysis/TokenStreamToDot.cs
@@ -1,5 +1,6 @@
 using Lucene.Net.Analysis.TokenAttributes;
 using System;
+using Console = Lucene.Net.Support.SystemConsole;
 
 namespace Lucene.Net.Analysis
 {

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/81e464dd/src/Lucene.Net.TestFramework/Codecs/Lucene3x/PreFlexRWPostingsFormat.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Codecs/Lucene3x/PreFlexRWPostingsFormat.cs b/src/Lucene.Net.TestFramework/Codecs/Lucene3x/PreFlexRWPostingsFormat.cs
index 4660593..9829a81 100644
--- a/src/Lucene.Net.TestFramework/Codecs/Lucene3x/PreFlexRWPostingsFormat.cs
+++ b/src/Lucene.Net.TestFramework/Codecs/Lucene3x/PreFlexRWPostingsFormat.cs
@@ -1,6 +1,5 @@
 using System;
-using System.Reflection;
-using System.Diagnostics;
+using Console = Lucene.Net.Support.SystemConsole;
 
 namespace Lucene.Net.Codecs.Lucene3x
 {

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/81e464dd/src/Lucene.Net.TestFramework/Codecs/MockRandom/MockRandomPostingsFormat.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Codecs/MockRandom/MockRandomPostingsFormat.cs b/src/Lucene.Net.TestFramework/Codecs/MockRandom/MockRandomPostingsFormat.cs
index 4563702..cbfd9ca 100644
--- a/src/Lucene.Net.TestFramework/Codecs/MockRandom/MockRandomPostingsFormat.cs
+++ b/src/Lucene.Net.TestFramework/Codecs/MockRandom/MockRandomPostingsFormat.cs
@@ -32,6 +32,7 @@ using Lucene.Net.Util;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
+using Console = Lucene.Net.Support.SystemConsole;
 
 namespace Lucene.Net.Codecs.MockRandom
 {

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/81e464dd/src/Lucene.Net.TestFramework/Index/BasePostingsFormatTestCase.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Index/BasePostingsFormatTestCase.cs b/src/Lucene.Net.TestFramework/Index/BasePostingsFormatTestCase.cs
index c4211ab..c8b9c16 100644
--- a/src/Lucene.Net.TestFramework/Index/BasePostingsFormatTestCase.cs
+++ b/src/Lucene.Net.TestFramework/Index/BasePostingsFormatTestCase.cs
@@ -2,15 +2,16 @@ using Lucene.Net.Documents;
 using Lucene.Net.Randomized.Generators;
 using Lucene.Net.Support;
 using Lucene.Net.Support.Threading;
+using NUnit.Framework;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
+using Console = Lucene.Net.Support.SystemConsole;
 
 namespace Lucene.Net.Index
 {
-    using NUnit.Framework;
     using IBits = Lucene.Net.Util.IBits;
     using BytesRef = Lucene.Net.Util.BytesRef;
 

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/81e464dd/src/Lucene.Net.TestFramework/Index/BaseStoredFieldsFormatTestCase.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Index/BaseStoredFieldsFormatTestCase.cs b/src/Lucene.Net.TestFramework/Index/BaseStoredFieldsFormatTestCase.cs
index 9cde4c7..d4b6333 100644
--- a/src/Lucene.Net.TestFramework/Index/BaseStoredFieldsFormatTestCase.cs
+++ b/src/Lucene.Net.TestFramework/Index/BaseStoredFieldsFormatTestCase.cs
@@ -10,6 +10,7 @@ using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
 using System.Text;
+using Console = Lucene.Net.Support.SystemConsole;
 
 namespace Lucene.Net.Index
 {

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/81e464dd/src/Lucene.Net.TestFramework/Index/RandomCodec.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Index/RandomCodec.cs b/src/Lucene.Net.TestFramework/Index/RandomCodec.cs
index d223733..fbefa83 100644
--- a/src/Lucene.Net.TestFramework/Index/RandomCodec.cs
+++ b/src/Lucene.Net.TestFramework/Index/RandomCodec.cs
@@ -5,6 +5,7 @@ using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Diagnostics;
+using Console = Lucene.Net.Support.SystemConsole;
 
 namespace Lucene.Net.Index
 {

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/81e464dd/src/Lucene.Net.TestFramework/Index/RandomIndexWriter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Index/RandomIndexWriter.cs b/src/Lucene.Net.TestFramework/Index/RandomIndexWriter.cs
index 2eb3aa7..3a0c0ea 100644
--- a/src/Lucene.Net.TestFramework/Index/RandomIndexWriter.cs
+++ b/src/Lucene.Net.TestFramework/Index/RandomIndexWriter.cs
@@ -1,9 +1,9 @@
 using Lucene.Net.Randomized.Generators;
+using Lucene.Net.Util;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
-using System.Threading;
-using Lucene.Net.Util;
+using Console = Lucene.Net.Support.SystemConsole;
 
 namespace Lucene.Net.Index
 {

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/81e464dd/src/Lucene.Net.TestFramework/Index/ThreadedIndexingAndSearchingTestCase.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Index/ThreadedIndexingAndSearchingTestCase.cs b/src/Lucene.Net.TestFramework/Index/ThreadedIndexingAndSearchingTestCase.cs
index 31b91a1..6261d39 100644
--- a/src/Lucene.Net.TestFramework/Index/ThreadedIndexingAndSearchingTestCase.cs
+++ b/src/Lucene.Net.TestFramework/Index/ThreadedIndexingAndSearchingTestCase.cs
@@ -13,6 +13,7 @@ using System.IO;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using Console = Lucene.Net.Support.SystemConsole;
 
 namespace Lucene.Net.Index
 {

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/81e464dd/src/Lucene.Net.TestFramework/JavaCompatibility/SystemTypesHelpers.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/JavaCompatibility/SystemTypesHelpers.cs b/src/Lucene.Net.TestFramework/JavaCompatibility/SystemTypesHelpers.cs
index c0f2462..62f50d9 100644
--- a/src/Lucene.Net.TestFramework/JavaCompatibility/SystemTypesHelpers.cs
+++ b/src/Lucene.Net.TestFramework/JavaCompatibility/SystemTypesHelpers.cs
@@ -28,6 +28,7 @@ using System.Linq;
 using System.Reflection;
 using System.Text;
 using System.Text.RegularExpressions;
+using Console = Lucene.Net.Support.SystemConsole;
 
 namespace Lucene.Net
 {

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/81e464dd/src/Lucene.Net.TestFramework/Search/ShardSearchingTestBase.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Search/ShardSearchingTestBase.cs b/src/Lucene.Net.TestFramework/Search/ShardSearchingTestBase.cs
index e70ec1a..7f0d19f 100644
--- a/src/Lucene.Net.TestFramework/Search/ShardSearchingTestBase.cs
+++ b/src/Lucene.Net.TestFramework/Search/ShardSearchingTestBase.cs
@@ -4,6 +4,7 @@ using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Diagnostics;
+using Console = Lucene.Net.Support.SystemConsole;
 
 namespace Lucene.Net.Search
 {

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/81e464dd/src/Lucene.Net.TestFramework/Store/MockDirectoryWrapper.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Store/MockDirectoryWrapper.cs b/src/Lucene.Net.TestFramework/Store/MockDirectoryWrapper.cs
index 4da955c..1994084 100644
--- a/src/Lucene.Net.TestFramework/Store/MockDirectoryWrapper.cs
+++ b/src/Lucene.Net.TestFramework/Store/MockDirectoryWrapper.cs
@@ -9,6 +9,7 @@ using System.IO;
 using System.Linq;
 using System.Runtime.CompilerServices;
 using System.Threading;
+using Console = Lucene.Net.Support.SystemConsole;
 
 namespace Lucene.Net.Store
 {

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/81e464dd/src/Lucene.Net.TestFramework/Store/MockIndexOutputWrapper.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Store/MockIndexOutputWrapper.cs b/src/Lucene.Net.TestFramework/Store/MockIndexOutputWrapper.cs
index 610095a..1f6077d 100644
--- a/src/Lucene.Net.TestFramework/Store/MockIndexOutputWrapper.cs
+++ b/src/Lucene.Net.TestFramework/Store/MockIndexOutputWrapper.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Threading;
+using Console = Lucene.Net.Support.SystemConsole;
 
 namespace Lucene.Net.Store
 {

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/81e464dd/src/Lucene.Net.TestFramework/Support/ApiScanTestBase.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Support/ApiScanTestBase.cs b/src/Lucene.Net.TestFramework/Support/ApiScanTestBase.cs
index deeae5e..a6860d0 100644
--- a/src/Lucene.Net.TestFramework/Support/ApiScanTestBase.cs
+++ b/src/Lucene.Net.TestFramework/Support/ApiScanTestBase.cs
@@ -28,6 +28,7 @@ using System.Linq;
 using System.Reflection;
 using System.Text;
 using System.Text.RegularExpressions;
+using Console = Lucene.Net.Support.SystemConsole;
 
 namespace Lucene.Net.Support
 {


Mime
View raw message