refactor, take 4

goverdata · Jan 15, 2012 · cbd25db · cbd25db
1 parent 9e015af
commit cbd25db
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 23 deletions.
diff --git a/bin/start-sensei-node.sh b/bin/start-sensei-node.sh
@@ -41,7 +41,7 @@ HEAP_OPTS="-Xmx1g -Xms1g -XX:NewSize=256m"
 JAVA_OPTS="-server -d64"
 JMX_OPTS="-Djava.rmi.server.hostname=$IP -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.port=18889 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false"
 
-MAIN_CLASS="com.sensei.search.nodes.SenseiServer"
+MAIN_CLASS="com.senseidb.search.node.SenseiServer"
 
 
 CLASSPATH=$resources/:$lib/*:$dist/*:$1/ext/*

diff --git a/example/cars/conf/sensei.properties b/example/cars/conf/sensei.properties
@@ -35,7 +35,7 @@ sensei.index.freshness = 5
 
 # gateway parameters
 
-sensei.gateway.class=com.sensei.indexing.api.gateway.file.LinedFileDataProviderBuilder
+sensei.gateway.class=com.senseidb.gateway.file.LinedFileDataProviderBuilder
 sensei.gateway.file.path = example/cars/data/cars.json
 # index manager parameters
 

diff --git a/sensei-core/src/test/resources/conf/node1/sensei.properties b/sensei-core/src/test/resources/conf/node1/sensei.properties
@@ -28,7 +28,7 @@ sensei.index.freshness = 0
 sensei.index.manager.default.maxpartition.id = 2
 
 sensei.gateway.file.path = ../example/cars/data/cars.json
-sensei.gateway.class=com.sensei.indexing.api.gateway.file.LinedFileDataProviderBuilder
+sensei.gateway.class=com.senseidb.gateway.file.LinedFileDataProviderBuilder
 # plugins: from plugins.xml
 
 # analyzer, default: StandardAnalyzer
@@ -52,14 +52,14 @@ sensei.search.cluster.zookeeper.url = localhost:2181
 sensei.search.cluster.zookeeper.conn.timeout = 30000
 
 
-my.custom.facets.virtual_groupid.class=com.sensei.plugin.test.VirtualGroupIdFactory
+my.custom.facets.virtual_groupid.class=com.senseidb.test.plugin.VirtualGroupIdFactory
 my.custom.facets.virtual_groupid.typeProp=default
 
-my.custom.facets.virtual_groupid_fixedlengthlongarray.class=com.sensei.plugin.test.VirtualGroupIdFactory
+my.custom.facets.virtual_groupid_fixedlengthlongarray.class=com.senseidb.test.plugin.VirtualGroupIdFactory
 my.custom.facets.virtual_groupid_fixedlengthlongarray.typeProp=fixedlengthlongarray
 
 #Sensei plugin factory returns the list of custom facets
-my.custom.facets.other_custom_facets.class=com.sensei.plugin.test.OtherCustomFacetsFactory
+my.custom.facets.other_custom_facets.class=com.senseidb.test.plugin.OtherCustomFacetsFactory
 # the list of beans might be referenced both by simple name and the full prefix
 sensei.custom.facets.list= virtual_groupid, virtual_groupid_fixedlengthlongarray, my.custom.facets.other_custom_facets
 sensei.index.manager.default.eventsPerMin = 600000 
diff --git a/sensei-core/src/test/resources/conf/node2/sensei.properties b/sensei-core/src/test/resources/conf/node2/sensei.properties
@@ -27,7 +27,7 @@ sensei.index.freshness = 0
 
 sensei.index.manager.default.maxpartition.id = 2
 
-sensei.gateway.class=com.sensei.indexing.api.gateway.file.LinedFileDataProviderBuilder
+sensei.gateway.class=com.senseidb.gateway.file.LinedFileDataProviderBuilder
 sensei.gateway.file.path = ../example/cars/data/cars.json
 
 # analyzer, default: StandardAnalyzer
@@ -49,14 +49,14 @@ sensei.search.cluster.zookeeper.url = localhost:2181
 sensei.search.cluster.zookeeper.conn.timeout = 30000
 
 
-my.custom.facets.virtual_groupid.class=com.sensei.plugin.test.VirtualGroupIdFactory
+my.custom.facets.virtual_groupid.class=com.senseidb.test.plugin.VirtualGroupIdFactory
 my.custom.facets.virtual_groupid.typeProp=default
 
-my.custom.facets.virtual_groupid_fixedlengthlongarray.class=com.sensei.plugin.test.VirtualGroupIdFactory
+my.custom.facets.virtual_groupid_fixedlengthlongarray.class=com.senseidb.test.plugin.VirtualGroupIdFactory
 my.custom.facets.virtual_groupid_fixedlengthlongarray.typeProp=fixedlengthlongarray
 
 #Sensei plugin factory returns the list of custom facets
-my.custom.facets.other_custom_facets.class=com.sensei.plugin.test.OtherCustomFacetsFactory
+my.custom.facets.other_custom_facets.class=com.senseidb.test.plugin.OtherCustomFacetsFactory
 # the list of beans might be referenced both by simple name and the full prefix
 sensei.custom.facets.list= virtual_groupid, virtual_groupid_fixedlengthlongarray, my.custom.facets.other_custom_facets
 sensei.index.manager.default.eventsPerMin = 600000 
diff --git a/sensei-core/src/test/resources/conf/sensei-test.spring b/sensei-core/src/test/resources/conf/sensei-test.spring
@@ -20,7 +20,7 @@
 	   <constructor-arg ref="analyzer" />
 	</bean>
 
-	<bean id="query-builder-factory" class="com.sensei.search.nodes.impl.SimpleQueryBuilderFactory">
+	<bean id="query-builder-factory" class="com.senseidb.search.node.impl.SimpleQueryBuilderFactory">
 	   <constructor-arg ref="query-parser"/>
 	</bean>
 
@@ -31,7 +31,7 @@
        </constructor-arg>
     </bean>
 
-    <bean id="indexing-manager" class="com.sensei.search.nodes.impl.NoopIndexingManager"/>
+    <bean id="indexing-manager" class="com.senseidb.search.node.impl.NoopIndexingManager"/>
 
     <bean id="network-server-config" class="com.linkedin.norbert.javacompat.network.NetworkServerConfig">
         <property name="serviceName" value="testCluster"/>
@@ -61,11 +61,11 @@
        <property name="clusterClient" ref="cluster-client" />
     </bean>	
 
-    <bean id="request-rewriter" class="com.sensei.search.nodes.impl.NoopRequestScatterRewriter" />
+    <bean id="request-rewriter" class="com.senseidb.search.node.impl.NoopRequestScatterRewriter" />
 
-    <bean id="router-factory" class="com.sensei.search.cluster.routing.UniformPartitionedRoutingFactory" />
+    <bean id="router-factory" class="com.senseidb.cluster.routing.UniformPartitionedRoutingFactory" />
 
-    <bean id="network-client" class="com.sensei.search.cluster.client.SenseiNetworkClient">
+    <bean id="network-client" class="com.senseidb.cluster.client.SenseiNetworkClient">
         <constructor-arg ref="network-client-config" />
         <constructor-arg>
           <null />

diff --git a/sensei-core/src/test/resources/conf/zoie.spring b/sensei-core/src/test/resources/conf/zoie.spring
@@ -7,10 +7,10 @@
 
   <import resource="bobo.spring" />
   <!-- dummy placeholder, we are not worry about indexing for now -->      
-  <bean id="interpreter" class="com.sensei.search.nodes.NoOpIndexableInterpreter" />
+  <bean id="interpreter" class="com.senseidb.search.node.NoOpIndexableInterpreter" />
 
   <bean id="lucene-version" class="org.springframework.beans.factory.config.FieldRetrievingFactoryBean">
-    <property name="staticField" value="org.apache.lucene.util.Version.LUCENE_34"/>
+    <property name="staticField" value="org.apache.lucene.util.Version.LUCENE_35"/>
   </bean>
 
   <bean id="analyzer" class="org.apache.lucene.analysis.standard.StandardAnalyzer">
@@ -19,7 +19,7 @@
 
   <bean id="similarity" class="org.apache.lucene.search.DefaultSimilarity" />
 
-  <bean id="idxDecorator" class="com.sensei.search.nodes.SenseiIndexReaderDecorator">
+  <bean id="idxDecorator" class="com.senseidb.search.node.SenseiIndexReaderDecorator">
     <constructor-arg ref="handlers" />
     <constructor-arg>
       <list>
@@ -32,7 +32,7 @@
     <property name="freshness" value="50" />
   </bean>
 
-  <bean id="zoie-system-factory" class="com.sensei.test.ZoieTestFactory">
+  <bean id="zoie-system-factory" class="com.senseidb.test.ZoieTestFactory">
     <constructor-arg value="file:data/cardata"/>
     <constructor-arg ref="interpreter" />
     <constructor-arg ref="idxDecorator" />

diff --git a/sensei-core/src/test/resources/refactored-configuration/sensei.properties b/sensei-core/src/test/resources/refactored-configuration/sensei.properties
@@ -2,19 +2,19 @@
 sensei.index.analyzer.class = org.apache.lucene.analysis.WhitespaceAnalyzer
 
 #MyCustomRouterFactory needs to implement the SenseiPlugin interface to access property1 & property2
-sensei.search.router.factory.class=com.sensei.plugin.test.MyCustomRouterFactory
+sensei.search.router.factory.class=com.senseidb.test.plugin.MyCustomRouterFactory
 sensei.search.router.factory.property1=prop1
 sensei.search.router.factory.property2=prop2
 sensei.search.router.factory.property3=3
 sensei.search.router.factory.property4=
-my.custom.facets.virtual_groupid.class=com.sensei.plugin.test.VirtualGroupIdFactory
+my.custom.facets.virtual_groupid.class=com.senseidb.test.plugin.VirtualGroupIdFactory
 my.custom.facets.virtual_groupid.typeProp=default
 
-my.custom.facets.virtual_groupid_fixedlengthlongarray.class=com.sensei.plugin.test.VirtualGroupIdFactory
+my.custom.facets.virtual_groupid_fixedlengthlongarray.class=com.senseidb.test.plugin.VirtualGroupIdFactory
 my.custom.facets.virtual_groupid_fixedlengthlongarray.typeProp=fixedlengthlongarray
 
 #Sensei plugin factory returns the list of custom facets
-my.custom.facets.other_custom_facets.class=com.sensei.plugin.test.OtherCustomFacetsFactory
+my.custom.facets.other_custom_facets.class=com.senseidb.test.plugin.OtherCustomFacetsFactory
 # the list of beans might be referenced both by simple name and the full prefix
 sensei.custom.facets.list= virtual_groupid, virtual_groupid_fixedlengthlongarray, my.custom.facets.other_custom_facets