Skip to content
This repository has been archived by the owner on Oct 30, 2020. It is now read-only.

Commit

Permalink
Changed zoie package references.
Browse files Browse the repository at this point in the history
  • Loading branch information
alperez committed Apr 26, 2012
1 parent 06fdc58 commit cd1c4a7
Show file tree
Hide file tree
Showing 64 changed files with 172 additions and 172 deletions.
4 changes: 2 additions & 2 deletions docs/src/docbkx/chap-administration.xml
View file
Expand Up @@ -226,15 +226,15 @@
<para>DiskFreeSpaceBytes, DiskIndexSizeBytes, LastOptimizationTime, LastDiskIndexModifiedTime, IndexDir, DiskIndexSegmentCount</para>
<programlisting><![CDATA[
(ObjectName: com.senseidb:zoie-name=zoie-admin-1-1 )
(InterfaceClassName: proj.zoie.mbean.ZoieSystemAdminMBean)
(InterfaceClassName: com.linkedin.zoie.mbean.ZoieSystemAdminMBean)
]]></programlisting>
</listitem>

<listitem>
<para>LastIndexingBatchSize, LastIndexingBatchDuration, LastIndexingEndTime</para>
<programlisting><![CDATA[
(ObjectName: com.senseidb:zoie-name=zoie-status-1-1 )
(InterfaceClassName: proj.zoie.mbean.ZoieIndexingStatusAdminMBean)
(InterfaceClassName: com.linkedin.zoie.mbean.ZoieIndexingStatusAdminMBean)
]]></programlisting>
</listitem>

Expand Down
8 changes: 4 additions & 4 deletions docs/src/docbkx/chap-configuration.xml
View file
Expand Up @@ -742,7 +742,7 @@ sensei.indexer.type=zoie

# sensei
# version comparator, default: ZoieConfig.DefaultVersionComparator
# sensei.version.comparator.class = proj.zoie.impl.indexing.ZoieConfig$DefaultVersionComparator
# sensei.version.comparator.class = com.linkedin.zoie.impl.indexing.ZoieConfig$DefaultVersionComparator

# extra services
sensei.plugin.services.list =
Expand Down Expand Up @@ -2479,7 +2479,7 @@ sensei.custom.facets.list= virtual_groupids, my.custom_facets.tags, groupid </p
</itemizedlist>

<para>This is the bean ID of the
<literal>proj.zoie.dataprovider.jms.TopicFactory</literal>
<literal>com.linkedin.zoie.dataprovider.jms.TopicFactory</literal>
object. This object is used to generate a topic object based on
the given topic name.</para>
</listitem>
Expand Down Expand Up @@ -2547,9 +2547,9 @@ sensei.custom.facets.list= virtual_groupids, my.custom_facets.tags, groupid </p
<para>This is the bean ID of the
<literal>com.sensei.indexing.api.jdbc.SenseiJDBCAdaptor</literal>
object. This object is used to build a
<literal>proj.zoie.dataprovider.jdbc.PreparedStatementBuilder</literal>
<literal>com.linkedin.zoie.dataprovider.jdbc.PreparedStatementBuilder</literal>
object, which is required by
<literal>proj.zoie.dataprovider.jdbc.JDBCStreamDataProvider</literal>.</para>
<literal>com.linkedin.zoie.dataprovider.jdbc.JDBCStreamDataProvider</literal>.</para>
</listitem>
</varlistentry>

Expand Down
2 changes: 1 addition & 1 deletion example/tweets/src/main/java/com/senseidb/example/tweets/gateway/TwitterSampleGateway.java
View file
Expand Up @@ -5,7 +5,7 @@

import org.json.JSONObject;

import proj.zoie.impl.indexing.StreamDataProvider;
import com.linkedin.zoie.impl.indexing.StreamDataProvider;

import com.senseidb.gateway.SenseiGateway;
import com.senseidb.indexing.DataSourceFilter;
Expand Down
4 changes: 2 additions & 2 deletions example/tweets/src/main/java/com/senseidb/example/tweets/gateway/TwitterSampleStreamer.java
View file
Expand Up @@ -16,8 +16,8 @@
import org.apache.log4j.Logger;
import org.json.JSONObject;

