You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ec...@apache.org on 2012/01/11 17:15:17 UTC
svn commit: r1230122 [2/2] - in
/incubator/accumulo/branches/1.4/src/examples:
simple/src/main/java/org/apache/accumulo/examples/client/
simple/src/main/java/org/apache/accumulo/examples/combiner/
simple/src/main/java/org/apache/accumulo/examples/const...
Modified: incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/aggregator/TextIndexAggregator.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/aggregator/TextIndexAggregator.java?rev=1230122&r1=1230099&r2=1230122&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/aggregator/TextIndexAggregator.java (original)
+++ incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/aggregator/TextIndexAggregator.java Wed Jan 11 16:15:13 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.accumulo.wikisearch.aggregator;
+package org.apache.accumulo.examples.wikisearch.aggregator;
import java.util.ArrayList;
import java.util.Collections;
@@ -24,7 +24,7 @@ import org.apache.log4j.Logger;
import org.apache.accumulo.core.data.Value;
import org.apache.accumulo.core.iterators.aggregation.Aggregator;
-import org.apache.accumulo.wikisearch.protobuf.TermWeight;
+import org.apache.accumulo.examples.wikisearch.protobuf.TermWeight;
import com.google.protobuf.InvalidProtocolBufferException;
Modified: incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/ingest/ArticleExtractor.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/ingest/ArticleExtractor.java?rev=1230122&r1=1230099&r2=1230122&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/ingest/ArticleExtractor.java (original)
+++ incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/ingest/ArticleExtractor.java Wed Jan 11 16:15:13 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.accumulo.wikisearch.ingest;
+package org.apache.accumulo.examples.wikisearch.ingest;
import java.io.Reader;
import java.text.ParseException;
@@ -27,8 +27,8 @@ import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
-import org.apache.accumulo.wikisearch.normalizer.LcNoDiacriticsNormalizer;
-import org.apache.accumulo.wikisearch.normalizer.NumberNormalizer;
+import org.apache.accumulo.examples.wikisearch.normalizer.LcNoDiacriticsNormalizer;
+import org.apache.accumulo.examples.wikisearch.normalizer.NumberNormalizer;
public class ArticleExtractor {
Modified: incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/ingest/WikipediaConfiguration.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/ingest/WikipediaConfiguration.java?rev=1230122&r1=1230099&r2=1230122&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/ingest/WikipediaConfiguration.java (original)
+++ incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/ingest/WikipediaConfiguration.java Wed Jan 11 16:15:13 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.accumulo.wikisearch.ingest;
+package org.apache.accumulo.examples.wikisearch.ingest;
import java.io.IOException;
Modified: incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/ingest/WikipediaIngester.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/ingest/WikipediaIngester.java?rev=1230122&r1=1230099&r2=1230122&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/ingest/WikipediaIngester.java (original)
+++ incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/ingest/WikipediaIngester.java Wed Jan 11 16:15:13 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.accumulo.wikisearch.ingest;
+package org.apache.accumulo.examples.wikisearch.ingest;
import java.io.IOException;
import java.util.ArrayList;
@@ -38,7 +38,7 @@ import org.apache.accumulo.core.data.Mut
import org.apache.accumulo.core.iterators.IteratorUtil.IteratorScope;
import org.apache.accumulo.core.iterators.aggregation.NumSummation;
import org.apache.accumulo.core.iterators.aggregation.conf.AggregatorConfiguration;
-import org.apache.accumulo.wikisearch.reader.AggregatingRecordReader;
+import org.apache.accumulo.examples.wikisearch.reader.AggregatingRecordReader;
import org.apache.commons.lang.StringUtils;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.conf.Configured;
@@ -84,7 +84,7 @@ public class WikipediaIngester extends C
List<AggregatorConfiguration> aggregators = new ArrayList<AggregatorConfiguration>();
for (String family : StringUtils.split(textIndexFamilies, ',')) {
- aggregators.add(new AggregatorConfiguration(new Text("fi\0" + family), org.apache.accumulo.wikisearch.aggregator.TextIndexAggregator.class.getName()));
+ aggregators.add(new AggregatorConfiguration(new Text("fi\0" + family), org.apache.accumulo.examples.wikisearch.aggregator.TextIndexAggregator.class.getName()));
}
tops.create(tableName);
Modified: incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/ingest/WikipediaInputFormat.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/ingest/WikipediaInputFormat.java?rev=1230122&r1=1230099&r2=1230122&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/ingest/WikipediaInputFormat.java (original)
+++ incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/ingest/WikipediaInputFormat.java Wed Jan 11 16:15:13 2012
@@ -14,9 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.accumulo.wikisearch.ingest;
+package org.apache.accumulo.examples.wikisearch.ingest;
-import org.apache.accumulo.wikisearch.reader.AggregatingRecordReader;
+import org.apache.accumulo.examples.wikisearch.reader.AggregatingRecordReader;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.io.LongWritable;
import org.apache.hadoop.io.Text;
Modified: incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/ingest/WikipediaMapper.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/ingest/WikipediaMapper.java?rev=1230122&r1=1230099&r2=1230122&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/ingest/WikipediaMapper.java (original)
+++ incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/ingest/WikipediaMapper.java Wed Jan 11 16:15:13 2012
@@ -17,7 +17,7 @@
/**
*
*/
-package org.apache.accumulo.wikisearch.ingest;
+package org.apache.accumulo.examples.wikisearch.ingest;
import java.io.ByteArrayInputStream;
@@ -36,10 +36,10 @@ import java.util.regex.Pattern;
import org.apache.accumulo.core.data.Mutation;
import org.apache.accumulo.core.data.Value;
import org.apache.accumulo.core.security.ColumnVisibility;
-import org.apache.accumulo.wikisearch.ingest.ArticleExtractor.Article;
-import org.apache.accumulo.wikisearch.normalizer.LcNoDiacriticsNormalizer;
-import org.apache.accumulo.wikisearch.protobuf.Uid;
-import org.apache.accumulo.wikisearch.protobuf.Uid.List.Builder;
+import org.apache.accumulo.examples.wikisearch.ingest.ArticleExtractor.Article;
+import org.apache.accumulo.examples.wikisearch.normalizer.LcNoDiacriticsNormalizer;
+import org.apache.accumulo.examples.wikisearch.protobuf.Uid;
+import org.apache.accumulo.examples.wikisearch.protobuf.Uid.List.Builder;
import org.apache.commons.codec.binary.Base64;
import org.apache.commons.lang.StringUtils;
import org.apache.hadoop.conf.Configuration;
Modified: incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/iterator/TotalAggregatingIterator.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/iterator/TotalAggregatingIterator.java?rev=1230122&r1=1230099&r2=1230122&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/iterator/TotalAggregatingIterator.java (original)
+++ incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/iterator/TotalAggregatingIterator.java Wed Jan 11 16:15:13 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.accumulo.wikisearch.iterator;
+package org.apache.accumulo.examples.wikisearch.iterator;
import java.io.IOException;
import java.util.Collection;
Modified: incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/normalizer/LcNoDiacriticsNormalizer.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/normalizer/LcNoDiacriticsNormalizer.java?rev=1230122&r1=1230099&r2=1230122&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/normalizer/LcNoDiacriticsNormalizer.java (original)
+++ incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/normalizer/LcNoDiacriticsNormalizer.java Wed Jan 11 16:15:13 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.accumulo.wikisearch.normalizer;
+package org.apache.accumulo.examples.wikisearch.normalizer;
import java.text.Normalizer;
import java.text.Normalizer.Form;
@@ -31,7 +31,7 @@ import java.util.regex.Pattern;
* <li>lower casing in the {@link Locale#ENGLISH English local}
* </ol>
*/
-public class LcNoDiacriticsNormalizer implements org.apache.accumulo.wikisearch.normalizer.Normalizer {
+public class LcNoDiacriticsNormalizer implements org.apache.accumulo.examples.wikisearch.normalizer.Normalizer {
private static final Pattern diacriticals = Pattern.compile("\\p{InCombiningDiacriticalMarks}");
public String normalizeFieldValue(String fieldName, Object fieldValue) {
Modified: incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/normalizer/NoOpNormalizer.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/normalizer/NoOpNormalizer.java?rev=1230122&r1=1230099&r2=1230122&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/normalizer/NoOpNormalizer.java (original)
+++ incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/normalizer/NoOpNormalizer.java Wed Jan 11 16:15:13 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.accumulo.wikisearch.normalizer;
+package org.apache.accumulo.examples.wikisearch.normalizer;
public class NoOpNormalizer implements Normalizer {
public String normalizeFieldValue(String field, Object value) {
Modified: incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/normalizer/Normalizer.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/normalizer/Normalizer.java?rev=1230122&r1=1230099&r2=1230122&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/normalizer/Normalizer.java (original)
+++ incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/normalizer/Normalizer.java Wed Jan 11 16:15:13 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.accumulo.wikisearch.normalizer;
+package org.apache.accumulo.examples.wikisearch.normalizer;
public interface Normalizer {
Modified: incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/normalizer/NumberNormalizer.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/normalizer/NumberNormalizer.java?rev=1230122&r1=1230099&r2=1230122&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/normalizer/NumberNormalizer.java (original)
+++ incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/normalizer/NumberNormalizer.java Wed Jan 11 16:15:13 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.accumulo.wikisearch.normalizer;
+package org.apache.accumulo.examples.wikisearch.normalizer;
import org.apache.commons.lang.math.NumberUtils;
import org.apache.lucene.util.NumericUtils;
Modified: incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/protobuf/TermWeight.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/protobuf/TermWeight.java?rev=1230122&r1=1230099&r2=1230122&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/protobuf/TermWeight.java (original)
+++ incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/protobuf/TermWeight.java Wed Jan 11 16:15:13 2012
@@ -17,7 +17,7 @@
// Generated by the protocol buffer compiler. DO NOT EDIT!
// source: TermWeight.proto
-package org.apache.accumulo.wikisearch.protobuf;
+package org.apache.accumulo.examples.wikisearch.protobuf;
public final class TermWeight {
private TermWeight() {}
@@ -43,11 +43,11 @@ public final class TermWeight {
}
public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
- return org.apache.accumulo.wikisearch.protobuf.TermWeight.internal_static_protobuf_Info_descriptor;
+ return org.apache.accumulo.examples.wikisearch.protobuf.TermWeight.internal_static_protobuf_Info_descriptor;
}
protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() {
- return org.apache.accumulo.wikisearch.protobuf.TermWeight.internal_static_protobuf_Info_fieldAccessorTable;
+ return org.apache.accumulo.examples.wikisearch.protobuf.TermWeight.internal_static_protobuf_Info_fieldAccessorTable;
}
// required float normalizedTermFrequency = 1;
@@ -122,34 +122,34 @@ public final class TermWeight {
return size;
}
- public static org.apache.accumulo.wikisearch.protobuf.TermWeight.Info parseFrom(com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException {
+ public static org.apache.accumulo.examples.wikisearch.protobuf.TermWeight.Info parseFrom(com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException {
return newBuilder().mergeFrom(data).buildParsed();
}
- public static org.apache.accumulo.wikisearch.protobuf.TermWeight.Info parseFrom(com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ public static org.apache.accumulo.examples.wikisearch.protobuf.TermWeight.Info parseFrom(com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws com.google.protobuf.InvalidProtocolBufferException {
return newBuilder().mergeFrom(data, extensionRegistry).buildParsed();
}
- public static org.apache.accumulo.wikisearch.protobuf.TermWeight.Info parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException {
+ public static org.apache.accumulo.examples.wikisearch.protobuf.TermWeight.Info parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException {
return newBuilder().mergeFrom(data).buildParsed();
}
- public static org.apache.accumulo.wikisearch.protobuf.TermWeight.Info parseFrom(byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ public static org.apache.accumulo.examples.wikisearch.protobuf.TermWeight.Info parseFrom(byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws com.google.protobuf.InvalidProtocolBufferException {
return newBuilder().mergeFrom(data, extensionRegistry).buildParsed();
}
- public static org.apache.accumulo.wikisearch.protobuf.TermWeight.Info parseFrom(java.io.InputStream input) throws java.io.IOException {
+ public static org.apache.accumulo.examples.wikisearch.protobuf.TermWeight.Info parseFrom(java.io.InputStream input) throws java.io.IOException {
return newBuilder().mergeFrom(input).buildParsed();
}
- public static org.apache.accumulo.wikisearch.protobuf.TermWeight.Info parseFrom(java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ public static org.apache.accumulo.examples.wikisearch.protobuf.TermWeight.Info parseFrom(java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
return newBuilder().mergeFrom(input, extensionRegistry).buildParsed();
}
- public static org.apache.accumulo.wikisearch.protobuf.TermWeight.Info parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException {
+ public static org.apache.accumulo.examples.wikisearch.protobuf.TermWeight.Info parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException {
Builder builder = newBuilder();
if (builder.mergeDelimitedFrom(input)) {
return builder.buildParsed();
@@ -158,7 +158,7 @@ public final class TermWeight {
}
}
- public static org.apache.accumulo.wikisearch.protobuf.TermWeight.Info parseDelimitedFrom(java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ public static org.apache.accumulo.examples.wikisearch.protobuf.TermWeight.Info parseDelimitedFrom(java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
Builder builder = newBuilder();
if (builder.mergeDelimitedFrom(input, extensionRegistry)) {
@@ -168,11 +168,11 @@ public final class TermWeight {
}
}
- public static org.apache.accumulo.wikisearch.protobuf.TermWeight.Info parseFrom(com.google.protobuf.CodedInputStream input) throws java.io.IOException {
+ public static org.apache.accumulo.examples.wikisearch.protobuf.TermWeight.Info parseFrom(com.google.protobuf.CodedInputStream input) throws java.io.IOException {
return newBuilder().mergeFrom(input).buildParsed();
}
- public static org.apache.accumulo.wikisearch.protobuf.TermWeight.Info parseFrom(com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ public static org.apache.accumulo.examples.wikisearch.protobuf.TermWeight.Info parseFrom(com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
return newBuilder().mergeFrom(input, extensionRegistry).buildParsed();
}
@@ -185,7 +185,7 @@ public final class TermWeight {
return newBuilder();
}
- public static Builder newBuilder(org.apache.accumulo.wikisearch.protobuf.TermWeight.Info prototype) {
+ public static Builder newBuilder(org.apache.accumulo.examples.wikisearch.protobuf.TermWeight.Info prototype) {
return newBuilder().mergeFrom(prototype);
}
@@ -194,18 +194,18 @@ public final class TermWeight {
}
public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder<Builder> {
- private org.apache.accumulo.wikisearch.protobuf.TermWeight.Info result;
+ private org.apache.accumulo.examples.wikisearch.protobuf.TermWeight.Info result;
// Construct using protobuf.TermWeight.Info.newBuilder()
private Builder() {}
private static Builder create() {
Builder builder = new Builder();
- builder.result = new org.apache.accumulo.wikisearch.protobuf.TermWeight.Info();
+ builder.result = new org.apache.accumulo.examples.wikisearch.protobuf.TermWeight.Info();
return builder;
}
- protected org.apache.accumulo.wikisearch.protobuf.TermWeight.Info internalGetResult() {
+ protected org.apache.accumulo.examples.wikisearch.protobuf.TermWeight.Info internalGetResult() {
return result;
}
@@ -213,7 +213,7 @@ public final class TermWeight {
if (result == null) {
throw new IllegalStateException("Cannot call clear() after build().");
}
- result = new org.apache.accumulo.wikisearch.protobuf.TermWeight.Info();
+ result = new org.apache.accumulo.examples.wikisearch.protobuf.TermWeight.Info();
return this;
}
@@ -222,54 +222,54 @@ public final class TermWeight {
}
public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
- return org.apache.accumulo.wikisearch.protobuf.TermWeight.Info.getDescriptor();
+ return org.apache.accumulo.examples.wikisearch.protobuf.TermWeight.Info.getDescriptor();
}
- public org.apache.accumulo.wikisearch.protobuf.TermWeight.Info getDefaultInstanceForType() {
- return org.apache.accumulo.wikisearch.protobuf.TermWeight.Info.getDefaultInstance();
+ public org.apache.accumulo.examples.wikisearch.protobuf.TermWeight.Info getDefaultInstanceForType() {
+ return org.apache.accumulo.examples.wikisearch.protobuf.TermWeight.Info.getDefaultInstance();
}
public boolean isInitialized() {
return result.isInitialized();
}
- public org.apache.accumulo.wikisearch.protobuf.TermWeight.Info build() {
+ public org.apache.accumulo.examples.wikisearch.protobuf.TermWeight.Info build() {
if (result != null && !isInitialized()) {
throw newUninitializedMessageException(result);
}
return buildPartial();
}
- private org.apache.accumulo.wikisearch.protobuf.TermWeight.Info buildParsed() throws com.google.protobuf.InvalidProtocolBufferException {
+ private org.apache.accumulo.examples.wikisearch.protobuf.TermWeight.Info buildParsed() throws com.google.protobuf.InvalidProtocolBufferException {
if (!isInitialized()) {
throw newUninitializedMessageException(result).asInvalidProtocolBufferException();
}
return buildPartial();
}
- public org.apache.accumulo.wikisearch.protobuf.TermWeight.Info buildPartial() {
+ public org.apache.accumulo.examples.wikisearch.protobuf.TermWeight.Info buildPartial() {
if (result == null) {
throw new IllegalStateException("build() has already been called on this Builder.");
}
if (result.wordOffset_ != java.util.Collections.EMPTY_LIST) {
result.wordOffset_ = java.util.Collections.unmodifiableList(result.wordOffset_);
}
- org.apache.accumulo.wikisearch.protobuf.TermWeight.Info returnMe = result;
+ org.apache.accumulo.examples.wikisearch.protobuf.TermWeight.Info returnMe = result;
result = null;
return returnMe;
}
public Builder mergeFrom(com.google.protobuf.Message other) {
- if (other instanceof org.apache.accumulo.wikisearch.protobuf.TermWeight.Info) {
- return mergeFrom((org.apache.accumulo.wikisearch.protobuf.TermWeight.Info) other);
+ if (other instanceof org.apache.accumulo.examples.wikisearch.protobuf.TermWeight.Info) {
+ return mergeFrom((org.apache.accumulo.examples.wikisearch.protobuf.TermWeight.Info) other);
} else {
super.mergeFrom(other);
return this;
}
}
- public Builder mergeFrom(org.apache.accumulo.wikisearch.protobuf.TermWeight.Info other) {
- if (other == org.apache.accumulo.wikisearch.protobuf.TermWeight.Info.getDefaultInstance())
+ public Builder mergeFrom(org.apache.accumulo.examples.wikisearch.protobuf.TermWeight.Info other) {
+ if (other == org.apache.accumulo.examples.wikisearch.protobuf.TermWeight.Info.getDefaultInstance())
return this;
if (other.hasNormalizedTermFrequency()) {
setNormalizedTermFrequency(other.getNormalizedTermFrequency());
@@ -386,7 +386,7 @@ public final class TermWeight {
static {
defaultInstance = new Info(true);
- org.apache.accumulo.wikisearch.protobuf.TermWeight.internalForceInit();
+ org.apache.accumulo.examples.wikisearch.protobuf.TermWeight.internalForceInit();
defaultInstance.initFields();
}
@@ -409,8 +409,8 @@ public final class TermWeight {
descriptor = root;
internal_static_protobuf_Info_descriptor = getDescriptor().getMessageTypes().get(0);
internal_static_protobuf_Info_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable(
- internal_static_protobuf_Info_descriptor, new java.lang.String[] {"NormalizedTermFrequency", "WordOffset",}, org.apache.accumulo.wikisearch.protobuf.TermWeight.Info.class,
- org.apache.accumulo.wikisearch.protobuf.TermWeight.Info.Builder.class);
+ internal_static_protobuf_Info_descriptor, new java.lang.String[] {"NormalizedTermFrequency", "WordOffset",}, org.apache.accumulo.examples.wikisearch.protobuf.TermWeight.Info.class,
+ org.apache.accumulo.examples.wikisearch.protobuf.TermWeight.Info.Builder.class);
return null;
}
};
Modified: incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/protobuf/Uid.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/protobuf/Uid.java?rev=1230122&r1=1230099&r2=1230122&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/protobuf/Uid.java (original)
+++ incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/protobuf/Uid.java Wed Jan 11 16:15:13 2012
@@ -17,7 +17,7 @@
// Generated by the protocol buffer compiler. DO NOT EDIT!
// source: Uid.proto
-package org.apache.accumulo.wikisearch.protobuf;
+package org.apache.accumulo.examples.wikisearch.protobuf;
public final class Uid {
private Uid() {}
@@ -43,11 +43,11 @@ public final class Uid {
}
public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
- return org.apache.accumulo.wikisearch.protobuf.Uid.internal_static_protobuf_List_descriptor;
+ return org.apache.accumulo.examples.wikisearch.protobuf.Uid.internal_static_protobuf_List_descriptor;
}
protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() {
- return org.apache.accumulo.wikisearch.protobuf.Uid.internal_static_protobuf_List_fieldAccessorTable;
+ return org.apache.accumulo.examples.wikisearch.protobuf.Uid.internal_static_protobuf_List_fieldAccessorTable;
}
// required bool IGNORE = 1;
@@ -143,34 +143,34 @@ public final class Uid {
return size;
}
- public static org.apache.accumulo.wikisearch.protobuf.Uid.List parseFrom(com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException {
+ public static org.apache.accumulo.examples.wikisearch.protobuf.Uid.List parseFrom(com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException {
return newBuilder().mergeFrom(data).buildParsed();
}
- public static org.apache.accumulo.wikisearch.protobuf.Uid.List parseFrom(com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ public static org.apache.accumulo.examples.wikisearch.protobuf.Uid.List parseFrom(com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws com.google.protobuf.InvalidProtocolBufferException {
return newBuilder().mergeFrom(data, extensionRegistry).buildParsed();
}
- public static org.apache.accumulo.wikisearch.protobuf.Uid.List parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException {
+ public static org.apache.accumulo.examples.wikisearch.protobuf.Uid.List parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException {
return newBuilder().mergeFrom(data).buildParsed();
}
- public static org.apache.accumulo.wikisearch.protobuf.Uid.List parseFrom(byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ public static org.apache.accumulo.examples.wikisearch.protobuf.Uid.List parseFrom(byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws com.google.protobuf.InvalidProtocolBufferException {
return newBuilder().mergeFrom(data, extensionRegistry).buildParsed();
}
- public static org.apache.accumulo.wikisearch.protobuf.Uid.List parseFrom(java.io.InputStream input) throws java.io.IOException {
+ public static org.apache.accumulo.examples.wikisearch.protobuf.Uid.List parseFrom(java.io.InputStream input) throws java.io.IOException {
return newBuilder().mergeFrom(input).buildParsed();
}
- public static org.apache.accumulo.wikisearch.protobuf.Uid.List parseFrom(java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ public static org.apache.accumulo.examples.wikisearch.protobuf.Uid.List parseFrom(java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
return newBuilder().mergeFrom(input, extensionRegistry).buildParsed();
}
- public static org.apache.accumulo.wikisearch.protobuf.Uid.List parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException {
+ public static org.apache.accumulo.examples.wikisearch.protobuf.Uid.List parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException {
Builder builder = newBuilder();
if (builder.mergeDelimitedFrom(input)) {
return builder.buildParsed();
@@ -179,7 +179,7 @@ public final class Uid {
}
}
- public static org.apache.accumulo.wikisearch.protobuf.Uid.List parseDelimitedFrom(java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ public static org.apache.accumulo.examples.wikisearch.protobuf.Uid.List parseDelimitedFrom(java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
Builder builder = newBuilder();
if (builder.mergeDelimitedFrom(input, extensionRegistry)) {
@@ -189,11 +189,11 @@ public final class Uid {
}
}
- public static org.apache.accumulo.wikisearch.protobuf.Uid.List parseFrom(com.google.protobuf.CodedInputStream input) throws java.io.IOException {
+ public static org.apache.accumulo.examples.wikisearch.protobuf.Uid.List parseFrom(com.google.protobuf.CodedInputStream input) throws java.io.IOException {
return newBuilder().mergeFrom(input).buildParsed();
}
- public static org.apache.accumulo.wikisearch.protobuf.Uid.List parseFrom(com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ public static org.apache.accumulo.examples.wikisearch.protobuf.Uid.List parseFrom(com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
return newBuilder().mergeFrom(input, extensionRegistry).buildParsed();
}
@@ -206,7 +206,7 @@ public final class Uid {
return newBuilder();
}
- public static Builder newBuilder(org.apache.accumulo.wikisearch.protobuf.Uid.List prototype) {
+ public static Builder newBuilder(org.apache.accumulo.examples.wikisearch.protobuf.Uid.List prototype) {
return newBuilder().mergeFrom(prototype);
}
@@ -215,18 +215,18 @@ public final class Uid {
}
public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder<Builder> {
- private org.apache.accumulo.wikisearch.protobuf.Uid.List result;
+ private org.apache.accumulo.examples.wikisearch.protobuf.Uid.List result;
// Construct using protobuf.Uid.List.newBuilder()
private Builder() {}
private static Builder create() {
Builder builder = new Builder();
- builder.result = new org.apache.accumulo.wikisearch.protobuf.Uid.List();
+ builder.result = new org.apache.accumulo.examples.wikisearch.protobuf.Uid.List();
return builder;
}
- protected org.apache.accumulo.wikisearch.protobuf.Uid.List internalGetResult() {
+ protected org.apache.accumulo.examples.wikisearch.protobuf.Uid.List internalGetResult() {
return result;
}
@@ -234,7 +234,7 @@ public final class Uid {
if (result == null) {
throw new IllegalStateException("Cannot call clear() after build().");
}
- result = new org.apache.accumulo.wikisearch.protobuf.Uid.List();
+ result = new org.apache.accumulo.examples.wikisearch.protobuf.Uid.List();
return this;
}
@@ -243,54 +243,54 @@ public final class Uid {
}
public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
- return org.apache.accumulo.wikisearch.protobuf.Uid.List.getDescriptor();
+ return org.apache.accumulo.examples.wikisearch.protobuf.Uid.List.getDescriptor();
}
- public org.apache.accumulo.wikisearch.protobuf.Uid.List getDefaultInstanceForType() {
- return org.apache.accumulo.wikisearch.protobuf.Uid.List.getDefaultInstance();
+ public org.apache.accumulo.examples.wikisearch.protobuf.Uid.List getDefaultInstanceForType() {
+ return org.apache.accumulo.examples.wikisearch.protobuf.Uid.List.getDefaultInstance();
}
public boolean isInitialized() {
return result.isInitialized();
}
- public org.apache.accumulo.wikisearch.protobuf.Uid.List build() {
+ public org.apache.accumulo.examples.wikisearch.protobuf.Uid.List build() {
if (result != null && !isInitialized()) {
throw newUninitializedMessageException(result);
}
return buildPartial();
}
- private org.apache.accumulo.wikisearch.protobuf.Uid.List buildParsed() throws com.google.protobuf.InvalidProtocolBufferException {
+ private org.apache.accumulo.examples.wikisearch.protobuf.Uid.List buildParsed() throws com.google.protobuf.InvalidProtocolBufferException {
if (!isInitialized()) {
throw newUninitializedMessageException(result).asInvalidProtocolBufferException();
}
return buildPartial();
}
- public org.apache.accumulo.wikisearch.protobuf.Uid.List buildPartial() {
+ public org.apache.accumulo.examples.wikisearch.protobuf.Uid.List buildPartial() {
if (result == null) {
throw new IllegalStateException("build() has already been called on this Builder.");
}
if (result.uID_ != java.util.Collections.EMPTY_LIST) {
result.uID_ = java.util.Collections.unmodifiableList(result.uID_);
}
- org.apache.accumulo.wikisearch.protobuf.Uid.List returnMe = result;
+ org.apache.accumulo.examples.wikisearch.protobuf.Uid.List returnMe = result;
result = null;
return returnMe;
}
public Builder mergeFrom(com.google.protobuf.Message other) {
- if (other instanceof org.apache.accumulo.wikisearch.protobuf.Uid.List) {
- return mergeFrom((org.apache.accumulo.wikisearch.protobuf.Uid.List) other);
+ if (other instanceof org.apache.accumulo.examples.wikisearch.protobuf.Uid.List) {
+ return mergeFrom((org.apache.accumulo.examples.wikisearch.protobuf.Uid.List) other);
} else {
super.mergeFrom(other);
return this;
}
}
- public Builder mergeFrom(org.apache.accumulo.wikisearch.protobuf.Uid.List other) {
- if (other == org.apache.accumulo.wikisearch.protobuf.Uid.List.getDefaultInstance())
+ public Builder mergeFrom(org.apache.accumulo.examples.wikisearch.protobuf.Uid.List other) {
+ if (other == org.apache.accumulo.examples.wikisearch.protobuf.Uid.List.getDefaultInstance())
return this;
if (other.hasIGNORE()) {
setIGNORE(other.getIGNORE());
@@ -432,7 +432,7 @@ public final class Uid {
static {
defaultInstance = new List(true);
- org.apache.accumulo.wikisearch.protobuf.Uid.internalForceInit();
+ org.apache.accumulo.examples.wikisearch.protobuf.Uid.internalForceInit();
defaultInstance.initFields();
}
@@ -455,8 +455,8 @@ public final class Uid {
descriptor = root;
internal_static_protobuf_List_descriptor = getDescriptor().getMessageTypes().get(0);
internal_static_protobuf_List_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable(
- internal_static_protobuf_List_descriptor, new java.lang.String[] {"IGNORE", "COUNT", "UID",}, org.apache.accumulo.wikisearch.protobuf.Uid.List.class,
- org.apache.accumulo.wikisearch.protobuf.Uid.List.Builder.class);
+ internal_static_protobuf_List_descriptor, new java.lang.String[] {"IGNORE", "COUNT", "UID",}, org.apache.accumulo.examples.wikisearch.protobuf.Uid.List.class,
+ org.apache.accumulo.examples.wikisearch.protobuf.Uid.List.Builder.class);
return null;
}
};
Modified: incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/reader/AggregatingRecordReader.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/reader/AggregatingRecordReader.java?rev=1230122&r1=1230099&r2=1230122&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/reader/AggregatingRecordReader.java (original)
+++ incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/reader/AggregatingRecordReader.java Wed Jan 11 16:15:13 2012
@@ -14,13 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.accumulo.wikisearch.reader;
+package org.apache.accumulo.examples.wikisearch.reader;
import java.io.IOException;
-import org.apache.accumulo.wikisearch.ingest.WikipediaConfiguration;
-import org.apache.accumulo.wikisearch.util.TextUtil;
+import org.apache.accumulo.examples.wikisearch.ingest.WikipediaConfiguration;
+import org.apache.accumulo.examples.wikisearch.util.TextUtil;
import org.apache.hadoop.io.LongWritable;
import org.apache.hadoop.io.Text;
import org.apache.hadoop.mapreduce.InputSplit;
Modified: incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/reader/LfLineReader.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/reader/LfLineReader.java?rev=1230122&r1=1230099&r2=1230122&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/reader/LfLineReader.java (original)
+++ incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/reader/LfLineReader.java Wed Jan 11 16:15:13 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.accumulo.wikisearch.reader;
+package org.apache.accumulo.examples.wikisearch.reader;
import java.io.IOException;
import java.io.InputStream;
Modified: incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/reader/LongLineRecordReader.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/reader/LongLineRecordReader.java?rev=1230122&r1=1230099&r2=1230122&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/reader/LongLineRecordReader.java (original)
+++ incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/reader/LongLineRecordReader.java Wed Jan 11 16:15:13 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.accumulo.wikisearch.reader;
+package org.apache.accumulo.examples.wikisearch.reader;
import java.io.IOException;
Modified: incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/util/TextUtil.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/util/TextUtil.java?rev=1230122&r1=1230099&r2=1230122&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/util/TextUtil.java (original)
+++ incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/util/TextUtil.java Wed Jan 11 16:15:13 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.accumulo.wikisearch.util;
+package org.apache.accumulo.examples.wikisearch.util;
import java.nio.ByteBuffer;
import java.nio.charset.CharacterCodingException;
Modified: incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/test/java/org/apache/accumulo/examples/wikisearch/aggregator/GlobalIndexUidAggregatorTest.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/test/java/org/apache/accumulo/examples/wikisearch/aggregator/GlobalIndexUidAggregatorTest.java?rev=1230122&r1=1230099&r2=1230122&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/test/java/org/apache/accumulo/examples/wikisearch/aggregator/GlobalIndexUidAggregatorTest.java (original)
+++ incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/test/java/org/apache/accumulo/examples/wikisearch/aggregator/GlobalIndexUidAggregatorTest.java Wed Jan 11 16:15:13 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.accumulo.wikisearch.aggregator;
+package org.apache.accumulo.examples.wikisearch.aggregator;
import java.util.ArrayList;
import java.util.List;
@@ -24,8 +24,9 @@ import junit.framework.TestCase;
import org.apache.accumulo.core.data.Value;
import org.apache.accumulo.core.iterators.aggregation.Aggregator;
-import org.apache.accumulo.wikisearch.protobuf.Uid;
-import org.apache.accumulo.wikisearch.protobuf.Uid.List.Builder;
+import org.apache.accumulo.examples.wikisearch.aggregator.GlobalIndexUidAggregator;
+import org.apache.accumulo.examples.wikisearch.protobuf.Uid;
+import org.apache.accumulo.examples.wikisearch.protobuf.Uid.List.Builder;
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
Modified: incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/test/java/org/apache/accumulo/examples/wikisearch/aggregator/TextIndexAggregatorTest.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/test/java/org/apache/accumulo/examples/wikisearch/aggregator/TextIndexAggregatorTest.java?rev=1230122&r1=1230099&r2=1230122&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/test/java/org/apache/accumulo/examples/wikisearch/aggregator/TextIndexAggregatorTest.java (original)
+++ incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/test/java/org/apache/accumulo/examples/wikisearch/aggregator/TextIndexAggregatorTest.java Wed Jan 11 16:15:13 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.accumulo.wikisearch.aggregator;
+package org.apache.accumulo.examples.wikisearch.aggregator;
import java.util.List;
@@ -25,9 +25,9 @@ import org.junit.Before;
import org.junit.Test;
import org.apache.accumulo.core.data.Value;
-import org.apache.accumulo.wikisearch.aggregator.TextIndexAggregator;
-import org.apache.accumulo.wikisearch.protobuf.TermWeight;
-import org.apache.accumulo.wikisearch.protobuf.TermWeight.Info.Builder;
+import org.apache.accumulo.examples.wikisearch.aggregator.TextIndexAggregator;
+import org.apache.accumulo.examples.wikisearch.protobuf.TermWeight;
+import org.apache.accumulo.examples.wikisearch.protobuf.TermWeight.Info.Builder;
import com.google.protobuf.InvalidProtocolBufferException;
Modified: incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/test/java/org/apache/accumulo/examples/wikisearch/ingest/StandaloneStatusReporter.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/test/java/org/apache/accumulo/examples/wikisearch/ingest/StandaloneStatusReporter.java?rev=1230122&r1=1230099&r2=1230122&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/test/java/org/apache/accumulo/examples/wikisearch/ingest/StandaloneStatusReporter.java (original)
+++ incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/test/java/org/apache/accumulo/examples/wikisearch/ingest/StandaloneStatusReporter.java Wed Jan 11 16:15:13 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.accumulo.wikisearch.ingest;
+package org.apache.accumulo.examples.wikisearch.ingest;
import org.apache.hadoop.mapreduce.Counter;
import org.apache.hadoop.mapreduce.Counters;
Modified: incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/test/java/org/apache/accumulo/examples/wikisearch/ingest/WikipediaMapperTest.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/test/java/org/apache/accumulo/examples/wikisearch/ingest/WikipediaMapperTest.java?rev=1230122&r1=1230099&r2=1230122&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/test/java/org/apache/accumulo/examples/wikisearch/ingest/WikipediaMapperTest.java (original)
+++ incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/test/java/org/apache/accumulo/examples/wikisearch/ingest/WikipediaMapperTest.java Wed Jan 11 16:15:13 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.accumulo.wikisearch.ingest;
+package org.apache.accumulo.examples.wikisearch.ingest;
import java.io.File;
import java.io.IOException;
@@ -34,7 +34,9 @@ import org.apache.accumulo.core.data.Mut
import org.apache.accumulo.core.data.Range;
import org.apache.accumulo.core.data.Value;
import org.apache.accumulo.core.security.Authorizations;
-import org.apache.accumulo.wikisearch.reader.AggregatingRecordReader;
+import org.apache.accumulo.examples.wikisearch.ingest.WikipediaConfiguration;
+import org.apache.accumulo.examples.wikisearch.ingest.WikipediaMapper;
+import org.apache.accumulo.examples.wikisearch.reader.AggregatingRecordReader;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.fs.RawLocalFileSystem;
Modified: incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/test/java/org/apache/accumulo/examples/wikisearch/normalizer/testNumberNormalizer.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/test/java/org/apache/accumulo/examples/wikisearch/normalizer/testNumberNormalizer.java?rev=1230122&r1=1230099&r2=1230122&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/test/java/org/apache/accumulo/examples/wikisearch/normalizer/testNumberNormalizer.java (original)
+++ incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/test/java/org/apache/accumulo/examples/wikisearch/normalizer/testNumberNormalizer.java Wed Jan 11 16:15:13 2012
@@ -14,11 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.accumulo.wikisearch.normalizer;
+package org.apache.accumulo.examples.wikisearch.normalizer;
import static org.junit.Assert.assertTrue;
-import org.apache.accumulo.wikisearch.normalizer.NumberNormalizer;
+import org.apache.accumulo.examples.wikisearch.normalizer.NumberNormalizer;
import org.junit.Test;
public class testNumberNormalizer {
Modified: incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/test/java/org/apache/accumulo/examples/wikisearch/reader/AggregatingRecordReaderTest.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/test/java/org/apache/accumulo/examples/wikisearch/reader/AggregatingRecordReaderTest.java?rev=1230122&r1=1230099&r2=1230122&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/test/java/org/apache/accumulo/examples/wikisearch/reader/AggregatingRecordReaderTest.java (original)
+++ incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/test/java/org/apache/accumulo/examples/wikisearch/reader/AggregatingRecordReaderTest.java Wed Jan 11 16:15:13 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.accumulo.wikisearch.reader;
+package org.apache.accumulo.examples.wikisearch.reader;
import static org.junit.Assert.*;
@@ -28,7 +28,7 @@ import javax.xml.xpath.XPath;
import javax.xml.xpath.XPathExpression;
import javax.xml.xpath.XPathFactory;
-import org.apache.accumulo.wikisearch.reader.AggregatingRecordReader;
+import org.apache.accumulo.examples.wikisearch.reader.AggregatingRecordReader;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.io.Text;
Modified: incubator/accumulo/branches/1.4/src/examples/wikisearch/query/src/main/java/org/apache/accumulo/wikisearch/logic/AbstractQueryLogic.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/examples/wikisearch/query/src/main/java/org/apache/accumulo/wikisearch/logic/AbstractQueryLogic.java?rev=1230122&r1=1230121&r2=1230122&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/examples/wikisearch/query/src/main/java/org/apache/accumulo/wikisearch/logic/AbstractQueryLogic.java (original)
+++ incubator/accumulo/branches/1.4/src/examples/wikisearch/query/src/main/java/org/apache/accumulo/wikisearch/logic/AbstractQueryLogic.java Wed Jan 11 16:15:13 2012
@@ -39,13 +39,13 @@ import org.apache.accumulo.core.data.Ran
import org.apache.accumulo.core.data.Value;
import org.apache.accumulo.core.iterators.user.RegExFilter;
import org.apache.accumulo.core.security.Authorizations;
-import org.apache.accumulo.wikisearch.ingest.WikipediaMapper;
+import org.apache.accumulo.examples.wikisearch.ingest.WikipediaMapper;
+import org.apache.accumulo.examples.wikisearch.normalizer.LcNoDiacriticsNormalizer;
+import org.apache.accumulo.examples.wikisearch.normalizer.Normalizer;
import org.apache.accumulo.wikisearch.iterator.BooleanLogicIterator;
import org.apache.accumulo.wikisearch.iterator.EvaluatingIterator;
import org.apache.accumulo.wikisearch.iterator.OptimizedQueryIterator;
import org.apache.accumulo.wikisearch.iterator.ReadAheadIterator;
-import org.apache.accumulo.wikisearch.normalizer.LcNoDiacriticsNormalizer;
-import org.apache.accumulo.wikisearch.normalizer.Normalizer;
import org.apache.accumulo.wikisearch.parser.EventFields;
import org.apache.accumulo.wikisearch.parser.EventFields.FieldValue;
import org.apache.accumulo.wikisearch.parser.FieldIndexQueryReWriter;
Modified: incubator/accumulo/branches/1.4/src/examples/wikisearch/query/src/main/java/org/apache/accumulo/wikisearch/logic/ContentLogic.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/examples/wikisearch/query/src/main/java/org/apache/accumulo/wikisearch/logic/ContentLogic.java?rev=1230122&r1=1230121&r2=1230122&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/examples/wikisearch/query/src/main/java/org/apache/accumulo/wikisearch/logic/ContentLogic.java (original)
+++ incubator/accumulo/branches/1.4/src/examples/wikisearch/query/src/main/java/org/apache/accumulo/wikisearch/logic/ContentLogic.java Wed Jan 11 16:15:13 2012
@@ -28,7 +28,7 @@ import org.apache.accumulo.core.data.Key
import org.apache.accumulo.core.data.Range;
import org.apache.accumulo.core.data.Value;
import org.apache.accumulo.core.security.Authorizations;
-import org.apache.accumulo.wikisearch.ingest.WikipediaMapper;
+import org.apache.accumulo.examples.wikisearch.ingest.WikipediaMapper;
import org.apache.accumulo.wikisearch.sample.Document;
import org.apache.accumulo.wikisearch.sample.Field;
import org.apache.accumulo.wikisearch.sample.Results;
Modified: incubator/accumulo/branches/1.4/src/examples/wikisearch/query/src/main/java/org/apache/accumulo/wikisearch/logic/QueryLogic.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/examples/wikisearch/query/src/main/java/org/apache/accumulo/wikisearch/logic/QueryLogic.java?rev=1230122&r1=1230121&r2=1230122&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/examples/wikisearch/query/src/main/java/org/apache/accumulo/wikisearch/logic/QueryLogic.java (original)
+++ incubator/accumulo/branches/1.4/src/examples/wikisearch/query/src/main/java/org/apache/accumulo/wikisearch/logic/QueryLogic.java Wed Jan 11 16:15:13 2012
@@ -30,13 +30,13 @@ import org.apache.accumulo.core.data.Key
import org.apache.accumulo.core.data.Range;
import org.apache.accumulo.core.data.Value;
import org.apache.accumulo.core.security.Authorizations;
+import org.apache.accumulo.examples.wikisearch.normalizer.LcNoDiacriticsNormalizer;
+import org.apache.accumulo.examples.wikisearch.normalizer.Normalizer;
+import org.apache.accumulo.examples.wikisearch.protobuf.Uid;
+import org.apache.accumulo.examples.wikisearch.util.TextUtil;
import org.apache.accumulo.wikisearch.iterator.EvaluatingIterator;
-import org.apache.accumulo.wikisearch.normalizer.LcNoDiacriticsNormalizer;
-import org.apache.accumulo.wikisearch.normalizer.Normalizer;
import org.apache.accumulo.wikisearch.parser.QueryParser.QueryTerm;
import org.apache.accumulo.wikisearch.parser.RangeCalculator;
-import org.apache.accumulo.wikisearch.protobuf.Uid;
-import org.apache.accumulo.wikisearch.util.TextUtil;
import org.apache.hadoop.io.Text;
import org.apache.log4j.Logger;
Modified: incubator/accumulo/branches/1.4/src/examples/wikisearch/query/src/main/java/org/apache/accumulo/wikisearch/parser/RangeCalculator.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/examples/wikisearch/query/src/main/java/org/apache/accumulo/wikisearch/parser/RangeCalculator.java?rev=1230122&r1=1230121&r2=1230122&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/examples/wikisearch/query/src/main/java/org/apache/accumulo/wikisearch/parser/RangeCalculator.java (original)
+++ incubator/accumulo/branches/1.4/src/examples/wikisearch/query/src/main/java/org/apache/accumulo/wikisearch/parser/RangeCalculator.java Wed Jan 11 16:15:13 2012
@@ -31,11 +31,11 @@ import org.apache.accumulo.core.data.Key
import org.apache.accumulo.core.data.Range;
import org.apache.accumulo.core.data.Value;
import org.apache.accumulo.core.security.Authorizations;
+import org.apache.accumulo.examples.wikisearch.normalizer.Normalizer;
+import org.apache.accumulo.examples.wikisearch.protobuf.Uid;
+import org.apache.accumulo.examples.wikisearch.util.TextUtil;
import org.apache.accumulo.wikisearch.iterator.EvaluatingIterator;
import org.apache.accumulo.wikisearch.logic.AbstractQueryLogic;
-import org.apache.accumulo.wikisearch.normalizer.Normalizer;
-import org.apache.accumulo.wikisearch.protobuf.Uid;
-import org.apache.accumulo.wikisearch.util.TextUtil;
import org.apache.commons.jexl2.parser.ASTAndNode;
import org.apache.commons.jexl2.parser.ASTEQNode;
import org.apache.commons.jexl2.parser.ASTERNode;
Modified: incubator/accumulo/branches/1.4/src/examples/wikisearch/query/src/test/java/org/apache/accumulo/wikisearch/logic/TestQueryLogic.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/examples/wikisearch/query/src/test/java/org/apache/accumulo/wikisearch/logic/TestQueryLogic.java?rev=1230122&r1=1230121&r2=1230122&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/examples/wikisearch/query/src/test/java/org/apache/accumulo/wikisearch/logic/TestQueryLogic.java (original)
+++ incubator/accumulo/branches/1.4/src/examples/wikisearch/query/src/test/java/org/apache/accumulo/wikisearch/logic/TestQueryLogic.java Wed Jan 11 16:15:13 2012
@@ -36,10 +36,10 @@ import org.apache.accumulo.core.data.Mut
import org.apache.accumulo.core.data.Range;
import org.apache.accumulo.core.data.Value;
import org.apache.accumulo.core.security.Authorizations;
-import org.apache.accumulo.wikisearch.ingest.WikipediaConfiguration;
-import org.apache.accumulo.wikisearch.ingest.WikipediaMapper;
+import org.apache.accumulo.examples.wikisearch.ingest.WikipediaConfiguration;
+import org.apache.accumulo.examples.wikisearch.ingest.WikipediaMapper;
+import org.apache.accumulo.examples.wikisearch.reader.AggregatingRecordReader;
import org.apache.accumulo.wikisearch.parser.RangeCalculator;
-import org.apache.accumulo.wikisearch.reader.AggregatingRecordReader;
import org.apache.accumulo.wikisearch.sample.Document;
import org.apache.accumulo.wikisearch.sample.Field;
import org.apache.accumulo.wikisearch.sample.Results;