lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mikemcc...@apache.org
Subject svn commit: r1572063 [14/22] - in /lucene/dev/branches/lucene5376: ./ dev-tools/ dev-tools/idea/.idea/ dev-tools/idea/lucene/sandbox/ dev-tools/idea/solr/contrib/morphlines-core/ dev-tools/maven/lucene/ dev-tools/maven/lucene/core/src/java/ dev-tools/m...
Date Wed, 26 Feb 2014 14:44:12 GMT
Modified: lucene/dev/branches/lucene5376/lucene/test-framework/src/java/org/apache/lucene/index/BaseDocValuesFormatTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376/lucene/test-framework/src/java/org/apache/lucene/index/BaseDocValuesFormatTestCase.java?rev=1572063&r1=1572062&r2=1572063&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376/lucene/test-framework/src/java/org/apache/lucene/index/BaseDocValuesFormatTestCase.java (original)
+++ lucene/dev/branches/lucene5376/lucene/test-framework/src/java/org/apache/lucene/index/BaseDocValuesFormatTestCase.java Wed Feb 26 14:43:56 2014
@@ -56,7 +56,7 @@ import org.apache.lucene.util.Bits;
 import org.apache.lucene.util.BytesRef;
 import org.apache.lucene.util.BytesRefHash;
 import org.apache.lucene.util.LuceneTestCase;
-import org.apache.lucene.util._TestUtil;
+import org.apache.lucene.util.TestUtil;
 
 import static org.apache.lucene.index.SortedSetDocValues.NO_MORE_ORDS;
 
@@ -1139,11 +1139,11 @@ public abstract class BaseDocValuesForma
     int numDocs = atLeast(100);
     BytesRefHash hash = new BytesRefHash();
     Map<String, String> docToString = new HashMap<String, String>();
-    int maxLength = _TestUtil.nextInt(random(), 1, 50);
+    int maxLength = TestUtil.nextInt(random(), 1, 50);
     for (int i = 0; i < numDocs; i++) {
       Document doc = new Document();
       doc.add(newTextField("id", "" + i, Field.Store.YES));
-      String string = _TestUtil.randomRealisticUnicodeString(random(), 1, maxLength);
+      String string = TestUtil.randomRealisticUnicodeString(random(), 1, maxLength);
       BytesRef br = new BytesRef(string);
       doc.add(new SortedDocValuesField("field", br));
       hash.add(br);
@@ -1175,7 +1175,7 @@ public abstract class BaseDocValuesForma
       Document doc = new Document();
       String id = "" + i + numDocs;
       doc.add(newTextField("id", id, Field.Store.YES));
-      String string = _TestUtil.randomRealisticUnicodeString(random(), 1, maxLength);
+      String string = TestUtil.randomRealisticUnicodeString(random(), 1, maxLength);
       BytesRef br = new BytesRef(string);
       hash.add(br);
       docToString.put(id, string);
@@ -1221,7 +1221,7 @@ public abstract class BaseDocValuesForma
     doTestNumericsVsStoredFields(new LongProducer() {
       @Override
       long next() {
-        return _TestUtil.nextLong(random(), minValue, maxValue);
+        return TestUtil.nextLong(random(), minValue, maxValue);
       }
     });
   }
@@ -1285,7 +1285,7 @@ public abstract class BaseDocValuesForma
     doTestMissingVsFieldCache(new LongProducer() {
       @Override
       long next() {
-        return _TestUtil.nextLong(random(), minValue, maxValue);
+        return TestUtil.nextLong(random(), minValue, maxValue);
       }
     });
   }
@@ -1431,7 +1431,7 @@ public abstract class BaseDocValuesForma
       if (minLength == maxLength) {
         length = minLength; // fixed length
       } else {
-        length = _TestUtil.nextInt(random(), minLength, maxLength);
+        length = TestUtil.nextInt(random(), minLength, maxLength);
       }
       byte buffer[] = new byte[length];
       random().nextBytes(buffer);
@@ -1470,7 +1470,7 @@ public abstract class BaseDocValuesForma
   public void testBinaryFixedLengthVsStoredFields() throws Exception {
     int numIterations = atLeast(1);
     for (int i = 0; i < numIterations; i++) {
-      int fixedLength = _TestUtil.nextInt(random(), 0, 10);
+      int fixedLength = TestUtil.nextInt(random(), 0, 10);
       doTestBinaryVsStoredFields(fixedLength, fixedLength);
     }
   }
@@ -1502,7 +1502,7 @@ public abstract class BaseDocValuesForma
       if (minLength == maxLength) {
         length = minLength; // fixed length
       } else {
-        length = _TestUtil.nextInt(random(), minLength, maxLength);
+        length = TestUtil.nextInt(random(), minLength, maxLength);
       }
       byte buffer[] = new byte[length];
       random().nextBytes(buffer);
@@ -1558,9 +1558,9 @@ public abstract class BaseDocValuesForma
       if (minLength == maxLength) {
         length = minLength; // fixed length
       } else {
-        length = _TestUtil.nextInt(random(), minLength, maxLength);
+        length = TestUtil.nextInt(random(), minLength, maxLength);
       }
-      String value = _TestUtil.randomSimpleString(random(), length);
+      String value = TestUtil.randomSimpleString(random(), length);
       indexedField.setStringValue(value);
       dvField.setBytesValue(new BytesRef(value));
       writer.addDocument(doc);
@@ -1592,7 +1592,7 @@ public abstract class BaseDocValuesForma
   public void testSortedFixedLengthVsStoredFields() throws Exception {
     int numIterations = atLeast(1);
     for (int i = 0; i < numIterations; i++) {
-      int fixedLength = _TestUtil.nextInt(random(), 1, 10);
+      int fixedLength = TestUtil.nextInt(random(), 1, 10);
       doTestSortedVsStoredFields(fixedLength, fixedLength);
     }
   }
@@ -1600,7 +1600,7 @@ public abstract class BaseDocValuesForma
   public void testSortedFixedLengthVsFieldCache() throws Exception {
     int numIterations = atLeast(1);
     for (int i = 0; i < numIterations; i++) {
-      int fixedLength = _TestUtil.nextInt(random(), 1, 10);
+      int fixedLength = TestUtil.nextInt(random(), 1, 10);
       doTestSortedVsFieldCache(fixedLength, fixedLength);
     }
   }
@@ -2082,13 +2082,13 @@ public abstract class BaseDocValuesForma
       if (minLength == maxLength) {
         length = minLength; // fixed length
       } else {
-        length = _TestUtil.nextInt(random(), minLength, maxLength);
+        length = TestUtil.nextInt(random(), minLength, maxLength);
       }
-      int numValues = _TestUtil.nextInt(random(), 0, maxValuesPerDoc);
+      int numValues = TestUtil.nextInt(random(), 0, maxValuesPerDoc);
       // create a random set of strings
       Set<String> values = new TreeSet<String>();
       for (int v = 0; v < numValues; v++) {
-        values.add(_TestUtil.randomSimpleString(random(), length));
+        values.add(TestUtil.randomSimpleString(random(), length));
       }
       
       // add ordered to the stored field
@@ -2146,7 +2146,7 @@ public abstract class BaseDocValuesForma
     assumeTrue("Codec does not support SORTED_SET", defaultCodecSupportsSortedSet());
     int numIterations = atLeast(1);
     for (int i = 0; i < numIterations; i++) {
-      int fixedLength = _TestUtil.nextInt(random(), 1, 10);
+      int fixedLength = TestUtil.nextInt(random(), 1, 10);
       doTestSortedSetVsStoredFields(fixedLength, fixedLength, 16);
     }
   }
@@ -2163,7 +2163,7 @@ public abstract class BaseDocValuesForma
     assumeTrue("Codec does not support SORTED_SET", defaultCodecSupportsSortedSet());
     int numIterations = atLeast(1);
     for (int i = 0; i < numIterations; i++) {
-      int fixedLength = _TestUtil.nextInt(random(), 1, 10);
+      int fixedLength = TestUtil.nextInt(random(), 1, 10);
       doTestSortedSetVsStoredFields(fixedLength, fixedLength, 1);
     }
   }
