incubator-blur-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From amccu...@apache.org
Subject [17/17] git commit: Changing license header to Apache for blur-core tests.
Date Mon, 03 Sep 2012 02:25:02 GMT
Changing license header to Apache for blur-core tests.


Project: http://git-wip-us.apache.org/repos/asf/incubator-blur/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-blur/commit/d9b19584
Tree: http://git-wip-us.apache.org/repos/asf/incubator-blur/tree/d9b19584
Diff: http://git-wip-us.apache.org/repos/asf/incubator-blur/diff/d9b19584

Branch: refs/heads/master
Commit: d9b1958492fd448b001240453dd1d0ea0fdf146d
Parents: d0d535c
Author: Aaron McCurry <amccurry@gmail.com>
Authored: Sun Sep 2 20:43:54 2012 -0400
Committer: Aaron McCurry <amccurry@gmail.com>
Committed: Sun Sep 2 20:43:54 2012 -0400

----------------------------------------------------------------------
 .../java/com/nearinfinity/blur/MiniCluster.java    |   17 +
 .../blur/analysis/BlurAnalyzerTest.java            |   19 +-
 .../blur/analysis/LongAnalyzerTest.java            |   17 +
 .../blur/lucene/search/FacetQueryTest.java         |   30 +-
 .../blur/manager/IndexManagerTest.java             |   34 +-
 .../clusterstatus/ZookeeperClusterStatusTest.java  |   19 +-
 .../indexserver/DistributedLayoutManagerTest.java  |   19 +-
 .../BlurResultPeekableIteratorComparatorTest.java  |   19 +-
 .../results/MultipleBlurResultIterableTest.java    |   19 +-
 .../blur/manager/results/PeekableIteratorTest.java |   19 +-
 .../blur/manager/stats/WeightedAvgTest.java        |   17 +
 .../blur/manager/writer/BlurNRTIndexTest.java      |   17 +
 .../writer/DirectoryReferenceCounterTest.java      |   28 +-
 .../manager/writer/TransactionRecorderTest.java    |   32 +-
 .../blur/search/RandomSuperQueryTest.java          |   20 +-
 .../nearinfinity/blur/search/SuperQueryTest.java   |   19 +-
 .../blur/search/TestingPagingCollector.java        |   18 +-
 .../nearinfinity/blur/thrift/BlurClusterTest.java  |   17 +
 .../blur/thrift/BlurControllerServerTest.java      |  612 ++++++++-------
 .../blur/thrift/BlurShardServerTest.java           |   19 +-
 .../nearinfinity/blur/thrift/DoNothingServer.java  |   21 +-
 .../com/nearinfinity/blur/utils/BlurUtilsTest.java |   53 +-
 .../blur/utils/TermDocIterableTest.java            |   20 +-
 .../blur/manager/complex-test-datasource.json      |    1 -
 src/blur-core/src/test/resources/log4j.xml         |   18 +
 25 files changed, 663 insertions(+), 461 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/d9b19584/src/blur-core/src/test/java/com/nearinfinity/blur/MiniCluster.java
----------------------------------------------------------------------
diff --git a/src/blur-core/src/test/java/com/nearinfinity/blur/MiniCluster.java b/src/blur-core/src/test/java/com/nearinfinity/blur/MiniCluster.java
index 5c8e1da..d61e2d9 100644
--- a/src/blur-core/src/test/java/com/nearinfinity/blur/MiniCluster.java
+++ b/src/blur-core/src/test/java/com/nearinfinity/blur/MiniCluster.java
@@ -1,5 +1,22 @@
 package com.nearinfinity.blur;
 
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 import static com.nearinfinity.blur.utils.BlurConstants.*;
 import static com.nearinfinity.blur.utils.BlurConstants.BLUR_SHARD_BLOCKCACHE_SLAB_COUNT;
 import static com.nearinfinity.blur.utils.BlurConstants.BLUR_ZOOKEEPER_CONNECTION;

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/d9b19584/src/blur-core/src/test/java/com/nearinfinity/blur/analysis/BlurAnalyzerTest.java
----------------------------------------------------------------------
diff --git a/src/blur-core/src/test/java/com/nearinfinity/blur/analysis/BlurAnalyzerTest.java b/src/blur-core/src/test/java/com/nearinfinity/blur/analysis/BlurAnalyzerTest.java
index f8b3eab..54735fd 100644
--- a/src/blur-core/src/test/java/com/nearinfinity/blur/analysis/BlurAnalyzerTest.java
+++ b/src/blur-core/src/test/java/com/nearinfinity/blur/analysis/BlurAnalyzerTest.java
@@ -1,11 +1,14 @@
-/*
- * Copyright (C) 2011 Near Infinity Corporation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+package com.nearinfinity.blur.analysis;
+
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  *
- * http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -14,8 +17,6 @@
  * limitations under the License.
  */
 
-package com.nearinfinity.blur.analysis;
-
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNull;

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/d9b19584/src/blur-core/src/test/java/com/nearinfinity/blur/analysis/LongAnalyzerTest.java
----------------------------------------------------------------------
diff --git a/src/blur-core/src/test/java/com/nearinfinity/blur/analysis/LongAnalyzerTest.java b/src/blur-core/src/test/java/com/nearinfinity/blur/analysis/LongAnalyzerTest.java
index 5d781af..63692ab 100644
--- a/src/blur-core/src/test/java/com/nearinfinity/blur/analysis/LongAnalyzerTest.java
+++ b/src/blur-core/src/test/java/com/nearinfinity/blur/analysis/LongAnalyzerTest.java
@@ -1,5 +1,22 @@
 package com.nearinfinity.blur.analysis;
 
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/d9b19584/src/blur-core/src/test/java/com/nearinfinity/blur/lucene/search/FacetQueryTest.java
----------------------------------------------------------------------
diff --git a/src/blur-core/src/test/java/com/nearinfinity/blur/lucene/search/FacetQueryTest.java b/src/blur-core/src/test/java/com/nearinfinity/blur/lucene/search/FacetQueryTest.java
index 558d1c1..d6299b0 100644
--- a/src/blur-core/src/test/java/com/nearinfinity/blur/lucene/search/FacetQueryTest.java
+++ b/src/blur-core/src/test/java/com/nearinfinity/blur/lucene/search/FacetQueryTest.java
@@ -1,5 +1,22 @@
 package com.nearinfinity.blur.lucene.search;
 
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 import java.io.IOException;
 import java.util.concurrent.atomic.AtomicLongArray;
 