import proj.zoie.api.DataConsumer.DataEvent;
import proj.zoie.impl.indexing.StreamDataProvider;
import com.linkedin.zoie.api.DataConsumer.DataEvent;
import com.linkedin.zoie.impl.indexing.StreamDataProvider;

public class TwitterSampleStreamer extends StreamDataProvider<JSONObject> {

Expand Down
4 changes: 2 additions & 2 deletions perf/src/main/java/com/sensei/perf/indexing/PerfStreamDataProvider.java
View file
Expand Up @@ -7,8 +7,8 @@
import org.apache.log4j.Logger;
import org.json.JSONObject;

import proj.zoie.api.DataConsumer.DataEvent;
import proj.zoie.impl.indexing.StreamDataProvider;
import com.linkedin.zoie.api.DataConsumer.DataEvent;
import com.linkedin.zoie.impl.indexing.StreamDataProvider;

import com.sensei.indexing.api.DataSourceFilter;
import com.sensei.indexing.api.DataSourceFilterable;
Expand Down
2 changes: 1 addition & 1 deletion perf/src/main/java/com/sensei/perf/indexing/PerfStreamDataProviderBuilder.java
View file
Expand Up @@ -7,7 +7,7 @@
import org.json.JSONObject;
import org.springframework.context.ApplicationContext;

import proj.zoie.impl.indexing.StreamDataProvider;
import com.linkedin.zoie.impl.indexing.StreamDataProvider;

import com.sensei.indexing.api.DataSourceFilter;
import com.sensei.indexing.api.gateway.SenseiGateway;
Expand Down
2 changes: 1 addition & 1 deletion resources/log4j.properties
View file
Expand Up @@ -65,6 +65,6 @@ log4j.appender.sensei-norbert.layout.ConversionPattern=%d{yyyy/MM/dd HH:mm:ss.SS

log4j.logger.com.sensei=INFO,sensei
log4j.logger.com.linkedin.norbert=INFO,sensei-norbert
log4j.logger.proj.zoie=INFO,sensei-zoie
log4j.logger.com.linkedin.zoie=INFO,sensei-zoie
log4j.logger.com.browseengine.bobo=INFO,sensei-bobo
log4j.logger.com.sensei.querylog=INFO,sensei-query
16 changes: 8 additions & 8 deletions sensei-core/src/main/java/com/senseidb/conf/SenseiServerBuilder.java
View file
Expand Up @@ -47,14 +47,14 @@
import org.springframework.core.io.Resource;
import org.w3c.dom.Document;

import proj.zoie.api.DirectoryManager.DIRECTORY_MODE;
import proj.zoie.api.IndexCopier;
import proj.zoie.api.indexing.ZoieIndexableInterpreter;
import proj.zoie.hourglass.impl.HourGlassScheduler.FREQUENCY;
import proj.zoie.impl.indexing.DefaultReaderCache;
import proj.zoie.impl.indexing.ReaderCacheFactory;
import proj.zoie.impl.indexing.SimpleReaderCache;
import proj.zoie.impl.indexing.ZoieConfig;
import com.linkedin.zoie.api.DirectoryManager.DIRECTORY_MODE;
import com.linkedin.zoie.api.IndexCopier;
import com.linkedin.zoie.api.indexing.ZoieIndexableInterpreter;
import com.linkedin.zoie.hourglass.impl.HourGlassScheduler.FREQUENCY;
import com.linkedin.zoie.impl.indexing.DefaultReaderCache;
import com.linkedin.zoie.impl.indexing.ReaderCacheFactory;
import com.linkedin.zoie.impl.indexing.SimpleReaderCache;
import com.linkedin.zoie.impl.indexing.ZoieConfig;

import com.browseengine.bobo.facets.FacetHandler;
import com.browseengine.bobo.facets.RuntimeFacetHandlerFactory;
Expand Down
4 changes: 2 additions & 2 deletions sensei-core/src/main/java/com/senseidb/conf/ZoieFactoryFactory.java
View file
Expand Up @@ -2,8 +2,8 @@

import java.io.File;

import proj.zoie.api.indexing.ZoieIndexableInterpreter;
import proj.zoie.impl.indexing.ZoieConfig;
import com.linkedin.zoie.api.indexing.ZoieIndexableInterpreter;
import com.linkedin.zoie.impl.indexing.ZoieConfig;

import com.senseidb.search.node.SenseiIndexReaderDecorator;
import com.senseidb.search.node.SenseiZoieFactory;
Expand Down
2 changes: 1 addition & 1 deletion sensei-core/src/main/java/com/senseidb/dataprovider/http/HttpDataProviderAdminMBean.java
View file
@@ -1,6 +1,6 @@
package com.senseidb.dataprovider.http;

import proj.zoie.mbean.DataProviderAdminMBean;
import com.linkedin.zoie.mbean.DataProviderAdminMBean;

public interface HttpDataProviderAdminMBean extends DataProviderAdminMBean {

Expand Down
4 changes: 2 additions & 2 deletions sensei-core/src/main/java/com/senseidb/dataprovider/http/HttpStreamDataProvider.java
View file
Expand Up @@ -32,8 +32,8 @@
import org.apache.http.protocol.HttpContext;
import org.apache.log4j.Logger;

import proj.zoie.api.DataConsumer.DataEvent;
import proj.zoie.impl.indexing.StreamDataProvider;
import com.linkedin.zoie.api.DataConsumer.DataEvent;
import com.linkedin.zoie.impl.indexing.StreamDataProvider;

public abstract class HttpStreamDataProvider<D> extends StreamDataProvider<D> implements HttpDataProviderAdminMBean{

Expand Down
4 changes: 2 additions & 2 deletions sensei-core/src/main/java/com/senseidb/examples/SchemaIndexingExample.java
View file
Expand Up @@ -12,8 +12,8 @@
import org.apache.lucene.util.Version;
import org.json.JSONObject;

import proj.zoie.api.indexing.ZoieIndexable;
import proj.zoie.api.indexing.ZoieIndexable.IndexingReq;
import com.linkedin.zoie.api.indexing.ZoieIndexable;
import com.linkedin.zoie.api.indexing.ZoieIndexable.IndexingReq;

import com.senseidb.conf.SenseiSchema;
import com.senseidb.conf.SenseiServerBuilder;
Expand Down
4 changes: 2 additions & 2 deletions sensei-core/src/main/java/com/senseidb/gateway/SenseiGateway.java
View file
Expand Up @@ -5,8 +5,8 @@

import org.json.JSONObject;

import proj.zoie.impl.indexing.StreamDataProvider;
import proj.zoie.impl.indexing.ZoieConfig;
import com.linkedin.zoie.impl.indexing.StreamDataProvider;
import com.linkedin.zoie.impl.indexing.ZoieConfig;

import com.senseidb.conf.SenseiSchema;
import com.senseidb.indexing.DataSourceFilter;
Expand Down
4 changes: 2 additions & 2 deletions sensei-core/src/main/java/com/senseidb/gateway/file/LinedFileDataProvider.java
View file
Expand Up @@ -10,8 +10,8 @@

import org.apache.log4j.Logger;

import proj.zoie.api.DataConsumer.DataEvent;
import proj.zoie.impl.indexing.StreamDataProvider;
import com.linkedin.zoie.api.DataConsumer.DataEvent;
import com.linkedin.zoie.impl.indexing.StreamDataProvider;

public abstract class LinedFileDataProvider<D> extends StreamDataProvider<D> {

Expand Down
4 changes: 2 additions & 2 deletions sensei-core/src/main/java/com/senseidb/gateway/file/LinedFileDataProviderBuilder.java
View file
Expand Up @@ -6,8 +6,8 @@

import org.json.JSONObject;

import proj.zoie.impl.indexing.StreamDataProvider;
import proj.zoie.impl.indexing.ZoieConfig;
import com.linkedin.zoie.impl.indexing.StreamDataProvider;
import com.linkedin.zoie.impl.indexing.ZoieConfig;

import com.senseidb.gateway.SenseiGateway;
import com.senseidb.indexing.DataSourceFilter;
Expand Down
6 changes: 3 additions & 3 deletions sensei-core/src/main/java/com/senseidb/indexing/DefaultJsonSchemaInterpreter.java
View file
Expand Up @@ -24,9 +24,9 @@
import org.json.JSONException;
import org.json.JSONObject;

import proj.zoie.api.indexing.AbstractZoieIndexable;
import proj.zoie.api.indexing.AbstractZoieIndexableInterpreter;
import proj.zoie.api.indexing.ZoieIndexable;
import com.linkedin.zoie.api.indexing.AbstractZoieIndexable;
import com.linkedin.zoie.api.indexing.AbstractZoieIndexableInterpreter;
import com.linkedin.zoie.api.indexing.ZoieIndexable;

import com.senseidb.conf.SenseiSchema;
import com.senseidb.conf.SenseiSchema.FieldDefinition;
Expand Down
4 changes: 2 additions & 2 deletions sensei-core/src/main/java/com/senseidb/indexing/DefaultSenseiInterpreter.java
View file
Expand Up @@ -18,8 +18,8 @@
import org.apache.lucene.document.Field.Store;
import org.apache.lucene.document.Field.TermVector;

import proj.zoie.api.indexing.AbstractZoieIndexableInterpreter;
import proj.zoie.api.indexing.ZoieIndexable;
import com.linkedin.zoie.api.indexing.AbstractZoieIndexableInterpreter;
import com.linkedin.zoie.api.indexing.ZoieIndexable;

import com.browseengine.bobo.facets.data.PredefinedTermListFactory;
import com.browseengine.bobo.facets.data.TermListFactory;
Expand Down
4 changes: 2 additions & 2 deletions sensei-core/src/main/java/com/senseidb/indexing/DefaultSenseiZoieIndexable.java
View file
Expand Up @@ -13,8 +13,8 @@
import org.apache.lucene.document.Field.Store;
import org.apache.lucene.document.Field.TermVector;

import proj.zoie.api.indexing.AbstractZoieIndexable;
import proj.zoie.api.indexing.ZoieIndexable.IndexingReq;
import com.linkedin.zoie.api.indexing.AbstractZoieIndexable;
import com.linkedin.zoie.api.indexing.ZoieIndexable.IndexingReq;

import com.senseidb.indexing.DefaultSenseiInterpreter.IndexSpec;
import com.senseidb.indexing.DefaultSenseiInterpreter.MetaFormatSpec;
Expand Down
22 changes: 11 additions & 11 deletions sensei-core/src/main/java/com/senseidb/indexing/DefaultStreamingIndexingManager.java
View file
Expand Up @@ -16,16 +16,16 @@
import org.apache.log4j.Logger;
import org.json.JSONObject;

import proj.zoie.api.DataConsumer;
import proj.zoie.api.DataConsumer.DataEvent;
import proj.zoie.api.DataProvider;
import proj.zoie.api.Zoie;
import proj.zoie.api.ZoieException;
import proj.zoie.api.ZoieIndexReader;
import proj.zoie.impl.indexing.StreamDataProvider;
import proj.zoie.impl.indexing.ZoieConfig;
import proj.zoie.mbean.DataProviderAdmin;
import proj.zoie.mbean.DataProviderAdminMBean;
import com.linkedin.zoie.api.DataConsumer;
import com.linkedin.zoie.api.DataConsumer.DataEvent;
import com.linkedin.zoie.api.DataProvider;
import com.linkedin.zoie.api.Zoie;
import com.linkedin.zoie.api.ZoieException;
import com.linkedin.zoie.api.ZoieIndexReader;
import com.linkedin.zoie.impl.indexing.StreamDataProvider;
import com.linkedin.zoie.impl.indexing.ZoieConfig;
import com.linkedin.zoie.mbean.DataProviderAdmin;
import com.linkedin.zoie.mbean.DataProviderAdminMBean;

import com.browseengine.bobo.api.BoboIndexReader;
import com.senseidb.conf.SenseiSchema;
Expand Down Expand Up @@ -300,7 +300,7 @@ else if (type != null)
}

@Override
public void consume(Collection<proj.zoie.api.DataConsumer.DataEvent<JSONObject>> data) throws ZoieException
public void consume(Collection<com.linkedin.zoie.api.DataConsumer.DataEvent<JSONObject>> data) throws ZoieException
{
UpdateBatchSizeMeter.mark(data.size());
ProviderBatchSizeMeter.mark(_dataProvider.getBatchSize());
Expand Down
6 changes: 3 additions & 3 deletions sensei-core/src/main/java/com/senseidb/indexing/JSONDataInterpreter.java
View file
Expand Up @@ -4,9 +4,9 @@
import org.json.JSONException;
import org.json.JSONObject;

import proj.zoie.api.indexing.AbstractZoieIndexable;
import proj.zoie.api.indexing.AbstractZoieIndexableInterpreter;
import proj.zoie.api.indexing.ZoieIndexable;
import com.linkedin.zoie.api.indexing.AbstractZoieIndexable;
import com.linkedin.zoie.api.indexing.AbstractZoieIndexableInterpreter;
import com.linkedin.zoie.api.indexing.ZoieIndexable;


public abstract class JSONDataInterpreter extends AbstractZoieIndexableInterpreter<JSONObject> {
Expand Down
4 changes: 2 additions & 2 deletions sensei-core/src/main/java/com/senseidb/indexing/JSONValueInterpreter.java
View file
Expand Up @@ -2,8 +2,8 @@

import org.json.JSONObject;

import proj.zoie.api.indexing.AbstractZoieIndexableInterpreter;
import proj.zoie.api.indexing.ZoieIndexable;
import com.linkedin.zoie.api.indexing.AbstractZoieIndexableInterpreter;
import com.linkedin.zoie.api.indexing.ZoieIndexable;

public abstract class JSONValueInterpreter<V> extends
AbstractZoieIndexableInterpreter<JSONObject> {
Expand Down
6 changes: 3 additions & 3 deletions sensei-core/src/main/java/com/senseidb/search/facet/UIDFacetHandler.java
View file
Expand Up @@ -14,9 +14,9 @@
import org.apache.lucene.search.DocIdSetIterator;
import org.apache.lucene.search.ScoreDoc;

import proj.zoie.api.DocIDMapper;
import proj.zoie.api.ZoieIndexReader;
import proj.zoie.api.ZoieSegmentReader;
import com.linkedin.zoie.api.DocIDMapper;
import com.linkedin.zoie.api.ZoieIndexReader;
import com.linkedin.zoie.api.ZoieSegmentReader;
import scala.actors.threadpool.Arrays;

import com.browseengine.bobo.api.BoboIndexReader;
Expand Down
4 changes: 2 additions & 2 deletions sensei-core/src/main/java/com/senseidb/search/node/NoOpIndexableInterpreter.java
View file
@@ -1,7 +1,7 @@
package com.senseidb.search.node;

import proj.zoie.api.indexing.AbstractZoieIndexableInterpreter;
import proj.zoie.api.indexing.ZoieIndexable;
import com.linkedin.zoie.api.indexing.AbstractZoieIndexableInterpreter;
import com.linkedin.zoie.api.indexing.ZoieIndexable;


public class NoOpIndexableInterpreter extends
Expand Down
2 changes: 1 addition & 1 deletion sensei-core/src/main/java/com/senseidb/search/node/ResultMerger.java
View file
Expand Up @@ -21,7 +21,7 @@
import org.apache.lucene.search.SortField;
import org.apache.lucene.util.PriorityQueue;

import proj.zoie.api.ZoieIndexReader;
import com.linkedin.zoie.api.ZoieIndexReader;

import com.browseengine.bobo.api.BoboIndexReader;
import com.browseengine.bobo.api.BrowseFacet;
Expand Down
2 changes: 1 addition & 1 deletion sensei-core/src/main/java/com/senseidb/search/node/SenseiBroker.java
View file
Expand Up @@ -10,7 +10,7 @@
import org.apache.log4j.Logger;
import org.apache.lucene.document.Document;

import proj.zoie.api.indexing.AbstractZoieIndexable;
import com.linkedin.zoie.api.indexing.AbstractZoieIndexable;

import com.browseengine.bobo.api.FacetSpec;
import com.linkedin.norbert.NorbertException;
Expand Down
10 changes: 5 additions & 5 deletions sensei-core/src/main/java/com/senseidb/search/node/SenseiCore.java
View file
Expand Up @@ -8,11 +8,11 @@

import org.apache.log4j.Logger;

import proj.zoie.api.DataProvider;
import proj.zoie.api.IndexReaderFactory;
import proj.zoie.api.Zoie;
import proj.zoie.api.ZoieException;
import proj.zoie.api.ZoieIndexReader;
import com.linkedin.zoie.api.DataProvider;
import com.linkedin.zoie.api.IndexReaderFactory;
import com.linkedin.zoie.api.Zoie;
import com.linkedin.zoie.api.ZoieException;
import com.linkedin.zoie.api.ZoieIndexReader;

import com.browseengine.bobo.api.BoboIndexReader;
import com.browseengine.bobo.facets.FacetHandler;
Expand Down
14 changes: 7 additions & 7 deletions sensei-core/src/main/java/com/senseidb/search/node/SenseiHourglassFactory.java
View file
Expand Up @@ -4,13 +4,13 @@

import org.apache.log4j.Logger;

import proj.zoie.api.DirectoryManager.DIRECTORY_MODE;
import proj.zoie.api.indexing.ZoieIndexableInterpreter;
import proj.zoie.hourglass.impl.HourGlassScheduler;
import proj.zoie.hourglass.impl.HourGlassScheduler.FREQUENCY;
import proj.zoie.hourglass.impl.Hourglass;
import proj.zoie.hourglass.impl.HourglassDirectoryManagerFactory;
import proj.zoie.impl.indexing.ZoieConfig;
import com.linkedin.zoie.api.DirectoryManager.DIRECTORY_MODE;
import com.linkedin.zoie.api.indexing.ZoieIndexableInterpreter;
import com.linkedin.zoie.hourglass.impl.HourGlassScheduler;
import com.linkedin.zoie.hourglass.impl.HourGlassScheduler.FREQUENCY;
import com.linkedin.zoie.hourglass.impl.Hourglass;
import com.linkedin.zoie.hourglass.impl.HourglassDirectoryManagerFactory;
import com.linkedin.zoie.impl.indexing.ZoieConfig;

import com.browseengine.bobo.api.BoboIndexReader;

Expand Down
4 changes: 2 additions & 2 deletions sensei-core/src/main/java/com/senseidb/search/node/SenseiIndexReaderDecorator.java
View file
Expand Up @@ -5,8 +5,8 @@

import org.apache.log4j.Logger;

import proj.zoie.api.ZoieIndexReader;
import proj.zoie.impl.indexing.AbstractIndexReaderDecorator;
import com.linkedin.zoie.api.ZoieIndexReader;
import com.linkedin.zoie.impl.indexing.AbstractIndexReaderDecorator;

import com.browseengine.bobo.api.BoboIndexReader;
import com.browseengine.bobo.facets.FacetHandler;
Expand Down
6 changes: 3 additions & 3 deletions sensei-core/src/main/java/com/senseidb/search/node/SenseiIndexingManager.java
View file
Expand Up @@ -2,9 +2,9 @@

import java.util.Map;

import proj.zoie.api.DataProvider;
import proj.zoie.api.Zoie;
import proj.zoie.api.ZoieException;
import com.linkedin.zoie.api.DataProvider;
import com.linkedin.zoie.api.Zoie;
import com.linkedin.zoie.api.ZoieException;

import com.browseengine.bobo.api.BoboIndexReader;

Expand Down

0 comments on commit cd1c4a7

Please sign in to comment.