@@ -2256,7 +2256,7 @@ public abstract class BaseDocValuesForma
     
     // random seekExact(ord)
     for (long i = 0; i < numOrds; i++) {
-      long randomOrd = _TestUtil.nextLong(random(), 0, numOrds-1);
+      long randomOrd = TestUtil.nextLong(random(), 0, numOrds - 1);
       expected.seekExact(randomOrd);
       actual.seekExact(randomOrd);
       assertEquals(expected.ord(), actual.ord());
@@ -2265,7 +2265,7 @@ public abstract class BaseDocValuesForma
     
     // random seekExact(BytesRef)
     for (long i = 0; i < numOrds; i++) {
-      long randomOrd = _TestUtil.nextLong(random(), 0, numOrds-1);
+      long randomOrd = TestUtil.nextLong(random(), 0, numOrds - 1);
       expected.seekExact(randomOrd);
       actual.seekExact(expected.term());
       assertEquals(expected.ord(), actual.ord());
@@ -2274,7 +2274,7 @@ public abstract class BaseDocValuesForma
     
     // random seekCeil(BytesRef)
     for (long i = 0; i < numOrds; i++) {
-      BytesRef target = new BytesRef(_TestUtil.randomUnicodeString(random()));
+      BytesRef target = new BytesRef(TestUtil.randomUnicodeString(random()));
       SeekStatus expectedStatus = expected.seekCeil(target);
       assertEquals(expectedStatus, actual.seekCeil(target));
       if (expectedStatus != SeekStatus.END) {
@@ -2299,13 +2299,13 @@ public abstract class BaseDocValuesForma
       if (minLength == maxLength) {
         length = minLength; // fixed length
       } else {
-        length = _TestUtil.nextInt(random(), minLength, maxLength);
+        length = TestUtil.nextInt(random(), minLength, maxLength);
       }
       int numValues = random().nextInt(17);
       // create a random list of strings
       List<String> values = new ArrayList<String>();
       for (int v = 0; v < numValues; v++) {
-        values.add(_TestUtil.randomSimpleString(random(), length));
+        values.add(TestUtil.randomSimpleString(random(), length));
       }
       
       // add in any order to the indexed field
@@ -2363,7 +2363,7 @@ public abstract class BaseDocValuesForma
     assumeTrue("Codec does not support SORTED_SET", defaultCodecSupportsSortedSet());
     int numIterations = atLeast(1);
     for (int i = 0; i < numIterations; i++) {
-      int fixedLength = _TestUtil.nextInt(random(), 1, 10);
+      int fixedLength = TestUtil.nextInt(random(), 1, 10);
       doTestSortedSetVsUninvertedField(fixedLength, fixedLength);
     }
   }
@@ -2615,17 +2615,17 @@ public abstract class BaseDocValuesForma
     Analyzer analyzer = new MockAnalyzer(random());
     // FSDirectory because SimpleText will consume gobbs of
     // space when storing big binary values:
-    Directory d = newFSDirectory(_TestUtil.getTempDir("hugeBinaryValues"));
+    Directory d = newFSDirectory(TestUtil.getTempDir("hugeBinaryValues"));
     boolean doFixed = random().nextBoolean();
     int numDocs;
     int fixedLength = 0;
     if (doFixed) {
       // Sometimes make all values fixed length since some
       // codecs have different code paths for this:
-      numDocs = _TestUtil.nextInt(random(), 10, 20);
-      fixedLength = _TestUtil.nextInt(random(), 65537, 256*1024);
+      numDocs = TestUtil.nextInt(random(), 10, 20);
+      fixedLength = TestUtil.nextInt(random(), 65537, 256 * 1024);
     } else {
-      numDocs = _TestUtil.nextInt(random(), 100, 200);
+      numDocs = TestUtil.nextInt(random(), 100, 200);
     }
     IndexWriter w = new IndexWriter(d, newIndexWriterConfig(TEST_VERSION_CURRENT, analyzer));
     List<byte[]> docBytes = new ArrayList<byte[]>();
@@ -2640,9 +2640,9 @@ public abstract class BaseDocValuesForma
       if (doFixed) {
         numBytes = fixedLength;
       } else if (docID == 0 || random().nextInt(5) == 3) {
-        numBytes = _TestUtil.nextInt(random(), 65537, 3*1024*1024);
+        numBytes = TestUtil.nextInt(random(), 65537, 3 * 1024 * 1024);
       } else {
-        numBytes = _TestUtil.nextInt(random(), 1, 1024*1024);
+        numBytes = TestUtil.nextInt(random(), 1, 1024 * 1024);
       }
       totalBytes += numBytes;
       if (totalBytes > 5 * 1024*1024) {
@@ -2713,17 +2713,17 @@ public abstract class BaseDocValuesForma
     Analyzer analyzer = new MockAnalyzer(random());
     // FSDirectory because SimpleText will consume gobbs of
     // space when storing big binary values:
-    Directory d = newFSDirectory(_TestUtil.getTempDir("hugeBinaryValues"));
+    Directory d = newFSDirectory(TestUtil.getTempDir("hugeBinaryValues"));
     boolean doFixed = random().nextBoolean();
     int numDocs;
     int fixedLength = 0;
     if (doFixed) {
       // Sometimes make all values fixed length since some
       // codecs have different code paths for this:
-      numDocs = _TestUtil.nextInt(random(), 10, 20);
+      numDocs = TestUtil.nextInt(random(), 10, 20);
       fixedLength = Lucene42DocValuesFormat.MAX_BINARY_FIELD_LENGTH;
     } else {
-      numDocs = _TestUtil.nextInt(random(), 100, 200);
+      numDocs = TestUtil.nextInt(random(), 100, 200);
     }
     IndexWriter w = new IndexWriter(d, newIndexWriterConfig(TEST_VERSION_CURRENT, analyzer));
     List<byte[]> docBytes = new ArrayList<byte[]>();
@@ -2740,7 +2740,7 @@ public abstract class BaseDocValuesForma
       } else if (docID == 0 || random().nextInt(5) == 3) {
         numBytes = Lucene42DocValuesFormat.MAX_BINARY_FIELD_LENGTH;
       } else {
-        numBytes = _TestUtil.nextInt(random(), 1, Lucene42DocValuesFormat.MAX_BINARY_FIELD_LENGTH);
+        numBytes = TestUtil.nextInt(random(), 1, Lucene42DocValuesFormat.MAX_BINARY_FIELD_LENGTH);
       }
       totalBytes += numBytes;
       if (totalBytes > 5 * 1024*1024) {
@@ -2799,7 +2799,7 @@ public abstract class BaseDocValuesForma
     int numDocs = atLeast(300);
     for (int i = 0; i < numDocs; i++) {
       idField.setStringValue(Integer.toString(i));
-      int length = _TestUtil.nextInt(random(), 0, 8);
+      int length = TestUtil.nextInt(random(), 0, 8);
       byte buffer[] = new byte[length];
       random().nextBytes(buffer);
       storedBinField.setBytesValue(buffer);
@@ -2824,7 +2824,7 @@ public abstract class BaseDocValuesForma
     
     // compare
     final DirectoryReader ir = DirectoryReader.open(dir);
-    int numThreads = _TestUtil.nextInt(random(), 2, 7);
+    int numThreads = TestUtil.nextInt(random(), 2, 7);
     Thread threads[] = new Thread[numThreads];
     final CountDownLatch startingGun = new CountDownLatch(1);
     
@@ -2850,7 +2850,7 @@ public abstract class BaseDocValuesForma
                 assertEquals(Long.parseLong(expected), numerics.get(j));
               }
             }
-            _TestUtil.checkReader(ir);
+            TestUtil.checkReader(ir);
           } catch (Exception e) {
             throw new RuntimeException(e);
           }
@@ -2884,7 +2884,7 @@ public abstract class BaseDocValuesForma
     int numDocs = atLeast(300);
     for (int i = 0; i < numDocs; i++) {
       idField.setStringValue(Integer.toString(i));
-      int length = _TestUtil.nextInt(random(), 0, 8);
+      int length = TestUtil.nextInt(random(), 0, 8);
       byte buffer[] = new byte[length];
       random().nextBytes(buffer);
       storedBinField.setBytesValue(buffer);
@@ -2907,7 +2907,7 @@ public abstract class BaseDocValuesForma
       int numSortedSetFields = random().nextInt(3);
       Set<String> values = new TreeSet<String>();
       for (int j = 0; j < numSortedSetFields; j++) {
-        values.add(_TestUtil.randomSimpleString(random()));
+        values.add(TestUtil.randomSimpleString(random()));
       }
       for (String v : values) {
         doc.add(new SortedSetDocValuesField("dvSortedSet", new BytesRef(v)));
@@ -2929,7 +2929,7 @@ public abstract class BaseDocValuesForma
     
     // compare
     final DirectoryReader ir = DirectoryReader.open(dir);
-    int numThreads = _TestUtil.nextInt(random(), 2, 7);
+    int numThreads = TestUtil.nextInt(random(), 2, 7);
     Thread threads[] = new Thread[numThreads];
     final CountDownLatch startingGun = new CountDownLatch(1);
     
@@ -2997,7 +2997,7 @@ public abstract class BaseDocValuesForma
                 }
               }
             }
-            _TestUtil.checkReader(ir);
+            TestUtil.checkReader(ir);
           } catch (Exception e) {
             throw new RuntimeException(e);
           }

Modified: lucene/dev/branches/lucene5376/lucene/test-framework/src/java/org/apache/lucene/index/BasePostingsFormatTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376/lucene/test-framework/src/java/org/apache/lucene/index/BasePostingsFormatTestCase.java?rev=1572063&r1=1572062&r2=1572063&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376/lucene/test-framework/src/java/org/apache/lucene/index/BasePostingsFormatTestCase.java (original)
+++ lucene/dev/branches/lucene5376/lucene/test-framework/src/java/org/apache/lucene/index/BasePostingsFormatTestCase.java Wed Feb 26 14:43:56 2014
@@ -23,7 +23,6 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.EnumSet;
-import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
@@ -57,7 +56,7 @@ import org.apache.lucene.util.FixedBitSe
 import org.apache.lucene.util.LineFileDocs;
 import org.apache.lucene.util.LuceneTestCase;
 import org.apache.lucene.util.RamUsageEstimator;