@@ -45,22 +62,21 @@ public class FacetQueryTest {
     BooleanQuery bq = new BooleanQuery();
     bq.add(new TermQuery(new Term("f1", "value")), Occur.SHOULD);
     bq.add(new TermQuery(new Term("f2", "v3")), Occur.SHOULD);
-    
+
     Query f1 = new TermQuery(new Term("f2", "v4"));
-    
-    
+
     BooleanQuery f2 = new BooleanQuery();
     f2.add(new TermQuery(new Term("f1", "value")), Occur.MUST);
     f2.add(new TermQuery(new Term("f2", "v3")), Occur.MUST);
-    
+
     Query[] facets = new Query[] { f1, f2 };
-    
+
     AtomicLongArray counts = new AtomicLongArray(facets.length);
     FacetQuery facetQuery = new FacetQuery(bq, facets, counts);
-    
+
     IndexSearcher indexSearcher = new IndexSearcher(reader);
     TopDocs topDocs = indexSearcher.search(facetQuery, 10);
-    
+
     for (int i = 0; i < counts.length(); i++) {
       System.out.println(counts.get(i));
     }

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/d9b19584/src/blur-core/src/test/java/com/nearinfinity/blur/manager/IndexManagerTest.java
----------------------------------------------------------------------
diff --git a/src/blur-core/src/test/java/com/nearinfinity/blur/manager/IndexManagerTest.java b/src/blur-core/src/test/java/com/nearinfinity/blur/manager/IndexManagerTest.java
index d58495d..3d86493 100644
--- a/src/blur-core/src/test/java/com/nearinfinity/blur/manager/IndexManagerTest.java
+++ b/src/blur-core/src/test/java/com/nearinfinity/blur/manager/IndexManagerTest.java
@@ -1,11 +1,14 @@
-/*
- * Copyright (C) 2011 Near Infinity Corporation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+package com.nearinfinity.blur.manager;
+
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  *
- * http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -14,8 +17,6 @@
  * limitations under the License.
  */
 
-package com.nearinfinity.blur.manager;
-
 import static com.nearinfinity.blur.thrift.generated.RecordMutationType.APPEND_COLUMN_VALUES;
 import static com.nearinfinity.blur.thrift.generated.RecordMutationType.DELETE_ENTIRE_RECORD;
 import static com.nearinfinity.blur.thrift.generated.RecordMutationType.REPLACE_COLUMNS;
@@ -123,15 +124,16 @@ public class IndexManagerTest {
     RowMutation mutation4 = newRowMutation(TABLE, "row-4",
         newRecordMutation(FAMILY, "record-4", newColumn("testcol1", "value1"), newColumn("testcol2", "value5"), newColumn("testcol3", "value9")),
         newRecordMutation(FAMILY, "record-4B", newColumn("testcol2", "value234123"), newColumn("testcol3", "value234123")));
-    RowMutation mutation5 = newRowMutation(TABLE,"row-5",
+    RowMutation mutation5 = newRowMutation(
+        TABLE,
+        "row-5",
         newRecordMutation(FAMILY, "record-5A", newColumn("testcol1", "value13"), newColumn("testcol2", "value14"), newColumn("testcol3", "value15")),
-        newRecordMutation(FAMILY, "record-5B", newColumn("testcol1", "value16"), newColumn("testcol2", "value17"), newColumn("testcol3", "value18"), newColumn("testcol3", "value19")));
-    RowMutation mutation6 = newRowMutation(TABLE, "row-6", 
-        newRecordMutation(FAMILY, "record-6A", newColumn("testcol12", "value110"), newColumn("testcol13", "value102")),
+        newRecordMutation(FAMILY, "record-5B", newColumn("testcol1", "value16"), newColumn("testcol2", "value17"), newColumn("testcol3", "value18"),
+            newColumn("testcol3", "value19")));
+    RowMutation mutation6 = newRowMutation(TABLE, "row-6", newRecordMutation(FAMILY, "record-6A", newColumn("testcol12", "value110"), newColumn("testcol13", "value102")),
         newRecordMutation(FAMILY, "record-6B", newColumn("testcol12", "value101"), newColumn("testcol13", "value104")),
         newRecordMutation(FAMILY2, "record-6C", newColumn("testcol18", "value501")));
-    RowMutation mutation7 = newRowMutation(TABLE, "row-7", 
-        newRecordMutation(FAMILY, "record-7A", newColumn("testcol12", "value101"), newColumn("testcol13", "value102")),
+    RowMutation mutation7 = newRowMutation(TABLE, "row-7", newRecordMutation(FAMILY, "record-7A", newColumn("testcol12", "value101"), newColumn("testcol13", "value102")),
         newRecordMutation(FAMILY2, "record-7B", newColumn("testcol18", "value501")));
     mutation7.waitToBeVisible = true;
     indexManager.mutate(mutation1);
@@ -165,7 +167,7 @@ public class IndexManagerTest {
       assertNull(fetchResult.recordResult);
     }
   }
-  
+
   @Test
   public void testQueryWithJoin() throws Exception {
     BlurQuery blurQuery = new BlurQuery();

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/d9b19584/src/blur-core/src/test/java/com/nearinfinity/blur/manager/clusterstatus/ZookeeperClusterStatusTest.java
----------------------------------------------------------------------
diff --git a/src/blur-core/src/test/java/com/nearinfinity/blur/manager/clusterstatus/ZookeeperClusterStatusTest.java b/src/blur-core/src/test/java/com/nearinfinity/blur/manager/clusterstatus/ZookeeperClusterStatusTest.java
index d3f6869..c75b074 100644
--- a/src/blur-core/src/test/java/com/nearinfinity/blur/manager/clusterstatus/ZookeeperClusterStatusTest.java
+++ b/src/blur-core/src/test/java/com/nearinfinity/blur/manager/clusterstatus/ZookeeperClusterStatusTest.java
@@ -1,5 +1,22 @@
 package com.nearinfinity.blur.manager.clusterstatus;
 
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNull;
@@ -159,7 +176,7 @@ public class ZookeeperClusterStatusTest {
     assertFalse(clusterStatus.isEnabled(false, DEFAULT, "disabledtable"));
     assertFalse(clusterStatus.isEnabled(true, DEFAULT, "disabledtable"));
   }
-  
+
   @Test
   public void testIsEnabledEnabledTable() throws KeeperException, InterruptedException {
     createTable("enabledtable", true);

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/d9b19584/src/blur-core/src/test/java/com/nearinfinity/blur/manager/indexserver/DistributedLayoutManagerTest.java
----------------------------------------------------------------------
diff --git a/src/blur-core/src/test/java/com/nearinfinity/blur/manager/indexserver/DistributedLayoutManagerTest.java b/src/blur-core/src/test/java/com/nearinfinity/blur/manager/indexserver/DistributedLayoutManagerTest.java
index 3f4cb4c..ac1ccf6 100644
--- a/src/blur-core/src/test/java/com/nearinfinity/blur/manager/indexserver/DistributedLayoutManagerTest.java
+++ b/src/blur-core/src/test/java/com/nearinfinity/blur/manager/indexserver/DistributedLayoutManagerTest.java
@@ -1,11 +1,14 @@
-/*
- * Copyright (C) 2011 Near Infinity Corporation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+package com.nearinfinity.blur.manager.indexserver;
+
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  *
- * http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -14,8 +17,6 @@
  * limitations under the License.
  */
 
-package com.nearinfinity.blur.manager.indexserver;
-
 import static org.junit.Assert.*;
 
 import java.util.Arrays;

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/d9b19584/src/blur-core/src/test/java/com/nearinfinity/blur/manager/results/BlurResultPeekableIteratorComparatorTest.java
----------------------------------------------------------------------
diff --git a/src/blur-core/src/test/java/com/nearinfinity/blur/manager/results/BlurResultPeekableIteratorComparatorTest.java b/src/blur-core/src/test/java/com/nearinfinity/blur/manager/results/BlurResultPeekableIteratorComparatorTest.java
index 67d7fe8..22ce8e2 100644
--- a/src/blur-core/src/test/java/com/nearinfinity/blur/manager/results/BlurResultPeekableIteratorComparatorTest.java
+++ b/src/blur-core/src/test/java/com/nearinfinity/blur/manager/results/BlurResultPeekableIteratorComparatorTest.java
@@ -1,11 +1,14 @@
-/*
- * Copyright (C) 2011 Near Infinity Corporation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+package com.nearinfinity.blur.manager.results;
+
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  *
- * http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -14,8 +17,6 @@
  * limitations under the License.
  */
 
-package com.nearinfinity.blur.manager.results;
-
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/d9b19584/src/blur-core/src/test/java/com/nearinfinity/blur/manager/results/MultipleBlurResultIterableTest.java
----------------------------------------------------------------------
diff --git a/src/blur-core/src/test/java/com/nearinfinity/blur/manager/results/MultipleBlurResultIterableTest.java b/src/blur-core/src/test/java/com/nearinfinity/blur/manager/results/MultipleBlurResultIterableTest.java
index b637e10..15fa0ce 100644
--- a/src/blur-core/src/test/java/com/nearinfinity/blur/manager/results/MultipleBlurResultIterableTest.java
+++ b/src/blur-core/src/test/java/com/nearinfinity/blur/manager/results/MultipleBlurResultIterableTest.java
@@ -1,11 +1,14 @@
-/*
- * Copyright (C) 2011 Near Infinity Corporation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+package com.nearinfinity.blur.manager.results;
+
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  *
- * http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -14,8 +17,6 @@
  * limitations under the License.
  */
 
-package com.nearinfinity.blur.manager.results;
-
 import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/d9b19584/src/blur-core/src/test/java/com/nearinfinity/blur/manager/results/PeekableIteratorTest.java
----------------------------------------------------------------------
diff --git a/src/blur-core/src/test/java/com/nearinfinity/blur/manager/results/PeekableIteratorTest.java b/src/blur-core/src/test/java/com/nearinfinity/blur/manager/results/PeekableIteratorTest.java
index fb0818b..1d739b1 100644
--- a/src/blur-core/src/test/java/com/nearinfinity/blur/manager/results/PeekableIteratorTest.java
+++ b/src/blur-core/src/test/java/com/nearinfinity/blur/manager/results/PeekableIteratorTest.java
@@ -1,11 +1,14 @@
-/*
- * Copyright (C) 2011 Near Infinity Corporation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+package com.nearinfinity.blur.manager.results;
+
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  *
- * http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -14,8 +17,6 @@
  * limitations under the License.
  */
 
-package com.nearinfinity.blur.manager.results;
-
 import java.util.ArrayList;
 import java.util.Arrays;
 

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/d9b19584/src/blur-core/src/test/java/com/nearinfinity/blur/manager/stats/WeightedAvgTest.java
----------------------------------------------------------------------
diff --git a/src/blur-core/src/test/java/com/nearinfinity/blur/manager/stats/WeightedAvgTest.java b/src/blur-core/src/test/java/com/nearinfinity/blur/manager/stats/WeightedAvgTest.java
index 97f61c6..c0aac9c 100644
--- a/src/blur-core/src/test/java/com/nearinfinity/blur/manager/stats/WeightedAvgTest.java
+++ b/src/blur-core/src/test/java/com/nearinfinity/blur/manager/stats/WeightedAvgTest.java
@@ -1,5 +1,22 @@
 package com.nearinfinity.blur.manager.stats;
 
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/d9b19584/src/blur-core/src/test/java/com/nearinfinity/blur/manager/writer/BlurNRTIndexTest.java
----------------------------------------------------------------------
diff --git a/src/blur-core/src/test/java/com/nearinfinity/blur/manager/writer/BlurNRTIndexTest.java b/src/blur-core/src/test/java/com/nearinfinity/blur/manager/writer/BlurNRTIndexTest.java
index ee47a99..9b010e0 100644
--- a/src/blur-core/src/test/java/com/nearinfinity/blur/manager/writer/BlurNRTIndexTest.java
+++ b/src/blur-core/src/test/java/com/nearinfinity/blur/manager/writer/BlurNRTIndexTest.java
@@ -1,5 +1,22 @@
 package com.nearinfinity.blur.manager.writer;
 
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 import static org.junit.Assert.assertEquals;
 
 import java.io.File;

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/d9b19584/src/blur-core/src/test/java/com/nearinfinity/blur/manager/writer/DirectoryReferenceCounterTest.java
----------------------------------------------------------------------
diff --git a/src/blur-core/src/test/java/com/nearinfinity/blur/manager/writer/DirectoryReferenceCounterTest.java b/src/blur-core/src/test/java/com/nearinfinity/blur/manager/writer/DirectoryReferenceCounterTest.java
index 310c575..0636ee6 100644
--- a/src/blur-core/src/test/java/com/nearinfinity/blur/manager/writer/DirectoryReferenceCounterTest.java
+++ b/src/blur-core/src/test/java/com/nearinfinity/blur/manager/writer/DirectoryReferenceCounterTest.java
@@ -1,5 +1,22 @@
 package com.nearinfinity.blur.manager.writer;
 
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
@@ -49,7 +66,7 @@ public class DirectoryReferenceCounterTest {
       }
       fail();
     } catch (Exception e) {
-      //should error
+      // should error
     }
   }
 
@@ -101,7 +118,7 @@ public class DirectoryReferenceCounterTest {
     document.add(new Field("id", "value", Store.YES, Index.NOT_ANALYZED_NO_NORMS));
     return document;
   }
-  
+
   private void checkReader(IndexReader indexReader, int size) throws CorruptIndexException, IOException {
     for (int i = 0; i < size; i++) {
       Document document = indexReader.document(i);
@@ -109,8 +126,9 @@ public class DirectoryReferenceCounterTest {
       assertEquals(value, "value");
     }
   }
-  
-  // This class is use simulate what would happen with a directory that will forcefully delete files even if they are still in use. e.g. HDFSDirectory
+
+  // This class is use simulate what would happen with a directory that will
+  // forcefully delete files even if they are still in use. e.g. HDFSDirectory
   public static Directory wrap(final RAMDirectory ramDirectory) {
     return new Directory() {
       private Directory d = ramDirectory;
@@ -210,7 +228,7 @@ public class DirectoryReferenceCounterTest {
   public static IndexInput wrap(final IndexInput input, final Collection<String> deletedFiles, final String name) {
     return new IndexInput() {
       private IndexInput in = input;
-      
+
       private void checkForDeleted() throws IOException {
         if (deletedFiles.contains(name)) {
           throw new IOException("File [" + name + "] does not exist");

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/d9b19584/src/blur-core/src/test/java/com/nearinfinity/blur/manager/writer/TransactionRecorderTest.java
----------------------------------------------------------------------
diff --git a/src/blur-core/src/test/java/com/nearinfinity/blur/manager/writer/TransactionRecorderTest.java b/src/blur-core/src/test/java/com/nearinfinity/blur/manager/writer/TransactionRecorderTest.java
index 3c68402..54ba6c8 100644
--- a/src/blur-core/src/test/java/com/nearinfinity/blur/manager/writer/TransactionRecorderTest.java
+++ b/src/blur-core/src/test/java/com/nearinfinity/blur/manager/writer/TransactionRecorderTest.java
@@ -1,5 +1,22 @@
 package com.nearinfinity.blur.manager.writer;
 
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 import static org.junit.Assert.*;
 
 import java.io.File;
@@ -26,15 +43,15 @@ public class TransactionRecorderTest {
   public void testReplay() throws IOException {
     String tmpPath = "./tmp/transaction-recorder/wal";
     rm(new File(tmpPath));
-    
+
     KeywordAnalyzer analyzer = new KeywordAnalyzer();
     Configuration configuration = new Configuration();
     BlurAnalyzer blurAnalyzer = new BlurAnalyzer(analyzer);
-    
+
     TransactionRecorder transactionRecorder = new TransactionRecorder();
     transactionRecorder.setAnalyzer(blurAnalyzer);
     transactionRecorder.setConfiguration(configuration);
-    
+
     transactionRecorder.setWalPath(new Path(tmpPath));
     transactionRecorder.init();
     transactionRecorder.open();
@@ -43,18 +60,19 @@ public class TransactionRecorderTest {
       fail("Should NPE");
     } catch (NullPointerException e) {
     }
-    transactionRecorder.close(); //this is done so that the rawfs will flush the file to disk for reading
-    
+    transactionRecorder.close(); // this is done so that the rawfs will flush
+                                 // the file to disk for reading
+
     RAMDirectory directory = new RAMDirectory();
     IndexWriterConfig conf = new IndexWriterConfig(Version.LUCENE_35, analyzer);
     IndexWriter writer = new IndexWriter(directory, conf);
-    
+
     TransactionRecorder replayTransactionRecorder = new TransactionRecorder();
     replayTransactionRecorder.setAnalyzer(blurAnalyzer);
     replayTransactionRecorder.setConfiguration(configuration);
     replayTransactionRecorder.setWalPath(new Path(tmpPath));
     replayTransactionRecorder.init();
-    
+
     replayTransactionRecorder.replay(writer);
     IndexReader reader = IndexReader.open(directory);
     assertEquals(1, reader.numDocs());

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/d9b19584/src/blur-core/src/test/java/com/nearinfinity/blur/search/RandomSuperQueryTest.java
----------------------------------------------------------------------
diff --git a/src/blur-core/src/test/java/com/nearinfinity/blur/search/RandomSuperQueryTest.java b/src/blur-core/src/test/java/com/nearinfinity/blur/search/RandomSuperQueryTest.java
index d94604a..c716e68 100644
--- a/src/blur-core/src/test/java/com/nearinfinity/blur/search/RandomSuperQueryTest.java
+++ b/src/blur-core/src/test/java/com/nearinfinity/blur/search/RandomSuperQueryTest.java
@@ -1,11 +1,14 @@
-/*
- * Copyright (C) 2011 Near Infinity Corporation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+package com.nearinfinity.blur.search;
+
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  *
- * http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -14,8 +17,6 @@
  * limitations under the License.
  */
 
-package com.nearinfinity.blur.search;
-
 import static com.nearinfinity.blur.lucene.LuceneConstant.LUCENE_VERSION;
 import static junit.framework.Assert.assertTrue;
 
@@ -50,6 +51,7 @@ import com.nearinfinity.blur.thrift.generated.Record;
 import com.nearinfinity.blur.thrift.generated.Row;
 import com.nearinfinity.blur.thrift.generated.ScoreType;
 import com.nearinfinity.blur.utils.RowIndexWriter;
+
 public class RandomSuperQueryTest {
 
   private static final int MOD_COLS_USED_FOR_SKIPPING = 3;

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/d9b19584/src/blur-core/src/test/java/com/nearinfinity/blur/search/SuperQueryTest.java
----------------------------------------------------------------------
diff --git a/src/blur-core/src/test/java/com/nearinfinity/blur/search/SuperQueryTest.java b/src/blur-core/src/test/java/com/nearinfinity/blur/search/SuperQueryTest.java
index 0765155..0dbaf84 100644
--- a/src/blur-core/src/test/java/com/nearinfinity/blur/search/SuperQueryTest.java
+++ b/src/blur-core/src/test/java/com/nearinfinity/blur/search/SuperQueryTest.java
@@ -1,11 +1,14 @@
-/*
- * Copyright (C) 2011 Near Infinity Corporation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+package com.nearinfinity.blur.search;
+
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  *
- * http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -14,8 +17,6 @@
  * limitations under the License.
  */
 
-package com.nearinfinity.blur.search;
-
 import static com.nearinfinity.blur.lucene.LuceneConstant.LUCENE_VERSION;
 import static com.nearinfinity.blur.utils.BlurConstants.PRIME_DOC;
 import static com.nearinfinity.blur.utils.BlurConstants.PRIME_DOC_VALUE;

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/d9b19584/src/blur-core/src/test/java/com/nearinfinity/blur/search/TestingPagingCollector.java
----------------------------------------------------------------------
diff --git a/src/blur-core/src/test/java/com/nearinfinity/blur/search/TestingPagingCollector.java b/src/blur-core/src/test/java/com/nearinfinity/blur/search/TestingPagingCollector.java
index 1702b04..3497397 100644
--- a/src/blur-core/src/test/java/com/nearinfinity/blur/search/TestingPagingCollector.java
+++ b/src/blur-core/src/test/java/com/nearinfinity/blur/search/TestingPagingCollector.java
@@ -1,22 +1,7 @@
-/*
- * Copyright (C) 2011 Near Infinity Corporation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
 package com.nearinfinity.blur.search;
 
 /**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to You under the Apache License, Version 2.0
@@ -31,6 +16,7 @@ package com.nearinfinity.blur.search;
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 import static com.nearinfinity.blur.lucene.LuceneConstant.LUCENE_VERSION;
 
 import java.util.concurrent.atomic.AtomicBoolean;

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/d9b19584/src/blur-core/src/test/java/com/nearinfinity/blur/thrift/BlurClusterTest.java
----------------------------------------------------------------------
diff --git a/src/blur-core/src/test/java/com/nearinfinity/blur/thrift/BlurClusterTest.java b/src/blur-core/src/test/java/com/nearinfinity/blur/thrift/BlurClusterTest.java
index 1192921..2ae8b37 100644
--- a/src/blur-core/src/test/java/com/nearinfinity/blur/thrift/BlurClusterTest.java
+++ b/src/blur-core/src/test/java/com/nearinfinity/blur/thrift/BlurClusterTest.java
@@ -1,5 +1,22 @@
 package com.nearinfinity.blur.thrift;
 
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 import static org.junit.Assert.assertEquals;
 
 import java.io.IOException;

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/d9b19584/src/blur-core/src/test/java/com/nearinfinity/blur/thrift/BlurControllerServerTest.java
----------------------------------------------------------------------
diff --git a/src/blur-core/src/test/java/com/nearinfinity/blur/thrift/BlurControllerServerTest.java b/src/blur-core/src/test/java/com/nearinfinity/blur/thrift/BlurControllerServerTest.java
index 7f6d590..87c1fd6 100644
--- a/src/blur-core/src/test/java/com/nearinfinity/blur/thrift/BlurControllerServerTest.java
+++ b/src/blur-core/src/test/java/com/nearinfinity/blur/thrift/BlurControllerServerTest.java
@@ -1,11 +1,14 @@
-/*
- * Copyright (C) 2011 Near Infinity Corporation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+package com.nearinfinity.blur.thrift;
+
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  *
- * http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -14,301 +17,318 @@
  * limitations under the License.
  */
 
-package com.nearinfinity.blur.thrift;
-
 import org.junit.Test;
 
-
 public class BlurControllerServerTest {
-  
+
   @Test
   public void testNothing() {
-    //do nothing
+    // do nothing
   }
 
-//  private static final String TABLE = "test";
-//  private static Map<String, Iface> shardServers = new HashMap<String, Iface>();
-//  private static BlurControllerServer server;
-//  private static Thread daemonService;
-//
-//  @BeforeClass
-//  public static void zkServerStartup() throws InterruptedException, KeeperException, IOException, BlurException, TException {
-//    rm(new File("../zk-tmp"));
-//    daemonService = new Thread(new Runnable() {
-//      @Override
-//      public void run() {
-//        QuorumPeerMain.main(new String[]{"./src/test/resources/com/nearinfinity/blur/thrift/zoo.cfg"});
-//      }
-//    });
-//    daemonService.start();
-//    Thread.sleep(1000);
-//    
-//    ZooKeeper zookeeper = new ZooKeeper("127.0.0.1:10101", 30000, new Watcher() {
-//      @Override
-//      public void process(WatchedEvent event) {
-//        
-//      }
-//    });
-//    
-//    addShardServer("shard-00000000");
-//    addShardServer("shard-00000001");
-//    addShardServer("shard-00000002");
-//    BlurQueryChecker queryChecker = new BlurQueryChecker(new BlurConfiguration());
-//    server = new BlurControllerServer();
-//    server.setClient(getClient());
-//    server.setClusterStatus(new ZookeeperClusterStatus(zookeeper));
-//    server.setQueryChecker(queryChecker);
-//    server.setZookeeper(zookeeper);
-//    server.init();
-//    
-//    File file = new File("./tmp-data/test");
-//    rm(file);
-//    
-//    TableDescriptor tableDescriptor = new TableDescriptor();
-//    tableDescriptor.name = "test";
-//    tableDescriptor.shardCount = 3;
-//    tableDescriptor.tableUri = file.toURI().toString();
-//    tableDescriptor.analyzerDefinition = new AnalyzerDefinition();
-//    server.createTable(tableDescriptor);
-//  }
-//  
-//  @AfterClass
-//  public static void zkServerShutdown() {
-//    daemonService.interrupt();
-//    server.close();
-//  }
-//
-//  private static void rm(File file) {
-//    if (file.isDirectory()) {
-//      for (File f : file.listFiles()) {
-//        rm(f);
-//      }
-//    }
-//    file.delete();
-//  }
-//
-//  @Test
-//  public void testQuery() throws BlurException, TException {
-//    BlurQuery blurQuery = new BlurQuery();
-//    blurQuery.maxQueryTime = TimeUnit.SECONDS.toMillis(5);
-//    blurQuery.minimumNumberOfResults = Long.MAX_VALUE;
-//    BlurResults results = server.query(TABLE, blurQuery);
-//    assertNotNull(results);
-//  }
-//
-//  @Test
-//  public void testQueryWithFacets() throws BlurException, TException {
-//    BlurQuery blurQuery = new BlurQuery();
-//    blurQuery.maxQueryTime = TimeUnit.SECONDS.toMillis(5);
-//    blurQuery.minimumNumberOfResults = Long.MAX_VALUE;
-//    blurQuery.facets = new ArrayList<Facet>();
-//    blurQuery.facets.add(new Facet());
-//    blurQuery.facets.add(new Facet());
-//    BlurResults results = server.query(TABLE, blurQuery);
-//    assertNotNull(results);
-//    assertNotNull(results.facetCounts);
-//    for (int i = 0; i < results.facetCounts.size(); i++) {
-//      long count = results.facetCounts.get(i);
-//      assertEquals(shardServers.size() * (i + 1), count);
-//    }
-//  }
-//
-//  @Test
-//  public void testRecordFrequency() throws BlurException, TException {
-//    long recordFrequency = server.recordFrequency(TABLE, "cf", "cn", "value");
-//    assertEquals(shardServers.size(), recordFrequency);
-//  }
-//
-//  @Test
-//  public void testMutate() throws BlurException, TException {
-//    RowMutation mutation = new RowMutation();
-//    mutation.setRowId("1234");
-//    RecordMutation recMut = new RecordMutation();
-//    Record record = new Record();
-//    record.setFamily("test");
-//    record.setRecordId("5678");
-//    record.addToColumns(new Column("name", "value"));
-//    mutation.addToRecordMutations(recMut);
-//    mutation.table = TABLE;
-//    server.mutate(mutation);
-//
-//    Selector selector = new Selector();
-//    selector.rowId = "1234";
-//
-//    FetchResult fetchRow = server.fetchRow(TABLE, selector);
-//    assertNotNull(fetchRow.rowResult);
-//  }
-//
-//  private static BlurClient getClient() {
-//    BlurClientEmbedded blurClientEmbedded = new BlurClientEmbedded();
-//    for (String node : shardServers.keySet()) {
-//      blurClientEmbedded.putNode(node, shardServers.get(node));
-//    }
-//    return blurClientEmbedded;
-//  }
-//
-//  private static Iface getShardServer(final String node) {
-//    return new Iface() {
-//
-//      private Map<String, Map<String, Row>> rows = new HashMap<String, Map<String, Row>>();
-//
-//      @Override
-//      public List<String> terms(String arg0, String arg1, String arg2, String arg3, short arg4) throws BlurException, TException {
-//        throw new RuntimeException("no impl");
-//      }
-//
-//      @Override
-//      public List<String> tableList() throws BlurException, TException {
-//        List<String> table = new ArrayList<String>();
-//        table.add(TABLE);
-//        return table;
-//      }
-//
-//      @Override
-//      public List<String> shardServerList(String cluster) throws BlurException, TException {
-//        throw new RuntimeException("no impl");
-//      }
-//
-//      @Override
-//      public Map<String, String> shardServerLayout(String table) throws BlurException, TException {
-//        Map<String, String> layout = new HashMap<String, String>();
-//        layout.put(node, node);
-//        return layout;
-//      }
-//
-//      @Override
-//      public BlurResults query(String table, BlurQuery query) throws BlurException, TException {
-//        BlurResults results = new BlurResults();
-//        results.putToShardInfo(node, 0);
-//        results.setFacetCounts(getFacetCounts(query));
-//        return results;
-//      }
-//
-//      private List<Long> getFacetCounts(BlurQuery query) {
-//        if (query.facets != null) {
-//          int size = query.facets.size();
-//          List<Long> results = new ArrayList<Long>();
-//          for (int i = 0; i < size; i++) {
-//            results.add(i + 1L);
-//          }
-//          return results;
-//        }
-//        return null;
-//      }
-//
-//      @Override
-//      public Schema schema(String arg0) throws BlurException, TException {
-//        throw new RuntimeException("no impl");
-//      }
-//
-//      @Override
-//      public long recordFrequency(String arg0, String arg1, String arg2, String arg3) throws BlurException, TException {
-//        return 1l;
-//      }
-//
-//      @Override
-//      public FetchResult fetchRow(String table, Selector selector) throws BlurException, TException {
-//        Map<String, Row> map = rows.get(table);
-//        Row row = map.get(selector.rowId);
-//        FetchResult fetchResult = new FetchResult();
-//        fetchResult.setRowResult(new FetchRowResult(row));
-//        return fetchResult;
-//      }
-//
-//      @Override
-//      public TableDescriptor describe(String arg0) throws BlurException, TException {
-//        TableDescriptor descriptor = new TableDescriptor();
-//        descriptor.isEnabled = true;
-//        descriptor.shardCount = 3;
-//        return descriptor;
-//      }
-//
-//      @Override
-//      public List<BlurQueryStatus> currentQueries(String arg0) throws BlurException, TException {
-//        throw new RuntimeException("no impl");
-//      }
-//
-//      @Override
-//      public List<String> controllerServerList() throws BlurException, TException {
-//        throw new RuntimeException("no impl");
-//      }
-//
-//      @Override
-//      public void cancelQuery(String table, long arg0) throws BlurException, TException {
-//        throw new RuntimeException("no impl");
-//      }
-//
-//      private Row toRow(RowMutation mutation) {
-//        Row row = new Row();
-//        row.id = mutation.rowId;
-//        row.records = toRecords(mutation.recordMutations);
-//        return row;
-//      }
-//
-//      private List<Record> toRecords(List<RecordMutation> recordMutations) {
-//        List<Record> records = new ArrayList<Record>();
-//        for (RecordMutation mutation : recordMutations) {
-//          records.add(mutation.record);
-//        }
-//        return records;
-//      }
-//
-//      @Override
-//      public void createTable(TableDescriptor tableDescriptor) throws BlurException, TException {
-//        throw new RuntimeException("not impl");
-//      }
-//
-//      @Override
-//      public void disableTable(String table) throws BlurException, TException {
-//        throw new RuntimeException("not impl");
-//      }
-//
-//      @Override
-//      public void enableTable(String table) throws BlurException, TException {
-//        throw new RuntimeException("not impl");
-//      }
-//
-//      @Override
-//      public void removeTable(String table, boolean deleteIndexFiles) throws BlurException, TException {
-//        throw new RuntimeException("not impl");
-//      }
-//
-//      @Override
-//      public TableStats getTableStats(String table) throws BlurException, TException {
-//        return new TableStats();
-//      }
-//
-//      @Override
-//      public void mutate(RowMutation mutation) throws BlurException, TException {
-//        String table = mutation.table;
-//        Map<String, Row> map = rows.get(table);
-//        if (map == null) {
-//          map = new HashMap<String, Row>();
-//          rows.put(table, map);
-//        }
-//        Row row = toRow(mutation);
-//        map.put(row.id, row);
-//      }
-//
-//      @Override
-//      public void mutateBatch(List<RowMutation> mutations) throws BlurException, TException {
-//        for (RowMutation mutation : mutations) {
-//          MutationHelper.validateMutation(mutation);
-//        }
-//        for (RowMutation mutation : mutations) {
-//          mutate(mutation);
-//        }
-//      }
-//
-//      @Override
-//      public List<String> shardClusterList() throws BlurException, TException {
-//        throw new RuntimeException("no impl");
-//      }
-//    };
-//  }
-//
-//  private static void addShardServer(String node) {
-//    shardServers.put(node, getShardServer(node));
-//  }
+  // private static final String TABLE = "test";
+  // private static Map<String, Iface> shardServers = new HashMap<String,
+  // Iface>();
+  // private static BlurControllerServer server;
+  // private static Thread daemonService;
+  //
+  // @BeforeClass
+  // public static void zkServerStartup() throws InterruptedException,
+  // KeeperException, IOException, BlurException, TException {
+  // rm(new File("../zk-tmp"));
+  // daemonService = new Thread(new Runnable() {
+  // @Override
+  // public void run() {
+  // QuorumPeerMain.main(new
+  // String[]{"./src/test/resources/com/nearinfinity/blur/thrift/zoo.cfg"});
+  // }
+  // });
+  // daemonService.start();
+  // Thread.sleep(1000);
+  //
+  // ZooKeeper zookeeper = new ZooKeeper("127.0.0.1:10101", 30000, new Watcher()
+  // {
+  // @Override
+  // public void process(WatchedEvent event) {
+  //
+  // }
+  // });
+  //
+  // addShardServer("shard-00000000");
+  // addShardServer("shard-00000001");
+  // addShardServer("shard-00000002");
+  // BlurQueryChecker queryChecker = new BlurQueryChecker(new
+  // BlurConfiguration());
+  // server = new BlurControllerServer();
+  // server.setClient(getClient());
+  // server.setClusterStatus(new ZookeeperClusterStatus(zookeeper));
+  // server.setQueryChecker(queryChecker);
+  // server.setZookeeper(zookeeper);
+  // server.init();
+  //
+  // File file = new File("./tmp-data/test");
+  // rm(file);
+  //
+  // TableDescriptor tableDescriptor = new TableDescriptor();
+  // tableDescriptor.name = "test";
+  // tableDescriptor.shardCount = 3;
+  // tableDescriptor.tableUri = file.toURI().toString();
+  // tableDescriptor.analyzerDefinition = new AnalyzerDefinition();
+  // server.createTable(tableDescriptor);
+  // }
+  //
+  // @AfterClass
+  // public static void zkServerShutdown() {
+  // daemonService.interrupt();
+  // server.close();
+  // }
+  //
+  // private static void rm(File file) {
+  // if (file.isDirectory()) {
+  // for (File f : file.listFiles()) {
+  // rm(f);
+  // }
+  // }
+  // file.delete();
+  // }
+  //
+  // @Test
+  // public void testQuery() throws BlurException, TException {
+  // BlurQuery blurQuery = new BlurQuery();
+  // blurQuery.maxQueryTime = TimeUnit.SECONDS.toMillis(5);
+  // blurQuery.minimumNumberOfResults = Long.MAX_VALUE;
+  // BlurResults results = server.query(TABLE, blurQuery);
+  // assertNotNull(results);
+  // }
+  //
+  // @Test
+  // public void testQueryWithFacets() throws BlurException, TException {
+  // BlurQuery blurQuery = new BlurQuery();
+  // blurQuery.maxQueryTime = TimeUnit.SECONDS.toMillis(5);
+  // blurQuery.minimumNumberOfResults = Long.MAX_VALUE;
+  // blurQuery.facets = new ArrayList<Facet>();
+  // blurQuery.facets.add(new Facet());
+  // blurQuery.facets.add(new Facet());
+  // BlurResults results = server.query(TABLE, blurQuery);
+  // assertNotNull(results);
+  // assertNotNull(results.facetCounts);
+  // for (int i = 0; i < results.facetCounts.size(); i++) {
+  // long count = results.facetCounts.get(i);
+  // assertEquals(shardServers.size() * (i + 1), count);
+  // }
+  // }
+  //
+  // @Test
+  // public void testRecordFrequency() throws BlurException, TException {
+  // long recordFrequency = server.recordFrequency(TABLE, "cf", "cn", "value");
+  // assertEquals(shardServers.size(), recordFrequency);
+  // }
+  //
+  // @Test
+  // public void testMutate() throws BlurException, TException {
+  // RowMutation mutation = new RowMutation();
+  // mutation.setRowId("1234");
+  // RecordMutation recMut = new RecordMutation();
+  // Record record = new Record();
+  // record.setFamily("test");
+  // record.setRecordId("5678");
+  // record.addToColumns(new Column("name", "value"));
+  // mutation.addToRecordMutations(recMut);
+  // mutation.table = TABLE;
+  // server.mutate(mutation);
+  //
+  // Selector selector = new Selector();
+  // selector.rowId = "1234";
+  //
+  // FetchResult fetchRow = server.fetchRow(TABLE, selector);
+  // assertNotNull(fetchRow.rowResult);
+  // }
+  //
+  // private static BlurClient getClient() {
+  // BlurClientEmbedded blurClientEmbedded = new BlurClientEmbedded();
+  // for (String node : shardServers.keySet()) {
+  // blurClientEmbedded.putNode(node, shardServers.get(node));
+  // }
+  // return blurClientEmbedded;
+  // }
+  //
+  // private static Iface getShardServer(final String node) {
+  // return new Iface() {
+  //
+  // private Map<String, Map<String, Row>> rows = new HashMap<String,
+  // Map<String, Row>>();
+  //
+  // @Override
+  // public List<String> terms(String arg0, String arg1, String arg2, String
+  // arg3, short arg4) throws BlurException, TException {
+  // throw new RuntimeException("no impl");
+  // }
+  //
+  // @Override
+  // public List<String> tableList() throws BlurException, TException {
+  // List<String> table = new ArrayList<String>();
+  // table.add(TABLE);
+  // return table;
+  // }
+  //
+  // @Override
+  // public List<String> shardServerList(String cluster) throws BlurException,
+  // TException {
+  // throw new RuntimeException("no impl");
+  // }
+  //
+  // @Override
+  // public Map<String, String> shardServerLayout(String table) throws
+  // BlurException, TException {
+  // Map<String, String> layout = new HashMap<String, String>();
+  // layout.put(node, node);
+  // return layout;
+  // }
+  //
+  // @Override
+  // public BlurResults query(String table, BlurQuery query) throws
+  // BlurException, TException {
+  // BlurResults results = new BlurResults();
+  // results.putToShardInfo(node, 0);
+  // results.setFacetCounts(getFacetCounts(query));
+  // return results;
+  // }
+  //
+  // private List<Long> getFacetCounts(BlurQuery query) {
+  // if (query.facets != null) {
+  // int size = query.facets.size();
+  // List<Long> results = new ArrayList<Long>();
+  // for (int i = 0; i < size; i++) {
+  // results.add(i + 1L);
+  // }
+  // return results;
+  // }
+  // return null;
+  // }
+  //
+  // @Override
+  // public Schema schema(String arg0) throws BlurException, TException {
+  // throw new RuntimeException("no impl");
+  // }
+  //
+  // @Override
+  // public long recordFrequency(String arg0, String arg1, String arg2, String
+  // arg3) throws BlurException, TException {
+  // return 1l;
+  // }
+  //
+  // @Override
+  // public FetchResult fetchRow(String table, Selector selector) throws
+  // BlurException, TException {
+  // Map<String, Row> map = rows.get(table);
+  // Row row = map.get(selector.rowId);
+  // FetchResult fetchResult = new FetchResult();
+  // fetchResult.setRowResult(new FetchRowResult(row));
+  // return fetchResult;
+  // }
+  //
+  // @Override
+  // public TableDescriptor describe(String arg0) throws BlurException,
+  // TException {
+  // TableDescriptor descriptor = new TableDescriptor();
+  // descriptor.isEnabled = true;
+  // descriptor.shardCount = 3;
+  // return descriptor;
+  // }
+  //
+  // @Override
+  // public List<BlurQueryStatus> currentQueries(String arg0) throws
+  // BlurException, TException {
+  // throw new RuntimeException("no impl");
+  // }
+  //
+  // @Override
+  // public List<String> controllerServerList() throws BlurException, TException
+  // {
+  // throw new RuntimeException("no impl");
+  // }
+  //
+  // @Override
+  // public void cancelQuery(String table, long arg0) throws BlurException,
+  // TException {
+  // throw new RuntimeException("no impl");
+  // }
+  //
+  // private Row toRow(RowMutation mutation) {
+  // Row row = new Row();
+  // row.id = mutation.rowId;
+  // row.records = toRecords(mutation.recordMutations);
+  // return row;
+  // }
+  //
+  // private List<Record> toRecords(List<RecordMutation> recordMutations) {
+  // List<Record> records = new ArrayList<Record>();
+  // for (RecordMutation mutation : recordMutations) {
+  // records.add(mutation.record);
+  // }
+  // return records;
+  // }
+  //
+  // @Override
+  // public void createTable(TableDescriptor tableDescriptor) throws
+  // BlurException, TException {
+  // throw new RuntimeException("not impl");
+  // }
+  //
+  // @Override
+  // public void disableTable(String table) throws BlurException, TException {
+  // throw new RuntimeException("not impl");
+  // }
+  //
+  // @Override
+  // public void enableTable(String table) throws BlurException, TException {
+  // throw new RuntimeException("not impl");
+  // }
+  //
+  // @Override
+  // public void removeTable(String table, boolean deleteIndexFiles) throws
+  // BlurException, TException {
+  // throw new RuntimeException("not impl");
+  // }
+  //
+  // @Override
+  // public TableStats getTableStats(String table) throws BlurException,
+  // TException {
+  // return new TableStats();
+  // }
+  //
+  // @Override
+  // public void mutate(RowMutation mutation) throws BlurException, TException {
+  // String table = mutation.table;
+  // Map<String, Row> map = rows.get(table);
+  // if (map == null) {
+  // map = new HashMap<String, Row>();
+  // rows.put(table, map);
+  // }
+  // Row row = toRow(mutation);
+  // map.put(row.id, row);
+  // }
+  //
+  // @Override
+  // public void mutateBatch(List<RowMutation> mutations) throws BlurException,
+  // TException {
+  // for (RowMutation mutation : mutations) {
+  // MutationHelper.validateMutation(mutation);
+  // }
+  // for (RowMutation mutation : mutations) {
+  // mutate(mutation);
+  // }
+  // }
+  //
+  // @Override
+  // public List<String> shardClusterList() throws BlurException, TException {
+  // throw new RuntimeException("no impl");
+  // }
+  // };
+  // }
+  //
+  // private static void addShardServer(String node) {
+  // shardServers.put(node, getShardServer(node));
+  // }
 
 }

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/d9b19584/src/blur-core/src/test/java/com/nearinfinity/blur/thrift/BlurShardServerTest.java
----------------------------------------------------------------------
diff --git a/src/blur-core/src/test/java/com/nearinfinity/blur/thrift/BlurShardServerTest.java b/src/blur-core/src/test/java/com/nearinfinity/blur/thrift/BlurShardServerTest.java
index 7e1ac9f..004f043 100644
--- a/src/blur-core/src/test/java/com/nearinfinity/blur/thrift/BlurShardServerTest.java
+++ b/src/blur-core/src/test/java/com/nearinfinity/blur/thrift/BlurShardServerTest.java
@@ -1,11 +1,14 @@
-/*
- * Copyright (C) 2011 Near Infinity Corporation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+package com.nearinfinity.blur.thrift;
+
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  *
- * http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -14,8 +17,6 @@
  * limitations under the License.
  */
 
-package com.nearinfinity.blur.thrift;
-
 import java.io.IOException;
 import java.util.List;
 import java.util.Map;

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/d9b19584/src/blur-core/src/test/java/com/nearinfinity/blur/thrift/DoNothingServer.java
----------------------------------------------------------------------
diff --git a/src/blur-core/src/test/java/com/nearinfinity/blur/thrift/DoNothingServer.java b/src/blur-core/src/test/java/com/nearinfinity/blur/thrift/DoNothingServer.java
index a67ad5b..163fe7d 100644
--- a/src/blur-core/src/test/java/com/nearinfinity/blur/thrift/DoNothingServer.java
+++ b/src/blur-core/src/test/java/com/nearinfinity/blur/thrift/DoNothingServer.java
@@ -1,11 +1,14 @@
-/*
- * Copyright (C) 2011 Near Infinity Corporation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+package com.nearinfinity.blur.thrift;
+
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  *
- * http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -14,8 +17,6 @@
  * limitations under the License.
  */
 
-package com.nearinfinity.blur.thrift;
-
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -153,7 +154,7 @@ public class DoNothingServer implements Iface {
 
   @Override
   public void optimize(String table, int numberOfSegmentsPerShard) throws BlurException, TException {
-    
+
   }
 
   @Override

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/d9b19584/src/blur-core/src/test/java/com/nearinfinity/blur/utils/BlurUtilsTest.java
----------------------------------------------------------------------
diff --git a/src/blur-core/src/test/java/com/nearinfinity/blur/utils/BlurUtilsTest.java b/src/blur-core/src/test/java/com/nearinfinity/blur/utils/BlurUtilsTest.java
index d0ce3c8..d6d6ff0 100644
--- a/src/blur-core/src/test/java/com/nearinfinity/blur/utils/BlurUtilsTest.java
+++ b/src/blur-core/src/test/java/com/nearinfinity/blur/utils/BlurUtilsTest.java
@@ -1,5 +1,22 @@
 package com.nearinfinity.blur.utils;
 
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNull;
@@ -27,49 +44,49 @@ import com.nearinfinity.blur.thrift.generated.RecordMutation;
 import com.nearinfinity.blur.thrift.generated.RowMutation;
 
 public class BlurUtilsTest {
-  
+
   @Test
   public void testHumanizeTime1() {
     long time = TimeUnit.HOURS.toMillis(2) + TimeUnit.MINUTES.toMillis(42) + TimeUnit.SECONDS.toMillis(37) + TimeUnit.MILLISECONDS.toMillis(124);
     String humanizeTime = BlurUtil.humanizeTime(time, TimeUnit.MILLISECONDS);
     assertEquals("2 hours 42 minutes 37 seconds", humanizeTime);
   }
-  
+
   @Test
   public void testHumanizeTime2() {
     long time = TimeUnit.HOURS.toMillis(0) + TimeUnit.MINUTES.toMillis(42) + TimeUnit.SECONDS.toMillis(37) + TimeUnit.MILLISECONDS.toMillis(124);
     String humanizeTime = BlurUtil.humanizeTime(time, TimeUnit.MILLISECONDS);
     assertEquals("42 minutes 37 seconds", humanizeTime);
   }
-  
+
   @Test
   public void testHumanizeTime3() {
     long time = TimeUnit.HOURS.toMillis(2) + TimeUnit.MINUTES.toMillis(0) + TimeUnit.SECONDS.toMillis(37) + TimeUnit.MILLISECONDS.toMillis(124);
     String humanizeTime = BlurUtil.humanizeTime(time, TimeUnit.MILLISECONDS);
     assertEquals("2 hours 0 minutes 37 seconds", humanizeTime);
   }
-  
+
   @Test
   public void testHumanizeTime4() {
     long time = TimeUnit.HOURS.toMillis(2) + TimeUnit.MINUTES.toMillis(0) + TimeUnit.SECONDS.toMillis(0) + TimeUnit.MILLISECONDS.toMillis(124);
     String humanizeTime = BlurUtil.humanizeTime(time, TimeUnit.MILLISECONDS);
     assertEquals("2 hours 0 minutes 0 seconds", humanizeTime);
   }
-  
+
   @Test
   public void testHumanizeTime5() {
     long time = TimeUnit.HOURS.toMillis(0) + TimeUnit.MINUTES.toMillis(0) + TimeUnit.SECONDS.toMillis(37) + TimeUnit.MILLISECONDS.toMillis(124);
     String humanizeTime = BlurUtil.humanizeTime(time, TimeUnit.MILLISECONDS);
     assertEquals("37 seconds", humanizeTime);
   }
-  
+
   @Test
   public void testHumanizeTime6() {
     long time = TimeUnit.HOURS.toMillis(0) + TimeUnit.MINUTES.toMillis(0) + TimeUnit.SECONDS.toMillis(0) + TimeUnit.MILLISECONDS.toMillis(124);
     String humanizeTime = BlurUtil.humanizeTime(time, TimeUnit.MILLISECONDS);
     assertEquals("0 seconds", humanizeTime);
   }
-  
+
   @Test
   public void testMemoryUsage() throws CorruptIndexException, LockObtainFailedException, IOException {
     IndexReader reader = getReader();
@@ -91,12 +108,9 @@ public class BlurUtilsTest {
 
   @Test
   public void testRecordMutationMatch() {
-    RecordMutation rm1 = BlurUtil.newRecordMutation("test-family", "record-1",
-                                                    BlurUtil.newColumn("a", "b"));
-    RecordMutation rm2 = BlurUtil.newRecordMutation("test-family", "record-2",
-                                                    BlurUtil.newColumn("c", "d"));
-    RecordMutation rm3 = BlurUtil.newRecordMutation("test-family-2", "record-1",
-                                                    BlurUtil.newColumn("e", "f"));
+    RecordMutation rm1 = BlurUtil.newRecordMutation("test-family", "record-1", BlurUtil.newColumn("a", "b"));
+    RecordMutation rm2 = BlurUtil.newRecordMutation("test-family", "record-2", BlurUtil.newColumn("c", "d"));
+    RecordMutation rm3 = BlurUtil.newRecordMutation("test-family-2", "record-1", BlurUtil.newColumn("e", "f"));
     Record r = BlurUtil.newRecord("test-family", "record-1", BlurUtil.newColumn("g", "h"));
 
     assertTrue("should match with same family and record-id", BlurUtil.match(rm1, r));
@@ -106,12 +120,9 @@ public class BlurUtilsTest {
 
   @Test
   public void testFindRecordMutation() {
-    RecordMutation rm1 = BlurUtil.newRecordMutation("test-family", "record-1",
-                                                    BlurUtil.newColumn("a", "b"));
-    RecordMutation rm2 = BlurUtil.newRecordMutation("test-family", "record-2",
-                                                    BlurUtil.newColumn("c", "d"));
-    RecordMutation rm3 = BlurUtil.newRecordMutation("test-family-2", "record-1",
-                                                    BlurUtil.newColumn("e", "f"));
+    RecordMutation rm1 = BlurUtil.newRecordMutation("test-family", "record-1", BlurUtil.newColumn("a", "b"));
+    RecordMutation rm2 = BlurUtil.newRecordMutation("test-family", "record-2", BlurUtil.newColumn("c", "d"));
+    RecordMutation rm3 = BlurUtil.newRecordMutation("test-family-2", "record-1", BlurUtil.newColumn("e", "f"));
     RowMutation row = BlurUtil.newRowMutation("test-table", "row-123", rm1, rm2, rm3);
     Record r = BlurUtil.newRecord("test-family", "record-2", BlurUtil.newColumn("g", "h"));
     Record r2 = BlurUtil.newRecord("test-family", "record-99", BlurUtil.newColumn("g", "h"));
@@ -123,9 +134,9 @@ public class BlurUtilsTest {
   private IndexReader getReader() throws CorruptIndexException, LockObtainFailedException, IOException {
     RAMDirectory directory = new RAMDirectory();
     IndexWriterConfig conf = new IndexWriterConfig(LuceneConstant.LUCENE_VERSION, new KeywordAnalyzer());
-    IndexWriter writer = new IndexWriter(directory,conf);
+    IndexWriter writer = new IndexWriter(directory, conf);
     Document doc = new Document();
-    doc.add(new Field("a","b",Store.YES,Index.NOT_ANALYZED_NO_NORMS));
+    doc.add(new Field("a", "b", Store.YES, Index.NOT_ANALYZED_NO_NORMS));
     writer.addDocument(doc);
     writer.close();
     return IndexReader.open(directory);

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/d9b19584/src/blur-core/src/test/java/com/nearinfinity/blur/utils/TermDocIterableTest.java
----------------------------------------------------------------------
diff --git a/src/blur-core/src/test/java/com/nearinfinity/blur/utils/TermDocIterableTest.java b/src/blur-core/src/test/java/com/nearinfinity/blur/utils/TermDocIterableTest.java
index e0b5178..1599627 100644
--- a/src/blur-core/src/test/java/com/nearinfinity/blur/utils/TermDocIterableTest.java
+++ b/src/blur-core/src/test/java/com/nearinfinity/blur/utils/TermDocIterableTest.java
@@ -1,11 +1,14 @@
-/*
- * Copyright (C) 2011 Near Infinity Corporation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+package com.nearinfinity.blur.utils;
+
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  *
- * http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -14,8 +17,6 @@
  * limitations under the License.
  */
 
-package com.nearinfinity.blur.utils;
-
 import static com.nearinfinity.blur.lucene.LuceneConstant.LUCENE_VERSION;
 import static org.junit.Assert.assertEquals;
 
@@ -37,6 +38,7 @@ import org.apache.lucene.index.TermDocs;
 import org.apache.lucene.store.FSDirectory;
 import org.junit.Before;
 import org.junit.Test;
+
 public class TermDocIterableTest {
 
   private static final int BLOCKS = 10;

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/d9b19584/src/blur-core/src/test/resources/com/nearinfinity/blur/manager/complex-test-datasource.json
----------------------------------------------------------------------
diff --git a/src/blur-core/src/test/resources/com/nearinfinity/blur/manager/complex-test-datasource.json b/src/blur-core/src/test/resources/com/nearinfinity/blur/manager/complex-test-datasource.json
deleted file mode 100644
index 9e26dfe..0000000
--- a/src/blur-core/src/test/resources/com/nearinfinity/blur/manager/complex-test-datasource.json
+++ /dev/null
@@ -1 +0,0 @@
-{}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/d9b19584/src/blur-core/src/test/resources/log4j.xml
----------------------------------------------------------------------
diff --git a/src/blur-core/src/test/resources/log4j.xml b/src/blur-core/src/test/resources/log4j.xml
index 58f03e4..ed16114 100644
--- a/src/blur-core/src/test/resources/log4j.xml
+++ b/src/blur-core/src/test/resources/log4j.xml
@@ -1,4 +1,22 @@
 <?xml version="1.0" encoding="UTF-8" ?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
 <!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
 
 <log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">


Mime
View raw message