-import org.apache.lucene.util._TestUtil;
+import org.apache.lucene.util.TestUtil;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 
@@ -149,12 +148,12 @@ public abstract class BasePostingsFormat
     public SeedPostings(long seed, int minDocFreq, int maxDocFreq, Bits liveDocs, IndexOptions options, boolean allowPayloads) {
       random = new Random(seed);
       docRandom = new Random(random.nextLong());
-      docFreq = _TestUtil.nextInt(random, minDocFreq, maxDocFreq);
+      docFreq = TestUtil.nextInt(random, minDocFreq, maxDocFreq);
       this.liveDocs = liveDocs;
       this.allowPayloads = allowPayloads;
 
       // TODO: more realistic to inversely tie this to numDocs:
-      maxDocSpacing = _TestUtil.nextInt(random, 1, 100);
+      maxDocSpacing = TestUtil.nextInt(random, 1, 100);
 
       if (random.nextInt(10) == 7) {
         // 10% of the time create big payloads:
@@ -193,21 +192,21 @@ public abstract class BasePostingsFormat
           docID++;
         } else {
           // TODO: sometimes have a biggish gap here!
-          docID += _TestUtil.nextInt(docRandom, 1, maxDocSpacing);
+          docID += TestUtil.nextInt(docRandom, 1, maxDocSpacing);
         }
 
         if (random.nextInt(200) == 17) {
-          freq = _TestUtil.nextInt(random, 1, 1000);
+          freq = TestUtil.nextInt(random, 1, 1000);
         } else if (random.nextInt(10) == 17) {
-          freq = _TestUtil.nextInt(random, 1, 20);
+          freq = TestUtil.nextInt(random, 1, 20);
         } else {
-          freq = _TestUtil.nextInt(random, 1, 4);
+          freq = TestUtil.nextInt(random, 1, 4);
         }
 
         pos = 0;
         offset = 0;
         posUpto = 0;
-        posSpacing = _TestUtil.nextInt(random, 1, 100);
+        posSpacing = TestUtil.nextInt(random, 1, 100);
 
         upto++;
         return docID;
@@ -239,7 +238,7 @@ public abstract class BasePostingsFormat
       } else if (posSpacing == 1) {
         pos++;
       } else {
-        pos += _TestUtil.nextInt(random, 1, posSpacing);
+        pos += TestUtil.nextInt(random, 1, posSpacing);
       }
 
       if (payloadSize != 0) {
@@ -344,7 +343,7 @@ public abstract class BasePostingsFormat
     totalPayloadBytes = 0;
     fields = new TreeMap<String,SortedMap<BytesRef,Long>>();
 
-    final int numFields = _TestUtil.nextInt(random(), 1, 5);
+    final int numFields = TestUtil.nextInt(random(), 1, 5);
     if (VERBOSE) {
       System.out.println("TEST: " + numFields + " fields");
     }
@@ -353,7 +352,7 @@ public abstract class BasePostingsFormat
     FieldInfo[] fieldInfoArray = new FieldInfo[numFields];
     int fieldUpto = 0;
     while (fieldUpto < numFields) {
-      String field = _TestUtil.randomSimpleString(random());
+      String field = TestUtil.randomSimpleString(random());
       if (fields.containsKey(field)) {
         continue;
       }
@@ -371,11 +370,11 @@ public abstract class BasePostingsFormat
       if (random().nextInt(10) == 7) {
         numTerms = atLeast(50);
       } else {
-        numTerms = _TestUtil.nextInt(random(), 2, 20);
+        numTerms = TestUtil.nextInt(random(), 2, 20);
       }
 
       for(int termUpto=0;termUpto<numTerms;termUpto++) {
-        String term = _TestUtil.randomSimpleString(random());
+        String term = TestUtil.randomSimpleString(random());
         if (seenTerms.contains(term)) {
           continue;
         }
@@ -669,7 +668,7 @@ public abstract class BasePostingsFormat
     for(int fieldUpto=0;fieldUpto<fields.size();fieldUpto++) {
       FieldInfo oldFieldInfo = fieldInfos.fieldInfo(fieldUpto);
 
-      String pf = _TestUtil.getPostingsFormat(codec, oldFieldInfo.name);
+      String pf = TestUtil.getPostingsFormat(codec, oldFieldInfo.name);
       int fieldMaxIndexOption;
       if (doesntSupportOffsets.contains(pf)) {
         fieldMaxIndexOption = Math.min(maxIndexOptionNoOffsets, maxIndexOption);
@@ -878,7 +877,7 @@ public abstract class BasePostingsFormat
     }
 
     double skipChance = alwaysTestMax ? 0.5 : random().nextDouble();
-    int numSkips = expected.docFreq < 3 ? 1 : _TestUtil.nextInt(random(), 1, Math.min(20, expected.docFreq/3));
+    int numSkips = expected.docFreq < 3 ? 1 : TestUtil.nextInt(random(), 1, Math.min(20, expected.docFreq / 3));
     int skipInc = expected.docFreq/numSkips;
     int skipDocInc = maxDoc/numSkips;
 
@@ -921,7 +920,7 @@ public abstract class BasePostingsFormat
         int targetDocID = -1;
         if (expected.upto < stopAt && random().nextBoolean()) {
           // Pick target we know exists:
-          final int skipCount = _TestUtil.nextInt(random(), 1, skipInc);
+          final int skipCount = TestUtil.nextInt(random(), 1, skipInc);
           for(int skip=0;skip<skipCount;skip++) {
             if (expected.nextDoc() == DocsEnum.NO_MORE_DOCS) {
               break;
@@ -929,7 +928,7 @@ public abstract class BasePostingsFormat
           }
         } else {
           // Pick random target (might not exist):
-          final int skipDocIDs = _TestUtil.nextInt(random(), 1, skipDocInc);
+          final int skipDocIDs = TestUtil.nextInt(random(), 1, skipDocInc);
           if (skipDocIDs > 0) {
             targetDocID = expected.docID() + skipDocIDs;
             expected.advance(targetDocID);
@@ -1083,7 +1082,7 @@ public abstract class BasePostingsFormat
                          final boolean alwaysTestMax) throws Exception {
 
     if (options.contains(Option.THREADS)) {
-      int numThreads = _TestUtil.nextInt(random(), 2, 5);
+      int numThreads = TestUtil.nextInt(random(), 2, 5);
       Thread[] threads = new Thread[numThreads];
       for(int threadUpto=0;threadUpto<numThreads;threadUpto++) {
         threads[threadUpto] = new TestThread(this, fieldsSource, options, maxTestOptions, maxIndexOptions, alwaysTestMax);
@@ -1212,7 +1211,7 @@ public abstract class BasePostingsFormat
   /** Indexes all fields/terms at the specified
    *  IndexOptions, and fully tests at that IndexOptions. */
   private void testFull(IndexOptions options, boolean withPayloads) throws Exception {
-    File path = _TestUtil.getTempDir("testPostingsFormat.testExact");
+    File path = TestUtil.getTempDir("testPostingsFormat.testExact");
     Directory dir = newFSDirectory(path);
 
     // TODO test thread safety of buildIndex too
@@ -1233,7 +1232,7 @@ public abstract class BasePostingsFormat
 
     fieldsProducer.close();
     dir.close();
-    _TestUtil.rmDir(path);
+    TestUtil.rmDir(path);
   }
 
   public void testDocsOnly() throws Exception {
@@ -1265,7 +1264,7 @@ public abstract class BasePostingsFormat
     int iters = 5;
 
     for(int iter=0;iter<iters;iter++) {
-      File path = _TestUtil.getTempDir("testPostingsFormat");
+      File path = TestUtil.getTempDir("testPostingsFormat");
       Directory dir = newFSDirectory(path);
 
       boolean indexPayloads = random().nextBoolean();
@@ -1282,7 +1281,7 @@ public abstract class BasePostingsFormat
       fieldsProducer = null;
 
       dir.close();
-      _TestUtil.rmDir(path);
+      TestUtil.rmDir(path);
     }
   }
   
@@ -1463,7 +1462,7 @@ public abstract class BasePostingsFormat
                         totalTermFreq += docs.freq();
                         if (docs instanceof DocsAndPositionsEnum) {
                           DocsAndPositionsEnum posEnum = (DocsAndPositionsEnum) docs;
-                          int limit = _TestUtil.nextInt(random(), 1, docs.freq());
+                          int limit = TestUtil.nextInt(random(), 1, docs.freq());
                           for(int i=0;i<limit;i++) {
                             posEnum.nextPosition();
                           }
@@ -1514,7 +1513,7 @@ public abstract class BasePostingsFormat
                           totalTermFreq += docs.freq();
                           if (docs instanceof DocsAndPositionsEnum) {
                             DocsAndPositionsEnum posEnum = (DocsAndPositionsEnum) docs;
-                            int limit = _TestUtil.nextInt(random(), 1, docs.freq());
+                            int limit = TestUtil.nextInt(random(), 1, docs.freq());
                             for(int i=0;i<limit;i++) {
                               posEnum.nextPosition();
                             }

Modified: lucene/dev/branches/lucene5376/lucene/test-framework/src/java/org/apache/lucene/index/BaseStoredFieldsFormatTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376/lucene/test-framework/src/java/org/apache/lucene/index/BaseStoredFieldsFormatTestCase.java?rev=1572063&r1=1572062&r2=1572063&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376/lucene/test-framework/src/java/org/apache/lucene/index/BaseStoredFieldsFormatTestCase.java (original)
+++ lucene/dev/branches/lucene5376/lucene/test-framework/src/java/org/apache/lucene/index/BaseStoredFieldsFormatTestCase.java Wed Feb 26 14:43:56 2014
@@ -57,7 +57,8 @@ import org.apache.lucene.store.MockDirec
 import org.apache.lucene.store.MockDirectoryWrapper.Throttling;
 import org.apache.lucene.util.BytesRef;
 import org.apache.lucene.util.LuceneTestCase;
-import org.apache.lucene.util._TestUtil;
+import org.apache.lucene.util.TestUtil;
+import org.apache.lucene.util.TestUtil;
 
 import com.carrotsearch.randomizedtesting.generators.RandomInts;
 import com.carrotsearch.randomizedtesting.generators.RandomPicks;
@@ -93,10 +94,10 @@ public abstract class BaseStoredFieldsFo
   public void testRandomStoredFields() throws IOException {
     Directory dir = newDirectory();
     Random rand = random();
-    RandomIndexWriter w = new RandomIndexWriter(rand, dir, newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random())).setMaxBufferedDocs(_TestUtil.nextInt(rand, 5, 20)));
+    RandomIndexWriter w = new RandomIndexWriter(rand, dir, newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random())).setMaxBufferedDocs(TestUtil.nextInt(rand, 5, 20)));
     //w.w.setNoCFSRatio(0.0);
     final int docCount = atLeast(200);
-    final int fieldCount = _TestUtil.nextInt(rand, 1, 5);
+    final int fieldCount = TestUtil.nextInt(rand, 1, 5);
 
     final List<Integer> fieldIDs = new ArrayList<Integer>();
 
@@ -129,7 +130,7 @@ public abstract class BaseStoredFieldsFo
       for(int field: fieldIDs) {
         final String s;
         if (rand.nextInt(4) != 3) {
-          s = _TestUtil.randomUnicodeString(rand, 1000);
+          s = TestUtil.randomUnicodeString(rand, 1000);
           doc.add(newField("f"+field, s, customType2));
         } else {
           s = null;
@@ -349,7 +350,7 @@ public abstract class BaseStoredFieldsFo
     ft.setStored(true);
     ft.freeze();
 
-    final String string = _TestUtil.randomSimpleString(random(), 50);
+    final String string = TestUtil.randomSimpleString(random(), 50);
     final byte[] bytes = string.getBytes("UTF-8");
     final long l = random().nextBoolean() ? random().nextInt(42) : random().nextLong();
     final int i = random().nextBoolean() ? random().nextInt(42) : random().nextInt();
@@ -597,7 +598,7 @@ public abstract class BaseStoredFieldsFo
     // for this test we force a FS dir
     // we can't just use newFSDirectory, because this test doesn't really index anything.
     // so if we get NRTCachingDir+SimpleText, we make massive stored fields and OOM (LUCENE-4484)
-    Directory dir = new MockDirectoryWrapper(random(), new MMapDirectory(_TestUtil.getTempDir("testBigDocuments")));
+    Directory dir = new MockDirectoryWrapper(random(), new MMapDirectory(TestUtil.getTempDir("testBigDocuments")));
     IndexWriterConfig iwConf = newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random()));
     iwConf.setMaxBufferedDocs(RandomInts.randomIntBetween(random(), 2, 30));
     RandomIndexWriter iw = new RandomIndexWriter(random(), dir, iwConf);

Modified: lucene/dev/branches/lucene5376/lucene/test-framework/src/java/org/apache/lucene/index/BaseTermVectorsFormatTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376/lucene/test-framework/src/java/org/apache/lucene/index/BaseTermVectorsFormatTestCase.java?rev=1572063&r1=1572062&r2=1572063&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376/lucene/test-framework/src/java/org/apache/lucene/index/BaseTermVectorsFormatTestCase.java (original)
+++ lucene/dev/branches/lucene5376/lucene/test-framework/src/java/org/apache/lucene/index/BaseTermVectorsFormatTestCase.java Wed Feb 26 14:43:56 2014
@@ -48,7 +48,7 @@ import org.apache.lucene.util.AttributeI
 import org.apache.lucene.util.BytesRef;
 import org.apache.lucene.util.FixedBitSet;
 import org.apache.lucene.util.LuceneTestCase;
-import org.apache.lucene.util._TestUtil;
+import org.apache.lucene.util.TestUtil;
 
 import com.carrotsearch.randomizedtesting.generators.RandomPicks;
 
@@ -216,17 +216,17 @@ public abstract class BaseTermVectorsFor
         final int o = random().nextInt(sampleTerms.length);
         terms[i] = sampleTerms[o];
         termBytes[i] = sampleTermBytes[o];
-        positionsIncrements[i] = _TestUtil.nextInt(random(), i == 0 ? 1 : 0, 10);
+        positionsIncrements[i] = TestUtil.nextInt(random(), i == 0 ? 1 : 0, 10);
         if (offsetsGoBackwards) {
           startOffsets[i] = random().nextInt();
           endOffsets[i] = random().nextInt();
         } else {
           if (i == 0) {
-            startOffsets[i] = _TestUtil.nextInt(random(), 0, 1 << 16);
+            startOffsets[i] = TestUtil.nextInt(random(), 0, 1 << 16);
           } else {
-            startOffsets[i] = startOffsets[i-1] + _TestUtil.nextInt(random(), 0, rarely() ? 1 << 16 : 20);
+            startOffsets[i] = startOffsets[i-1] + TestUtil.nextInt(random(), 0, rarely() ? 1 << 16 : 20);
           }
-          endOffsets[i] = startOffsets[i] + _TestUtil.nextInt(random(), 0, rarely() ? 1 << 10 : 20);
+          endOffsets[i] = startOffsets[i] + TestUtil.nextInt(random(), 0, rarely() ? 1 << 10 : 20);
         }
       }
 
@@ -320,7 +320,7 @@ public abstract class BaseTermVectorsFor
           this.fieldNames[i] = RandomPicks.randomFrom(random(), fieldNames);
         } while (usedFileNames.contains(this.fieldNames[i]));
         usedFileNames.add(this.fieldNames[i]);
-        tokenStreams[i] = new RandomTokenStream(_TestUtil.nextInt(random(), 1, maxTermCount), sampleTerms, sampleTermBytes);
+        tokenStreams[i] = new RandomTokenStream(TestUtil.nextInt(random(), 1, maxTermCount), sampleTerms, sampleTermBytes);
       }
     }
 
@@ -343,14 +343,14 @@ public abstract class BaseTermVectorsFor
     protected RandomDocumentFactory(int distinctFieldNames, int disctinctTerms) {
       final Set<String> fieldNames = new HashSet<String>();
       while (fieldNames.size() < distinctFieldNames) {
-        fieldNames.add(_TestUtil.randomSimpleString(random()));
+        fieldNames.add(TestUtil.randomSimpleString(random()));
         fieldNames.remove("id");
       }
       this.fieldNames = fieldNames.toArray(new String[0]);
       terms = new String[disctinctTerms];
       termBytes = new BytesRef[disctinctTerms];
       for (int i = 0; i < disctinctTerms; ++i) {
-        terms[i] = _TestUtil.randomRealisticUnicodeString(random());
+        terms[i] = TestUtil.randomRealisticUnicodeString(random());
         termBytes[i] = new BytesRef(terms[i]);
       }
     }
@@ -525,7 +525,7 @@ public abstract class BaseTermVectorsFor
       final Document emptyDoc = new Document();
       final Directory dir = newDirectory();
       final RandomIndexWriter writer = new RandomIndexWriter(random(), dir);
-      final RandomDocument doc = docFactory.newDocument(_TestUtil.nextInt(random(), 1, 3), 20, options);
+      final RandomDocument doc = docFactory.newDocument(TestUtil.nextInt(random(), 1, 3), 20, options);
       for (int i = 0; i < numDocs; ++i) {
         if (i == docWithVectors) {
           writer.addDocument(addId(doc.toDocument(), "42"));
@@ -560,7 +560,7 @@ public abstract class BaseTermVectorsFor
       }
       final Directory dir = newDirectory();
       final RandomIndexWriter writer = new RandomIndexWriter(random(), dir);
-      final RandomDocument doc = docFactory.newDocument(_TestUtil.nextInt(random(), 1, 2), atLeast(20000), options);
+      final RandomDocument doc = docFactory.newDocument(TestUtil.nextInt(random(), 1, 2), atLeast(20000), options);
       writer.addDocument(doc.toDocument());
       final IndexReader reader = writer.getReader();
       assertEquals(doc, reader.getTermVectors(0));
@@ -587,7 +587,7 @@ public abstract class BaseTermVectorsFor
 
   // different options for the same field
   public void testMixedOptions() throws IOException {
-    final int numFields = _TestUtil.nextInt(random(), 1, 3);
+    final int numFields = TestUtil.nextInt(random(), 1, 3);
     final RandomDocumentFactory docFactory = new RandomDocumentFactory(numFields, 10);
     for (Options options1 : validOptions()) {
       for (Options options2 : validOptions()) {
@@ -617,7 +617,7 @@ public abstract class BaseTermVectorsFor
     final int numDocs = atLeast(100);
     final RandomDocument[] docs = new RandomDocument[numDocs];
     for (int i = 0; i < numDocs; ++i) {
-      docs[i] = docFactory.newDocument(_TestUtil.nextInt(random(), 1, 3), _TestUtil.nextInt(random(), 10, 50), randomOptions());
+      docs[i] = docFactory.newDocument(TestUtil.nextInt(random(), 1, 3), TestUtil.nextInt(random(), 10, 50), randomOptions());
     }
     final Directory dir = newDirectory();
     final RandomIndexWriter writer = new RandomIndexWriter(random(), dir);
@@ -645,7 +645,7 @@ public abstract class BaseTermVectorsFor
     for (Options options : validOptions()) {
       final RandomDocument[] docs = new RandomDocument[numDocs];
       for (int i = 0; i < numDocs; ++i) {
-        docs[i] = docFactory.newDocument(_TestUtil.nextInt(random(), 1, 3), atLeast(10), options);
+        docs[i] = docFactory.newDocument(TestUtil.nextInt(random(), 1, 3), atLeast(10), options);
       }
       final Directory dir = newDirectory();
       final RandomIndexWriter writer = new RandomIndexWriter(random(), dir);
@@ -681,7 +681,7 @@ public abstract class BaseTermVectorsFor
     for (Options options : validOptions()) {
       final RandomDocument[] docs = new RandomDocument[numDocs];
       for (int i = 0; i < numDocs; ++i) {
-        docs[i] = docFactory.newDocument(_TestUtil.nextInt(random(), 1, 3), atLeast(10), options);
+        docs[i] = docFactory.newDocument(TestUtil.nextInt(random(), 1, 3), atLeast(10), options);
       }
       final Directory dir = newDirectory();
       final RandomIndexWriter writer = new RandomIndexWriter(random(), dir);

Modified: lucene/dev/branches/lucene5376/lucene/test-framework/src/java/org/apache/lucene/index/MockRandomMergePolicy.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376/lucene/test-framework/src/java/org/apache/lucene/index/MockRandomMergePolicy.java?rev=1572063&r1=1572062&r2=1572063&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376/lucene/test-framework/src/java/org/apache/lucene/index/MockRandomMergePolicy.java (original)
+++ lucene/dev/branches/lucene5376/lucene/test-framework/src/java/org/apache/lucene/index/MockRandomMergePolicy.java Wed Feb 26 14:43:56 2014
@@ -25,8 +25,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Random;
 
-import org.apache.lucene.index.MergePolicy.MergeTrigger;
-import org.apache.lucene.util._TestUtil;
+import org.apache.lucene.util.TestUtil;
 
 /**
  * MergePolicy that makes random decisions for testing.
@@ -64,7 +63,7 @@ public class MockRandomMergePolicy exten
 
       // TODO: sometimes make more than 1 merge?
       mergeSpec = new MergeSpecification();
-      final int segsToMerge = _TestUtil.nextInt(random, 1, numSegments);
+      final int segsToMerge = TestUtil.nextInt(random, 1, numSegments);
       mergeSpec.add(new OneMerge(segments.subList(0, segsToMerge)));
     }
 
@@ -93,7 +92,7 @@ public class MockRandomMergePolicy exten
       int upto = 0;
       while(upto < eligibleSegments.size()) {
         int max = Math.min(10, eligibleSegments.size()-upto);
-        int inc = max <= 2 ? max : _TestUtil.nextInt(random, 2, max);
+        int inc = max <= 2 ? max : TestUtil.nextInt(random, 2, max);
         mergeSpec.add(new OneMerge(eligibleSegments.subList(upto, upto+inc)));
         upto += inc;
       }

Modified: lucene/dev/branches/lucene5376/lucene/test-framework/src/java/org/apache/lucene/index/RandomCodec.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376/lucene/test-framework/src/java/org/apache/lucene/index/RandomCodec.java?rev=1572063&r1=1572062&r2=1572063&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376/lucene/test-framework/src/java/org/apache/lucene/index/RandomCodec.java (original)
+++ lucene/dev/branches/lucene5376/lucene/test-framework/src/java/org/apache/lucene/index/RandomCodec.java Wed Feb 26 14:43:56 2014
@@ -55,7 +55,7 @@ import org.apache.lucene.codecs.pulsing.
 import org.apache.lucene.codecs.simpletext.SimpleTextDocValuesFormat;
 import org.apache.lucene.codecs.simpletext.SimpleTextPostingsFormat;
 import org.apache.lucene.util.LuceneTestCase;
-import org.apache.lucene.util._TestUtil;
+import org.apache.lucene.util.TestUtil;
 
 /**
  * Codec that assigns per-field random postings formats.
@@ -123,9 +123,9 @@ public class RandomCodec extends Lucene4
     this.perFieldSeed = random.nextInt();
     // TODO: make it possible to specify min/max iterms per
     // block via CL:
-    int minItemsPerBlock = _TestUtil.nextInt(random, 2, 100);
+    int minItemsPerBlock = TestUtil.nextInt(random, 2, 100);
     int maxItemsPerBlock = 2*(Math.max(2, minItemsPerBlock-1)) + random.nextInt(100);
-    int lowFreqCutoff = _TestUtil.nextInt(random, 2, 100);
+    int lowFreqCutoff = TestUtil.nextInt(random, 2, 100);
 
     add(avoidCodecs,
         new Lucene41PostingsFormat(minItemsPerBlock, maxItemsPerBlock),
@@ -143,13 +143,13 @@ public class RandomCodec extends Lucene4
         //with such "wrapper" classes?
         new TestBloomFilteredLucene41Postings(),                
         new MockSepPostingsFormat(),
-        new MockFixedIntBlockPostingsFormat(_TestUtil.nextInt(random, 1, 2000)),
-        new MockVariableIntBlockPostingsFormat( _TestUtil.nextInt(random, 1, 127)),
+        new MockFixedIntBlockPostingsFormat(TestUtil.nextInt(random, 1, 2000)),
+        new MockVariableIntBlockPostingsFormat( TestUtil.nextInt(random, 1, 127)),
         new MockRandomPostingsFormat(random),
         new NestedPulsingPostingsFormat(),
-        new Lucene41WithOrds(_TestUtil.nextInt(random, 1, 1000)),
-        new Lucene41VarGapFixedInterval(_TestUtil.nextInt(random, 1, 1000)),
-        new Lucene41VarGapDocFreqInterval(_TestUtil.nextInt(random, 1, 100), _TestUtil.nextInt(random, 1, 1000)),
+        new Lucene41WithOrds(TestUtil.nextInt(random, 1, 1000)),
+        new Lucene41VarGapFixedInterval(TestUtil.nextInt(random, 1, 1000)),
+        new Lucene41VarGapDocFreqInterval(TestUtil.nextInt(random, 1, 100), TestUtil.nextInt(random, 1, 1000)),
         new SimpleTextPostingsFormat(),
         new AssertingPostingsFormat(),
         new MemoryPostingsFormat(true, random.nextFloat()),

Modified: lucene/dev/branches/lucene5376/lucene/test-framework/src/java/org/apache/lucene/index/RandomIndexWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376/lucene/test-framework/src/java/org/apache/lucene/index/RandomIndexWriter.java?rev=1572063&r1=1572062&r2=1572063&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376/lucene/test-framework/src/java/org/apache/lucene/index/RandomIndexWriter.java (original)
+++ lucene/dev/branches/lucene5376/lucene/test-framework/src/java/org/apache/lucene/index/RandomIndexWriter.java Wed Feb 26 14:43:56 2014
@@ -25,14 +25,13 @@ import java.util.Random;
 import org.apache.lucene.analysis.Analyzer;
 import org.apache.lucene.analysis.MockAnalyzer;
 import org.apache.lucene.codecs.Codec;
-import org.apache.lucene.index.IndexWriter; // javadoc
 import org.apache.lucene.search.Query;
 import org.apache.lucene.store.Directory;
 import org.apache.lucene.util.InfoStream;
 import org.apache.lucene.util.LuceneTestCase;
 import org.apache.lucene.util.NullInfoStream;
+import org.apache.lucene.util.TestUtil;
 import org.apache.lucene.util.Version;
-import org.apache.lucene.util._TestUtil;
 
 /** Silly class that randomizes the indexing experience.  EG
  *  it may swap in a different merge policy/scheduler; may
@@ -88,7 +87,7 @@ public class RandomIndexWriter implement
     // TODO: this should be solved in a different way; Random should not be shared (!).
     this.r = new Random(r.nextLong());
     w = mockIndexWriter(dir, c, r);
-    flushAt = _TestUtil.nextInt(r, 10, 1000);
+    flushAt = TestUtil.nextInt(r, 10, 1000);
     codec = w.getConfig().getCodec();
     if (LuceneTestCase.VERBOSE) {
       System.out.println("RIW dir=" + dir + " config=" + w.getConfig());
@@ -155,7 +154,7 @@ public class RandomIndexWriter implement
         System.out.println("RIW.add/updateDocument: now doing a commit at docCount=" + docCount);
       }
       w.commit();
-      flushAt += _TestUtil.nextInt(r, (int) (flushAtFactor * 10), (int) (flushAtFactor * 1000));
+      flushAt += TestUtil.nextInt(r, (int) (flushAtFactor * 10), (int) (flushAtFactor * 1000));
       if (flushAtFactor < 2e6) {
         // gradually but exponentially increase time b/w flushes
         flushAtFactor *= 1.05;
@@ -283,7 +282,7 @@ public class RandomIndexWriter implement
         w.forceMerge(1);
       } else {
         // partial forceMerge
-        final int limit = _TestUtil.nextInt(r, 1, segCount);
+        final int limit = TestUtil.nextInt(r, 1, segCount);
         if (LuceneTestCase.VERBOSE) {
           System.out.println("RIW: doRandomForceMerge(" + limit + ")");
         }

Modified: lucene/dev/branches/lucene5376/lucene/test-framework/src/java/org/apache/lucene/index/ThreadedIndexingAndSearchingTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376/lucene/test-framework/src/java/org/apache/lucene/index/ThreadedIndexingAndSearchingTestCase.java?rev=1572063&r1=1572062&r2=1572063&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376/lucene/test-framework/src/java/org/apache/lucene/index/ThreadedIndexingAndSearchingTestCase.java (original)
+++ lucene/dev/branches/lucene5376/lucene/test-framework/src/java/org/apache/lucene/index/ThreadedIndexingAndSearchingTestCase.java Wed Feb 26 14:43:56 2014
@@ -39,7 +39,6 @@ import org.apache.lucene.search.TermQuer
 import org.apache.lucene.search.TopDocs;
 import org.apache.lucene.store.BaseDirectoryWrapper;
 import org.apache.lucene.store.Directory;
-import org.apache.lucene.store.MockDirectoryWrapper;
 import org.apache.lucene.util.Bits;
 import org.apache.lucene.util.BytesRef;
 import org.apache.lucene.util.FailOnNonBulkMergesInfoStream;
@@ -47,7 +46,7 @@ import org.apache.lucene.util.LineFileDo
 import org.apache.lucene.util.LuceneTestCase;
 import org.apache.lucene.util.NamedThreadFactory;
 import org.apache.lucene.util.PrintStreamInfoStream;
-import org.apache.lucene.util._TestUtil;
+import org.apache.lucene.util.TestUtil;
 
 // TODO
 //   - mix in forceMerge, addIndexes
@@ -137,12 +136,12 @@ public abstract class ThreadedIndexingAn
                   if (VERBOSE) {
                     System.out.println(Thread.currentThread().getName() + ": now long sleep");
                   }
-                  Thread.sleep(_TestUtil.nextInt(random(), 50, 500));
+                  Thread.sleep(TestUtil.nextInt(random(), 50, 500));
                 }
 
                 // Rate limit ingest rate:
                 if (random().nextInt(7) == 5) {
-                  Thread.sleep(_TestUtil.nextInt(random(), 1, 10));
+                  Thread.sleep(TestUtil.nextInt(random(), 1, 10));
                   if (VERBOSE) {
                     System.out.println(Thread.currentThread().getName() + ": done sleep");
                   }
@@ -187,16 +186,16 @@ public abstract class ThreadedIndexingAn
 
                     allSubDocs.add(subDocs);
                     doc.add(packIDField);
-                    docsList.add(_TestUtil.cloneDocument(doc));
+                    docsList.add(TestUtil.cloneDocument(doc));
                     docIDs.add(doc.get("docid"));
 
-                    final int maxDocCount = _TestUtil.nextInt(random(), 1, 10);
+                    final int maxDocCount = TestUtil.nextInt(random(), 1, 10);
                     while(docsList.size() < maxDocCount) {
                       doc = docs.nextDoc();
                       if (doc == null) {
                         break;
                       }
-                      docsList.add(_TestUtil.cloneDocument(doc));
+                      docsList.add(TestUtil.cloneDocument(doc));
                       docIDs.add(doc.get("docid"));
                     }
                     addCount.addAndGet(docsList.size());
@@ -317,7 +316,7 @@ public abstract class ThreadedIndexingAn
   }
 
   protected void runSearchThreads(final long stopTimeMS) throws Exception {
-    final int numThreads = _TestUtil.nextInt(random(), 1, 5);
+    final int numThreads = TestUtil.nextInt(random(), 1, 5);
     final Thread[] searchThreads = new Thread[numThreads];
     final AtomicInteger totHits = new AtomicInteger();
 
@@ -436,7 +435,7 @@ public abstract class ThreadedIndexingAn
 
     Random random = new Random(random().nextLong());
     final LineFileDocs docs = new LineFileDocs(random, true);
-    final File tempDir = _TestUtil.getTempDir(testName);
+    final File tempDir = TestUtil.getTempDir(testName);
     dir = getDirectory(newMockFSDirectory(tempDir)); // some subclasses rely on this being MDW
     if (dir instanceof BaseDirectoryWrapper) {
       ((BaseDirectoryWrapper) dir).setCheckIndexOnClose(false); // don't double-checkIndex, we do it ourselves.
@@ -497,13 +496,13 @@ public abstract class ThreadedIndexingAn
         });
     }
     writer = new IndexWriter(dir, conf);
-    _TestUtil.reduceOpenFiles(writer);
+    TestUtil.reduceOpenFiles(writer);
 
     final ExecutorService es = random().nextBoolean() ? null : Executors.newCachedThreadPool(new NamedThreadFactory(testName));
 
     doAfterWriter(es);
 
-    final int NUM_INDEX_THREADS = _TestUtil.nextInt(random(), 2, 4);
+    final int NUM_INDEX_THREADS = TestUtil.nextInt(random(), 2, 4);
 
     final int RUN_TIME_SEC = LuceneTestCase.TEST_NIGHTLY ? 300 : RANDOM_MULTIPLIER;
 
@@ -642,9 +641,9 @@ public abstract class ThreadedIndexingAn
       es.awaitTermination(1, TimeUnit.SECONDS);
     }
 
-    _TestUtil.checkIndex(dir);
+    TestUtil.checkIndex(dir);
     dir.close();
-    _TestUtil.rmDir(tempDir);
+    TestUtil.rmDir(tempDir);
 
     if (VERBOSE) {
       System.out.println("TEST: done [" + (System.currentTimeMillis()-t0) + " ms]");

Modified: lucene/dev/branches/lucene5376/lucene/test-framework/src/java/org/apache/lucene/search/AssertingIndexSearcher.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376/lucene/test-framework/src/java/org/apache/lucene/search/AssertingIndexSearcher.java?rev=1572063&r1=1572062&r2=1572063&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376/lucene/test-framework/src/java/org/apache/lucene/search/AssertingIndexSearcher.java (original)
+++ lucene/dev/branches/lucene5376/lucene/test-framework/src/java/org/apache/lucene/search/AssertingIndexSearcher.java Wed Feb 26 14:43:56 2014
@@ -25,7 +25,7 @@ import java.util.concurrent.ExecutorServ
 import org.apache.lucene.index.AtomicReaderContext;
 import org.apache.lucene.index.IndexReader;
 import org.apache.lucene.index.IndexReaderContext;
-import org.apache.lucene.util._TestUtil;
+import org.apache.lucene.util.TestUtil;
 
 /**
  * Helper class that adds some extra checks to ensure correct
@@ -85,7 +85,7 @@ public class AssertingIndexSearcher exte
   protected Query wrapFilter(Query query, Filter filter) {
     if (random.nextBoolean())
       return super.wrapFilter(query, filter);
-    return (filter == null) ? query : new FilteredQuery(query, filter, _TestUtil.randomFilterStrategy(random));
+    return (filter == null) ? query : new FilteredQuery(query, filter, TestUtil.randomFilterStrategy(random));
   }
 
   @Override

Modified: lucene/dev/branches/lucene5376/lucene/test-framework/src/java/org/apache/lucene/search/SearchEquivalenceTestBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376/lucene/test-framework/src/java/org/apache/lucene/search/SearchEquivalenceTestBase.java?rev=1572063&r1=1572062&r2=1572063&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376/lucene/test-framework/src/java/org/apache/lucene/search/SearchEquivalenceTestBase.java (original)
+++ lucene/dev/branches/lucene5376/lucene/test-framework/src/java/org/apache/lucene/search/SearchEquivalenceTestBase.java Wed Feb 26 14:43:56 2014
@@ -31,9 +31,8 @@ import org.apache.lucene.index.IndexRead
 import org.apache.lucene.index.RandomIndexWriter;
 import org.apache.lucene.index.Term;
 import org.apache.lucene.store.Directory;
-import org.apache.lucene.util.Bits;
 import org.apache.lucene.util.LuceneTestCase;
-import org.apache.lucene.util._TestUtil;
+import org.apache.lucene.util.TestUtil;
 import org.apache.lucene.util.automaton.BasicAutomata;
 import org.apache.lucene.util.automaton.CharacterRunAutomaton;
 import org.junit.AfterClass;
@@ -125,7 +124,7 @@ public abstract class SearchEquivalenceT
    * returns random character (a-z)
    */
   static char randomChar() {
-    return (char) _TestUtil.nextInt(random(), 'a', 'z');
+    return (char) TestUtil.nextInt(random(), 'a', 'z');
   }
 
   /**
@@ -173,8 +172,8 @@ public abstract class SearchEquivalenceT
   protected void assertSubsetOf(Query q1, Query q2, Filter filter) throws Exception {
     // TRUNK ONLY: test both filter code paths
     if (filter != null && random().nextBoolean()) {
-      q1 = new FilteredQuery(q1, filter, _TestUtil.randomFilterStrategy(random()));
-      q2 = new FilteredQuery(q2, filter,  _TestUtil.randomFilterStrategy(random()));
+      q1 = new FilteredQuery(q1, filter, TestUtil.randomFilterStrategy(random()));
+      q2 = new FilteredQuery(q2, filter,  TestUtil.randomFilterStrategy(random()));
       filter = null;
     }
     

Modified: lucene/dev/branches/lucene5376/lucene/test-framework/src/java/org/apache/lucene/search/ShardSearchingTestBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376/lucene/test-framework/src/java/org/apache/lucene/search/ShardSearchingTestBase.java?rev=1572063&r1=1572062&r2=1572063&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376/lucene/test-framework/src/java/org/apache/lucene/search/ShardSearchingTestBase.java (original)
+++ lucene/dev/branches/lucene5376/lucene/test-framework/src/java/org/apache/lucene/search/ShardSearchingTestBase.java Wed Feb 26 14:43:56 2014
@@ -36,7 +36,7 @@ import org.apache.lucene.store.Directory
 import org.apache.lucene.util.LineFileDocs;
 import org.apache.lucene.util.LuceneTestCase;
 import org.apache.lucene.util.PrintStreamInfoStream;
-import org.apache.lucene.util._TestUtil;
+import org.apache.lucene.util.TestUtil;
 
 // TODO
 //   - doc blocks?  so we can test joins/grouping...
@@ -447,7 +447,7 @@ public abstract class ShardSearchingTest
 
     public NodeState(Random random, int nodeID, int numNodes) throws IOException {
       myNodeID = nodeID;
-      dir = newFSDirectory(_TestUtil.getTempDir("ShardSearchingTestBase"));
+      dir = newFSDirectory(TestUtil.getTempDir("ShardSearchingTestBase"));
       // TODO: set warmer
       IndexWriterConfig iwc = new IndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random));
       iwc.setOpenMode(IndexWriterConfig.OpenMode.CREATE);

Modified: lucene/dev/branches/lucene5376/lucene/test-framework/src/java/org/apache/lucene/store/BaseDirectoryWrapper.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376/lucene/test-framework/src/java/org/apache/lucene/store/BaseDirectoryWrapper.java?rev=1572063&r1=1572062&r2=1572063&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376/lucene/test-framework/src/java/org/apache/lucene/store/BaseDirectoryWrapper.java (original)
+++ lucene/dev/branches/lucene5376/lucene/test-framework/src/java/org/apache/lucene/store/BaseDirectoryWrapper.java Wed Feb 26 14:43:56 2014
@@ -20,7 +20,7 @@ package org.apache.lucene.store;
 import java.io.IOException;
 
 import org.apache.lucene.index.DirectoryReader;
-import org.apache.lucene.util._TestUtil;
+import org.apache.lucene.util.TestUtil;
 
 /**
  * Calls check index on close.
@@ -42,7 +42,7 @@ public class BaseDirectoryWrapper extend
   public void close() throws IOException {
     isOpen = false;
     if (checkIndexOnClose && DirectoryReader.indexExists(this)) {
-      _TestUtil.checkIndex(this, crossCheckTermVectorsOnClose);
+      TestUtil.checkIndex(this, crossCheckTermVectorsOnClose);
     }
     super.close();
   }

Modified: lucene/dev/branches/lucene5376/lucene/test-framework/src/java/org/apache/lucene/store/MockDirectoryWrapper.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376/lucene/test-framework/src/java/org/apache/lucene/store/MockDirectoryWrapper.java?rev=1572063&r1=1572062&r2=1572063&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376/lucene/test-framework/src/java/org/apache/lucene/store/MockDirectoryWrapper.java (original)
+++ lucene/dev/branches/lucene5376/lucene/test-framework/src/java/org/apache/lucene/store/MockDirectoryWrapper.java Wed Feb 26 14:43:56 2014
@@ -42,8 +42,8 @@ import org.apache.lucene.index.IndexWrit
 import org.apache.lucene.index.NoDeletionPolicy;
 import org.apache.lucene.index.SegmentInfos;
 import org.apache.lucene.util.LuceneTestCase;
+import org.apache.lucene.util.TestUtil;
 import org.apache.lucene.util.ThrottledIndexOutput;
-import org.apache.lucene.util._TestUtil;
 
 /**
  * This is a Directory Wrapper that adds methods
@@ -661,7 +661,7 @@ public class MockDirectoryWrapper extend
         if (LuceneTestCase.VERBOSE) {
           System.out.println("\nNOTE: MockDirectoryWrapper: now run CheckIndex");
         } 
-        _TestUtil.checkIndex(this, getCrossCheckTermVectorsOnClose());
+        TestUtil.checkIndex(this, getCrossCheckTermVectorsOnClose());
 
         // TODO: factor this out / share w/ TestIW.assertNoUnreferencedFiles
         if (assertNoUnreferencedFilesOnClose) {

Modified: lucene/dev/branches/lucene5376/lucene/test-framework/src/java/org/apache/lucene/util/BaseDocIdSetTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376/lucene/test-framework/src/java/org/apache/lucene/util/BaseDocIdSetTestCase.java?rev=1572063&r1=1572062&r2=1572063&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376/lucene/test-framework/src/java/org/apache/lucene/util/BaseDocIdSetTestCase.java (original)
+++ lucene/dev/branches/lucene5376/lucene/test-framework/src/java/org/apache/lucene/util/BaseDocIdSetTestCase.java Wed Feb 26 14:43:56 2014
@@ -86,7 +86,7 @@ public abstract class BaseDocIdSetTestCa
 
   /** Compare the content of the set against a {@link BitSet}. */
   public void testAgainstBitSet() throws IOException {
-    final int numBits = _TestUtil.nextInt(random(), 100, 1 << 20);
+    final int numBits = TestUtil.nextInt(random(), 100, 1 << 20);
     // test various random sets with various load factors
     for (float percentSet : new float[] {0f, 0.0001f, random().nextFloat() / 2, 0.9f, 1f}) {
       final BitSet set = randomSet(numBits, percentSet);
@@ -103,7 +103,7 @@ public abstract class BaseDocIdSetTestCa
     copy = copyOf(set, numBits); // then random index
     assertEquals(numBits, set, copy);
     // test regular increments
-    for (int inc = 2; inc < 1000; inc += _TestUtil.nextInt(random(), 1, 100)) {
+    for (int inc = 2; inc < 1000; inc += TestUtil.nextInt(random(), 1, 100)) {
       set = new BitSet(numBits);
       for (int d = random().nextInt(10); d < numBits; d += inc) {
         set.set(d);

Modified: lucene/dev/branches/lucene5376/lucene/test-framework/src/java/org/apache/lucene/util/CloseableFile.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376/lucene/test-framework/src/java/org/apache/lucene/util/CloseableFile.java?rev=1572063&r1=1572062&r2=1572063&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376/lucene/test-framework/src/java/org/apache/lucene/util/CloseableFile.java (original)
+++ lucene/dev/branches/lucene5376/lucene/test-framework/src/java/org/apache/lucene/util/CloseableFile.java Wed Feb 26 14:43:56 2014
@@ -37,7 +37,7 @@ final class CloseableFile implements Clo
     if (failureMarker.wasSuccessful()) {
       if (file.exists()) {
         try {
-          _TestUtil.rmDir(file);
+          TestUtil.rmDir(file);
         } catch (IOException e) {
           // Ignore the exception from rmDir.
         }

Modified: lucene/dev/branches/lucene5376/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java?rev=1572063&r1=1572062&r2=1572063&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java (original)
+++ lucene/dev/branches/lucene5376/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java Wed Feb 26 14:43:56 2014
@@ -638,7 +638,7 @@ public abstract class LuceneTestCase ext
   public static int atLeast(Random random, int i) {
     int min = (TEST_NIGHTLY ? 2*i : i) * RANDOM_MULTIPLIER;
     int max = min+(min/2);
-    return _TestUtil.nextInt(random, min, max);
+    return TestUtil.nextInt(random, min, max);
   }
   
   public static int atLeast(int i) {
@@ -744,8 +744,8 @@ public abstract class LuceneTestCase ext
     if (r.nextBoolean()) {
       c.setMergeScheduler(new SerialMergeScheduler());
     } else if (rarely(r)) {
-      int maxThreadCount = _TestUtil.nextInt(random(), 1, 4);
-      int maxMergeCount = _TestUtil.nextInt(random(), maxThreadCount, maxThreadCount+4);
+      int maxThreadCount = TestUtil.nextInt(random(), 1, 4);
+      int maxMergeCount = TestUtil.nextInt(random(), maxThreadCount, maxThreadCount + 4);
       ConcurrentMergeScheduler cms = new ConcurrentMergeScheduler();
       cms.setMaxMergesAndThreads(maxMergeCount, maxThreadCount);
       c.setMergeScheduler(cms);
@@ -753,15 +753,15 @@ public abstract class LuceneTestCase ext
     if (r.nextBoolean()) {
       if (rarely(r)) {
         // crazy value
-        c.setMaxBufferedDocs(_TestUtil.nextInt(r, 2, 15));
+        c.setMaxBufferedDocs(TestUtil.nextInt(r, 2, 15));
       } else {
         // reasonable value
-        c.setMaxBufferedDocs(_TestUtil.nextInt(r, 16, 1000));
+        c.setMaxBufferedDocs(TestUtil.nextInt(r, 16, 1000));
       }
     }
     if (r.nextBoolean()) {
-      int maxNumThreadStates = rarely(r) ? _TestUtil.nextInt(r, 5, 20) // crazy value
-          : _TestUtil.nextInt(r, 1, 4); // reasonable value
+      int maxNumThreadStates = rarely(r) ? TestUtil.nextInt(r, 5, 20) // crazy value
+          : TestUtil.nextInt(r, 1, 4); // reasonable value
 
       Method setIndexerThreadPoolMethod = null;
       try {
@@ -844,9 +844,9 @@ public abstract class LuceneTestCase ext
     LogMergePolicy logmp = r.nextBoolean() ? new LogDocMergePolicy() : new LogByteSizeMergePolicy();
     logmp.setCalibrateSizeByDeletes(r.nextBoolean());
     if (rarely(r)) {
-      logmp.setMergeFactor(_TestUtil.nextInt(r, 2, 9));
+      logmp.setMergeFactor(TestUtil.nextInt(r, 2, 9));
     } else {
-      logmp.setMergeFactor(_TestUtil.nextInt(r, 10, 50));
+      logmp.setMergeFactor(TestUtil.nextInt(r, 10, 50));
     }
     configureRandom(r, logmp);
     return logmp;
@@ -869,11 +869,11 @@ public abstract class LuceneTestCase ext
   public static TieredMergePolicy newTieredMergePolicy(Random r) {
     TieredMergePolicy tmp = new TieredMergePolicy();
     if (rarely(r)) {
-      tmp.setMaxMergeAtOnce(_TestUtil.nextInt(r, 2, 9));
-      tmp.setMaxMergeAtOnceExplicit(_TestUtil.nextInt(r, 2, 9));
+      tmp.setMaxMergeAtOnce(TestUtil.nextInt(r, 2, 9));
+      tmp.setMaxMergeAtOnceExplicit(TestUtil.nextInt(r, 2, 9));
     } else {
-      tmp.setMaxMergeAtOnce(_TestUtil.nextInt(r, 10, 50));
-      tmp.setMaxMergeAtOnceExplicit(_TestUtil.nextInt(r, 10, 50));
+      tmp.setMaxMergeAtOnce(TestUtil.nextInt(r, 10, 50));
+      tmp.setMaxMergeAtOnceExplicit(TestUtil.nextInt(r, 10, 50));
     }
     if (rarely(r)) {
       tmp.setMaxMergedSegmentMB(0.2 + r.nextDouble() * 2.0);
@@ -883,9 +883,9 @@ public abstract class LuceneTestCase ext
     tmp.setFloorSegmentMB(0.2 + r.nextDouble() * 2.0);
     tmp.setForceMergeDeletesPctAllowed(0.0 + r.nextDouble() * 30.0);
     if (rarely(r)) {
-      tmp.setSegmentsPerTier(_TestUtil.nextInt(r, 2, 20));
+      tmp.setSegmentsPerTier(TestUtil.nextInt(r, 2, 20));
     } else {
-      tmp.setSegmentsPerTier(_TestUtil.nextInt(r, 10, 50));
+      tmp.setSegmentsPerTier(TestUtil.nextInt(r, 10, 50));
     }
     configureRandom(r, tmp);
     tmp.setReclaimDeletesWeight(r.nextDouble()*4);
@@ -1160,7 +1160,7 @@ public abstract class LuceneTestCase ext
       final Class<? extends Directory> clazz = CommandLineUtil.loadDirectoryClass(clazzName);
       // If it is a FSDirectory type, try its ctor(File)
       if (FSDirectory.class.isAssignableFrom(clazz)) {
-        final File dir = _TestUtil.getTempDir("index");
+        final File dir = TestUtil.getTempDir("index");
         dir.mkdirs(); // ensure it's created so we 'have' it.
         return newFSDirectoryImpl(clazz.asSubclass(FSDirectory.class), dir);
       }
@@ -1256,7 +1256,7 @@ public abstract class LuceneTestCase ext
     } else if (oldContext.mergeInfo != null) {
       // Always return at least the estimatedMergeBytes of
       // the incoming IOContext:
-      return new IOContext(new MergeInfo(randomNumDocs, Math.max(oldContext.mergeInfo.estimatedMergeBytes, size), random.nextBoolean(), _TestUtil.nextInt(random, 1, 100)));
+      return new IOContext(new MergeInfo(randomNumDocs, Math.max(oldContext.mergeInfo.estimatedMergeBytes, size), random.nextBoolean(), TestUtil.nextInt(random, 1, 100)));
     } else {
       // Make a totally random IOContext:
       final IOContext context;
@@ -1312,7 +1312,7 @@ public abstract class LuceneTestCase ext
         // TODO: not useful to check DirectoryReader (redundant with checkindex)
         // but maybe sometimes run this on the other crazy readers maybeWrapReader creates?
         try {
-          _TestUtil.checkReader(r);
+          TestUtil.checkReader(r);
         } catch (IOException e) {
           throw new AssertionError(e);
         }
@@ -1326,7 +1326,7 @@ public abstract class LuceneTestCase ext
       if (random.nextBoolean()) {
         ex = null;
       } else {
-        threads = _TestUtil.nextInt(random, 1, 8);
+        threads = TestUtil.nextInt(random, 1, 8);
         ex = new ThreadPoolExecutor(threads, threads, 0L, TimeUnit.MILLISECONDS,
             new LinkedBlockingQueue<Runnable>(),
             new NamedThreadFactory("LuceneTestCase"));
@@ -1340,7 +1340,7 @@ public abstract class LuceneTestCase ext
        r.addReaderClosedListener(new ReaderClosedListener() {
          @Override
          public void onClose(IndexReader reader) {
-           _TestUtil.shutdownExecutorService(ex);
+           TestUtil.shutdownExecutorService(ex);
          }
        });
       }
@@ -1763,7 +1763,7 @@ public abstract class LuceneTestCase ext
               tests.add(new BytesRef(new byte[] {(byte) 0xFF, (byte) 0xFF})); // past the last term
               break;
             case 2:
-              tests.add(new BytesRef(_TestUtil.randomSimpleString(random()))); // random term
+              tests.add(new BytesRef(TestUtil.randomSimpleString(random()))); // random term
               break;
             default:
               throw new AssertionError();

Modified: lucene/dev/branches/lucene5376/lucene/test-framework/src/java/org/apache/lucene/util/automaton/AutomatonTestUtil.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376/lucene/test-framework/src/java/org/apache/lucene/util/automaton/AutomatonTestUtil.java?rev=1572063&r1=1572062&r2=1572063&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376/lucene/test-framework/src/java/org/apache/lucene/util/automaton/AutomatonTestUtil.java (original)
+++ lucene/dev/branches/lucene5376/lucene/test-framework/src/java/org/apache/lucene/util/automaton/AutomatonTestUtil.java Wed Feb 26 14:43:56 2014
@@ -28,8 +28,8 @@ import java.util.Random;
 import java.util.Set;
 
 import org.apache.lucene.util.ArrayUtil;
+import org.apache.lucene.util.TestUtil;
 import org.apache.lucene.util.UnicodeUtil;
-import org.apache.lucene.util._TestUtil;
 
 /**
  * Utilities for testing automata.
@@ -65,14 +65,14 @@ public class AutomatonTestUtil {
       if (0 == t && i < end - 1) {
         // Make a surrogate pair
         // High surrogate
-        buffer[i++] = (char) _TestUtil.nextInt(r, 0xd800, 0xdbff);
+        buffer[i++] = (char) TestUtil.nextInt(r, 0xd800, 0xdbff);
         // Low surrogate
-        buffer[i] = (char) _TestUtil.nextInt(r, 0xdc00, 0xdfff);
+        buffer[i] = (char) TestUtil.nextInt(r, 0xdc00, 0xdfff);
       }
       else if (t <= 1) buffer[i] = (char) r.nextInt(0x80);
-      else if (2 == t) buffer[i] = (char) _TestUtil.nextInt(r, 0x80, 0x800);
-      else if (3 == t) buffer[i] = (char) _TestUtil.nextInt(r, 0x800, 0xd7ff);
-      else if (4 == t) buffer[i] = (char) _TestUtil.nextInt(r, 0xe000, 0xffff);
+      else if (2 == t) buffer[i] = (char) TestUtil.nextInt(r, 0x80, 0x800);
+      else if (3 == t) buffer[i] = (char) TestUtil.nextInt(r, 0x800, 0xd7ff);
+      else if (4 == t) buffer[i] = (char) TestUtil.nextInt(r, 0xe000, 0xffff);
       else if (5 == t) buffer[i] = '.';
       else if (6 == t) buffer[i] = '?';
       else if (7 == t) buffer[i] = '*';

Modified: lucene/dev/branches/lucene5376/lucene/test-framework/src/java/org/apache/lucene/util/fst/FSTTester.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376/lucene/test-framework/src/java/org/apache/lucene/util/fst/FSTTester.java?rev=1572063&r1=1572062&r2=1572063&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376/lucene/test-framework/src/java/org/apache/lucene/util/fst/FSTTester.java (original)
+++ lucene/dev/branches/lucene5376/lucene/test-framework/src/java/org/apache/lucene/util/fst/FSTTester.java Wed Feb 26 14:43:56 2014
@@ -38,8 +38,8 @@ import org.apache.lucene.store.IndexOutp
 import org.apache.lucene.util.BytesRef;
 import org.apache.lucene.util.IntsRef;
 import org.apache.lucene.util.LuceneTestCase;
+import org.apache.lucene.util.TestUtil;
 import org.apache.lucene.util.UnicodeUtil;
-import org.apache.lucene.util._TestUtil;
 import org.apache.lucene.util.packed.PackedInts;
 
 import static org.junit.Assert.assertEquals;
@@ -97,7 +97,7 @@ public class FSTTester<T> {
   static String getRandomString(Random random) {
     final String term;
     if (random.nextBoolean()) {
-      term = _TestUtil.randomRealisticUnicodeString(random);
+      term = TestUtil.randomRealisticUnicodeString(random);
     } else {
       // we want to mix in limited-alphabet symbols so
       // we get more sharing of the nodes given how few
@@ -115,7 +115,7 @@ public class FSTTester<T> {
     }
     final char[] buffer = new char[end];
     for (int i = 0; i < end; i++) {
-      buffer[i] = (char) _TestUtil.nextInt(r, 97, 102);
+      buffer[i] = (char) TestUtil.nextInt(r, 97, 102);
     }
     return new String(buffer, 0, end);
   }
@@ -188,10 +188,10 @@ public class FSTTester<T> {
 
     if (testPruning) {
       // simple pruning
-      doTest(_TestUtil.nextInt(random, 1, 1+pairs.size()), 0, true);
+      doTest(TestUtil.nextInt(random, 1, 1 + pairs.size()), 0, true);
         
       // leafy pruning
-      doTest(0, _TestUtil.nextInt(random, 1, 1+pairs.size()), true);
+      doTest(0, TestUtil.nextInt(random, 1, 1 + pairs.size()), true);
     }
   }
 
@@ -285,7 +285,7 @@ public class FSTTester<T> {
                                               prune1, prune2,
                                               prune1==0 && prune2==0,
                                               allowRandomSuffixSharing ? random.nextBoolean() : true,
-                                              allowRandomSuffixSharing ? _TestUtil.nextInt(random, 1, 10) : Integer.MAX_VALUE,
+                                              allowRandomSuffixSharing ? TestUtil.nextInt(random, 1, 10) : Integer.MAX_VALUE,
                                               outputs,
                                               null,
                                               willRewrite,
@@ -434,7 +434,7 @@ public class FSTTester<T> {
 
       final int num = LuceneTestCase.atLeast(random, 100);
       for(int iter=0;iter<num;iter++) {
-        Long v = _TestUtil.nextLong(random, minLong, maxLong);
+        Long v = TestUtil.nextLong(random, minLong, maxLong);
         IntsRef input = Util.getByOutput(fstLong, v);
         assertTrue(validOutputs.contains(v) || input == null);
       }

Modified: lucene/dev/branches/lucene5376/lucene/tools/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376/lucene/tools/build.xml?rev=1572063&r1=1572062&r2=1572063&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376/lucene/tools/build.xml (original)
+++ lucene/dev/branches/lucene5376/lucene/tools/build.xml Wed Feb 26 14:43:56 2014
@@ -39,6 +39,7 @@
   <!-- redefine the forbidden apis to be no-ops -->
   <target name="-check-forbidden-tests"/>
   <target name="-check-forbidden-sysout"/>
+  <target name="-check-forbidden-rue"/>
 
   <!--  
       Specialize compile-core to not depend on clover, to exclude a 

Modified: lucene/dev/branches/lucene5376/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376/solr/CHANGES.txt?rev=1572063&r1=1572062&r2=1572063&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376/solr/CHANGES.txt (original)
+++ lucene/dev/branches/lucene5376/solr/CHANGES.txt Wed Feb 26 14:43:56 2014
@@ -47,6 +47,16 @@ Detailed Change List
 New Features
 ----------------------
 
+* SOLR-5287: You can edit files in the conf directory from the admin UI.
+  (Erick Erickson, Stefan Matheis)
+  Additional work:
+  - SOLR-5446: Admin UI - Allow changing Schema and Config (steffkes)
+  - SOLR-5458: Admin UI - Remove separated Pages for Config & Schema (steffkes)
+  - SOLR-5456: Admin UI - Allow creating new Files (steffkes)
+  - SOLR-5518: Added EditFileRequestHandler to deal with security issues around
+    modifying solr configuration files.  (Erick Erickson)
+  - SOLR-5539: Admin UI - Remove ability to create/modify files (steffkes)
+
 
 Other Changes
 ----------------------
@@ -56,6 +66,59 @@ Other Changes
 
 * SOLR-4792: Stop shipping a .war. (Robert Muir)
 
+==================  4.8.0 ==================
+
+Versions of Major Components
+---------------------
+Apache Tika 1.4
+Carrot2 3.8.0
+Velocity 1.7 and Velocity Tools 2.0
+Apache UIMA 2.3.1
+Apache ZooKeeper 3.4.5
+
+                      
+Detailed Change List
+----------------------
+
+New Features
+----------------------
+* SOLR-5130: Implement addReplica Collections API (Noble Paul)
+
+Bug Fixes
+----------------------
+
+* SOLR-5647: The lib paths in example-schemaless will now load correctly.
+  (Paul Westin via Shawn Heisey)
+
+* SOLR-5423: CSV output doesn't include function field
+  (Arun Kumar, hossman, Steve Rowe)
+
+Optimizations
+----------------------
+* SOLR-1880: Distributed Search skips GET_FIELDS stage if EXECUTE_QUERY
+  stage gets all fields. Requests with fl=id or fl=id,score are now single-pass.
+  (Shawn Smith, Vitaliy Zhovtyuk, shalin)
+
+
+Other Changes
+---------------------
+
+* SOLR-5764: Fix recently added tests to not use absolute paths to load test-files,
+  use SolrTestCaseJ4.getFile() and getResource() instead; fix morphlines/map-reduce
+  to not duplicate test resources and fix dependencies among them.
+  (Uwe Schindler)
+
+* SOLR-5765: Update to SLF4J 1.7.6. (Mark Miller)
+
+* SOLR-5609: If legacy mode is disabled don't let cores create slices/replicas/collections .
+  All operations should be performed through collection API (Noble Paul)
+
+* SOLR-5613: Upgrade to commons-codec 1.9 for better BeiderMorseFilter performance.
+  (Thomas Champagne, Shawn Heisey via shalin)
+
+* SOLR-5771: Add SolrTestCaseJ4.SuppressSSL annotation to disable SSL (instead of static boolean).
+  (Robert Muir)
+
 ==================  4.7.0 ==================
 
 Versions of Major Components
@@ -71,6 +134,13 @@ Upgrading from Solr 4.6.0
 
 * CloudSolrServer and LBHttpSolrServer no longer declare MalformedURLException
   as thrown from their constructors.  
+
+* Due to a bug in previous versions the default value of the 'discountOverlap' property
+  of DefaultSimilarity was not being set appropriately if you were using the implicit
+  DefaultSimilarityFactory instead of explicitly configuring it.  To preserve 
+  consistent behavior for people who upgrade, the implicit behavior is now contingent 
+  on the <luceneMatchVersion/> -- discountOverlap=false for 4.6 and below, 
+  discountOverlap=true for 4.7 and above.  See SOLR-5561 for more information.
                       
 Detailed Change List
 ----------------------
@@ -87,17 +157,14 @@ New Features
 * SOLR-5320: Added support for tri-level compositeId routing.
   (Anshum Gupta via shalin)
   
-* SOLR-5287: You can edit files in the conf directory from the admin UI 
-  (Erick Erickson, Stefan Matheis)
+* SOLR-5287,SOLR-5522,SOLR-5446,SOLR-5456,SOLR-5539,SOLR-5458:
+  Admin UI - Added a new "Files" conf directory browser/file viewer.
+  (steffkes, Erick Erickson)
 
 * SOLR-5447, SOLR-5490: Add a QParserPlugin for Lucene's SimpleQueryParser.
   (Jack Conradson via shalin)
 
-* SOLR-5446: Admin UI - Allow changing Schema and Config (steffkes)
-
-* SOLR-5456: Admin UI - Allow creating new Files (steffkes)
-
-* SOLR-5208: Support for the setting of core.properties key/values at create-time on 
+* SOLR-5208: Support for the setting of core.properties key/values at create-time on
   Collections API (Erick Erickson)
 
 * SOLR-5428: SOLR-5690: New 'stats.calcdistinct' parameter in StatsComponent returns
@@ -114,9 +181,6 @@ New Features
 
 * SOLR-5506: Support docValues in CollationField and ICUCollationField.
   (Robert Muir)
-  
-* SOLR-5518: Added EditFileRequestHandler to deal with security issues around modifying
-  solr configuration files.
 
 * SOLR-5023: Add support for deleteInstanceDir to be passed from SolrJ for Core
   Unload action. (Lyubov Romanchuk, shalin)
@@ -182,6 +246,9 @@ New Features
 * SOLR-5672: Add logParamsList parameter to support reduced logging.
   (Christine Poerschke via Mark Miller)
 
+* SOLR-3854: SSL support for SolrCloud. (Sami Siren, hossman, Steve Davids, 
+  Alexey Serba, Mark Miller)
+
 Bug Fixes
 ----------------------
 
@@ -296,11 +363,58 @@ Bug Fixes
 * SOLR-5644: SplitShard does not handle not finding a shard leader well.
   (Mark Miller, Anshum Gupta via shalin)
 
+* SOLR-5704: coreRootDirectory was not respected when creating new cores
+  via CoreAdminHandler (Jesse Sipprell, Alan Woodward)
+
+* SOLR-5709: Highlighting grouped duplicate docs from different shards with
+  group.limit > 1 throws ArrayIndexOutOfBoundsException. (Steve Rowe)
+
+* SOLR-5561: Fix implicit DefaultSimilarityFactory initialization in IndexSchema 
+  to properly specify discountOverlap option.
+  (Isaac Hebsh, Ahmet Arslan, Vitaliy Zhovtyuk, hossman)
+
+* SOLR-5689: On reconnect, ZkController cancels election on first context rather
+  than latest. (Gregory Chanan, Mark Miller via shalin)
+
+* SOLR-5649: Clean up some minor ConnectionManager issues. 
+  (Mark Miller, Gregory Chanan)
+
+* SOLR-5365: Fix bug with compressed files in ExtractingRequestHandler by
+  upgrading commons-compress to 1.7 (Jan Høydahl, hossman)
+
+* SOLR-5675: cloud-scripts/zkcli.bat: quote option log4j
+  (Günther Ruck via steffkes
+
+* SOLR-5721: ConnectionManager can become stuck in likeExpired.
+  (Gregory Chanan via Mark Miller)
+  
+* SOLR-5731: In ConnectionManager, we should catch and only log exceptions
+  from BeforeReconnect. (Mark Miller)
+
+* SOLR-5718: Make LBHttpSolrServer zombie checks non-distrib and non-scoring.
+  (Christine Poerschke via Mark Miller)
+
+* SOLR-5727: LBHttpSolrServer should only retry on Connection exceptions when 
+  sending updates. Affects CloudSolrServer. (Mark Miller)
+
+* SOLR-5739: Sub-shards created by shard splitting have their update log set
+  to buffering mode on restarts. (Günther Ruck, shalin)
+
+* SOLR-5741: UpdateShardHandler was not correctly setting max total connections
+  on the HttpClient. (Shawn Heisey)
+
+* SOLR-5620: ZKStateReader.aliases should be volatile to ensure all threads see
+  the latest aliases. (Ramkumar Aiyengar via Mark Miller)
+
+* SOLR-5448: ShowFileRequestHandler treats everything as Directory, when in
+  Cloud-Mode. (Erick Erickson, steffkes)
+
+* SOLR-5770: All attempts to match a SolrCore with it's state in clusterstate.json 
+  should be done with the CoreNodeName. (Steve Davids via Mark Miller)
+
 Optimizations
 ----------------------
 
-* SOLR-5458: Admin UI - Remove separated Pages for Config & Schema (steffkes)
-
 * SOLR-5436: Eliminate the 1500ms wait in overseer loop as well as
   polling the ZK distributed queue. (Noble Paul, Mark Miller)
 
@@ -321,6 +435,10 @@ Optimizations
 * SOLR-5624: Enable QueryResultCache for CollapsingQParserPlugin.
   (David Boychuck, Joel Bernstein)
 
+* LUCENE-5440: DocSet decoupled from OpenBitSet. DocSetBase moved to use 
+  FixedBitSet instead of OpenBitSet. As a result BitDocSet now only works 
+  with FixedBitSet. (Shai Erera)
+
 Other Changes
 ---------------------
 
@@ -345,9 +463,7 @@ Other Changes
 * SOLR-5502: Added a test for tri-level compositeId routing with documents
   having a "/" in a document id. (Anshum Gupta via Mark Miller)
 
-* SOLR-5539: Admin UI - Remove ability to create/modify files (steffkes)
-
-* SOLR-5533: Improve out of the box support for running Solr on hdfs with 
+* SOLR-5533: Improve out of the box support for running Solr on hdfs with
   SolrCloud. (Mark Miller)
 
 * SOLR-5548: Give DistributedSearchTestCase / JettySolrRunner the ability to 
@@ -389,6 +505,13 @@ Other Changes
 * SOLR-5700: Improve error handling of remote queries (proxied requests).
   (Greg Chanan, Steve Davids via Mark Miller)
 
+* SOLR-5585: Raise Collections API timeout to 3 minutes from one minute.
+  (Mark Miller)
+
+* SOLR-5257: Improved error/warn messages when Update XML contains unexpected XML nodes
+  (Vitaliy Zhovtyuk, hossman)
+
+
 ==================  4.6.1  ==================
 
 Versions of Major Components

Modified: lucene/dev/branches/lucene5376/solr/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376/solr/common-build.xml?rev=1572063&r1=1572062&r2=1572063&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376/solr/common-build.xml (original)
+++ lucene/dev/branches/lucene5376/solr/common-build.xml Wed Feb 26 14:43:56 2014
@@ -118,7 +118,7 @@
       <exclude name="randomizedtesting-runner-*.jar" />
       <exclude name="ant*.jar" />
     </fileset>
-  	<pathelement path="${build.dir}/test-files"/>
+  	<pathelement path="src/test-files"/>
   	<path refid="test.base.classpath"/>
   </path>
  
@@ -202,7 +202,8 @@
     <attribute name="implementation.title" default="org.apache.solr"/>
     <attribute name="spec.version" default="${spec.version}"/>
     <attribute name="manifest.file" default="${manifest.file}"/>
-    <element name="nested" optional="true" implicit="true"/>
+    <element name="solr-jarify-filesets" optional="true"/>
+    <element name="solr-jarify-additional-manifest-attributes" optional="true"/>
     <sequential>
       <jarify basedir="@{basedir}" destfile="@{destfile}"
               title="@{title}" excludes="@{excludes}"
@@ -210,7 +211,12 @@
               implementation.title="@{implementation.title}"
               spec.version="@{spec.version}"
               manifest.file="@{manifest.file}">
-        <nested/>
+        <filesets>
+          <solr-jarify-filesets />
+        </filesets>
+        <jarify-additional-manifest-attributes>
+          <solr-jarify-additional-manifest-attributes />
+        </jarify-additional-manifest-attributes>
       </jarify>
     </sequential>
   </macrodef>
@@ -220,7 +226,7 @@
   </target>
 
   <target name="compile-core" depends="prep-lucene-jars,resolve-example,common.compile-core"/>
-  <target name="compile-test" depends="sync-resources,compile-solr-test-framework,common.compile-test"/>
+  <target name="compile-test" depends="compile-solr-test-framework,common.compile-test"/>
 
   <target name="dist" depends="jar-core">
     <copy file="${build.dir}/${fullnamever}.jar" todir="${dist}"/>
@@ -331,7 +337,9 @@
     <sequential>
       <mkdir dir="${build.dir}"/>
       <solr-jarify basedir="${src.dir}" destfile="${build.dir}/${final.name}-src.jar">
-        <fileset dir="${resources.dir}" erroronmissingdir="no"/>
+        <solr-jarify-filesets>
+          <fileset dir="${resources.dir}" erroronmissingdir="no"/>
+        </solr-jarify-filesets>
       </solr-jarify>
     </sequential>
   </target>
@@ -399,15 +407,6 @@
     </ant>
   </target>
 
-  <!-- TODO: really a copy should work: but sync is currently safer
-       since some buggy tests don't create their own tempdir but
-       modify this target directory directly... -->
-  <target name="sync-resources">
-    <sync todir="${build.dir}/test-files">
-      <fileset dir="${tests.userdir}"/>
-    </sync>
-  </target>
-
   <!-- Solr test-framework targets -->
   <target name="compile-solr-test-framework" description="Compile the Solr test-framework" unless="solr.test.framework.compiled">
     <ant dir="${common-solr.dir}/test-framework" target="compile-core" inheritAll="false">
@@ -469,7 +468,7 @@
   </target>
   
   <!-- Forbidden API Task, customizations for Solr -->
-  <target name="-check-forbidden-base" depends="-init-forbidden-apis,compile-core,compile-test">
+  <target name="-check-forbidden-all" depends="-init-forbidden-apis,compile-core,compile-test">
     <property file="${common.dir}/ivy-versions.properties"/> <!-- for commons-io version -->
     <forbidden-apis internalRuntimeForbidden="true" classpathref="forbidden-apis.allclasses.classpath">
       <bundledSignatures name="jdk-unsafe-${javac.target}"/>

Modified: lucene/dev/branches/lucene5376/solr/contrib/clustering/src/test-files/clustering/solr/solr.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376/solr/contrib/clustering/src/test-files/clustering/solr/solr.xml?rev=1572063&r1=1572062&r2=1572063&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376/solr/contrib/clustering/src/test-files/clustering/solr/solr.xml (original)
+++ lucene/dev/branches/lucene5376/solr/contrib/clustering/src/test-files/clustering/solr/solr.xml Wed Feb 26 14:43:56 2014
@@ -25,5 +25,9 @@
          host="${host:}" hostPort="${hostPort:}" hostContext="${hostContext:}"
          zkClientTimeout="${zkClientTimeout:15000}">
     <core name="collection1" shard="${shard:}" collection="${collection:collection1}" instanceDir="collection1"/>
+    
+    <shardHandlerFactory name="shardHandlerFactory" class="HttpShardHandlerFactory">
+     <str name="urlScheme">${urlScheme:}</str>
+     </shardHandlerFactory>
   </cores>
 </solr>

Modified: lucene/dev/branches/lucene5376/solr/contrib/dataimporthandler/src/test-files/dih/solr/solr.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376/solr/contrib/dataimporthandler/src/test-files/dih/solr/solr.xml?rev=1572063&r1=1572062&r2=1572063&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376/solr/contrib/dataimporthandler/src/test-files/dih/solr/solr.xml (original)
+++ lucene/dev/branches/lucene5376/solr/contrib/dataimporthandler/src/test-files/dih/solr/solr.xml Wed Feb 26 14:43:56 2014
@@ -25,5 +25,8 @@
          host="${host:}" hostPort="${hostPort:}" hostContext="${hostContext:}"
          zkClientTimeout="${zkClientTimeout:15000}">
     <core name="collection1" shard="${shard:}" collection="${collection:collection1}" instanceDir="collection1"/>
+    <shardHandlerFactory name="shardHandlerFactory" class="HttpShardHandlerFactory">
+      <str name="urlScheme">${urlScheme:}</str>
+    </shardHandlerFactory>
   </cores>
 </solr>
\ No newline at end of file

Modified: lucene/dev/branches/lucene5376/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestContentStreamDataSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestContentStreamDataSource.java?rev=1572063&r1=1572062&r2=1572063&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestContentStreamDataSource.java (original)
+++ lucene/dev/branches/lucene5376/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestContentStreamDataSource.java Wed Feb 26 14:43:56 2014
@@ -69,8 +69,7 @@ public class TestContentStreamDataSource
     params.set("command", "full-import");
     params.set("clean", "false");
     req.setParams(params);
-    String url = "http://127.0.0.1:" + jetty.getLocalPort() + "/solr";
-    HttpSolrServer solrServer = new HttpSolrServer(url);
+    HttpSolrServer solrServer = new HttpSolrServer(buildUrl(jetty.getLocalPort(), "/solr"));
     solrServer.request(req);
     ModifiableSolrParams qparams = new ModifiableSolrParams();
     qparams.add("q", "*:*");
@@ -89,8 +88,7 @@ public class TestContentStreamDataSource
         "clean", "false", UpdateParams.COMMIT, "false", 
         UpdateParams.COMMIT_WITHIN, "1000");
     req.setParams(params);
-    String url = "http://127.0.0.1:" + jetty.getLocalPort() + "/solr";
-    HttpSolrServer solrServer = new HttpSolrServer(url);
+    HttpSolrServer solrServer = new HttpSolrServer(buildUrl(jetty.getLocalPort(), "/solr"));
     solrServer.request(req);
     Thread.sleep(100);
     ModifiableSolrParams queryAll = params("q", "*");
@@ -181,7 +179,7 @@ public class TestContentStreamDataSource
 
   private JettySolrRunner createJetty(SolrInstance instance) throws Exception {
     System.setProperty("solr.data.dir", instance.getDataDir());
-    JettySolrRunner jetty = new JettySolrRunner(instance.getHomeDir(), "/solr", 0);
+    JettySolrRunner jetty = new JettySolrRunner(instance.getHomeDir(), "/solr", 0, null, null, true, null, sslConfig);
     jetty.start();
     return jetty;
   }



Mime
View raw message