You are viewing a plain text version of this content. The canonical link for it is here.
Posted to s4-commits@incubator.apache.org by mm...@apache.org on 2012/01/03 11:19:15 UTC
[15/50] [abbrv] git commit: Rename packages in preparation for move
to Apache
Rename packages in preparation for move to Apache
Project: http://git-wip-us.apache.org/repos/asf/incubator-s4/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-s4/commit/d382e44b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-s4/tree/d382e44b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-s4/diff/d382e44b
Branch: refs/heads/dev
Commit: d382e44bb772fcecd25133979a48f1186cb04737
Parents: df4c807
Author: Bruce Robbins <ro...@everychoose-lm.corp.yahoo.com>
Authored: Mon Nov 21 10:58:08 2011 -0800
Committer: Bruce Robbins <ro...@everychoose-lm.corp.yahoo.com>
Committed: Mon Nov 21 10:58:08 2011 -0800
----------------------------------------------------------------------
dev-notes.txt | 16 +++---
.../s4-core/conf/default/adapter-conf.xml | 12 ++--
.../s4-core/conf/default/client-adapter-conf.xml | 20 +++---
.../s4-core/conf/default/client-stub-conf.xml | 2 +-
.../resources/s4-core/conf/default/event-clock.xml | 2 +-
.../s4-core/conf/default/s4-core-conf.xml | 36 ++++++------
.../resources/s4-core/conf/default/wall-clock.xml | 2 +-
.../s4-core/conf/dynamic/adapter-conf.xml | 12 ++--
.../s4-core/conf/dynamic/client-adapter-conf.xml | 20 +++---
.../s4-core/conf/dynamic/client-stub-conf.xml | 2 +-
.../resources/s4-core/conf/dynamic/event-clock.xml | 2 +-
.../s4-core/conf/dynamic/s4-core-conf.xml | 36 ++++++------
.../resources/s4-core/conf/dynamic/wall-clock.xml | 2 +-
.../src/main/resources/scripts/generate-load.sh | 2 +-
s4-core/src/main/resources/scripts/run-adapter.sh | 2 +-
.../main/resources/scripts/run-client-adapter.sh | 2 +-
s4-core/src/main/resources/scripts/start-s4.sh | 2 +-
s4-core/src/main/resources/scripts/task-setup.sh | 2 +-
.../test/java/org/apache/s4/ft/adapter_conf.xml | 12 ++--
.../src/test/java/org/apache/s4/ft/app_conf.xml | 4 +-
.../org/apache/s4/ft/s4_core_conf_bk_backend.xml | 46 +++++++-------
.../org/apache/s4/ft/s4_core_conf_fs_backend.xml | 46 +++++++-------
.../src/test/java/org/apache/s4/ft/wall_clock.xml | 2 +-
.../java/org/apache/s4/ft/wordcount/app_conf.xml | 16 +++---
.../s4/ft/wordcount/s4_core_conf_fs_backend.xml | 46 +++++++-------
.../s4/ft/wordcount/s4_core_conf_redis_backend.xml | 46 +++++++-------
.../java/org/apache/s4/ft/wordcount/wall_clock.xml | 2 +-
.../test/java/org/apache/s4/wordcount/app_conf.xml | 16 +++---
.../java/org/apache/s4/wordcount/s4_core_conf.xml | 44 +++++++-------
.../java/org/apache/s4/wordcount/wall_clock.xml | 2 +-
.../examples/src/main/resources/scripts/inject.sh | 2 +-
.../examples/src/main/resources/scripts/read.sh | 2 +-
.../examples/src/main/resources/scripts/request.py | 4 +-
.../examples/src/main/resources/scripts/request.sh | 2 +-
.../examples/src/main/resources/scripts/test.py | 4 +-
.../src/main/resources/adapter-conf.xml | 4 +-
.../src/main/resources/scripts/generate-load.sh | 2 +-
37 files changed, 238 insertions(+), 238 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-s4/blob/d382e44b/dev-notes.txt
----------------------------------------------------------------------
diff --git a/dev-notes.txt b/dev-notes.txt
index 579416a..b1274c9 100644
--- a/dev-notes.txt
+++ b/dev-notes.txt
@@ -34,10 +34,10 @@ $S4_IMAGE/scripts/run-client-adapter.sh -s client-adapter -g s4 \
# Inject events.
perl $S4_IMAGE/s4-driver/scripts/inject.pl RawSpeech \
-io.s4.example.speech01.Speech < $S4_IMAGE/testinput/speech.in
+org.apache.s4.example.speech01.Speech < $S4_IMAGE/testinput/speech.in
perl $S4_IMAGE/s4-driver/scripts/inject.pl RawSentence \
-io.s4.example.speech01.Sentence < $S4_IMAGE/testinput/sentence.in
+org.apache.s4.example.speech01.Sentence < $S4_IMAGE/testinput/sentence.in
## Injecting Events with a Java Client
@@ -46,10 +46,10 @@ io.s4.example.speech01.Sentence < $S4_IMAGE/testinput/sentence.in
# Inject events.
$S4_IMAGE/s4-driver/scripts/inject.sh localhost 2334 RawSpeech \
-io.s4.example.speech01.Speech < $S4_IMAGE/testinput/speech.in
+org.apache.s4.example.speech01.Speech < $S4_IMAGE/testinput/speech.in
$S4_IMAGE/s4-driver/scripts/inject.sh localhost 2334 RawSentence \
-io.s4.example.speech01.Sentence < $S4_IMAGE/testinput/sentence.in
+org.apache.s4.example.speech01.Sentence < $S4_IMAGE/testinput/sentence.in
## Receiving Events
@@ -73,10 +73,10 @@ export PERLLIB=${S4_IMAGE}/s4-driver/lib/perl
# Inject events.
perl $S4_IMAGE/s4-driver/scripts/inject.pl RawSpeech \
-io.s4.example.speech01.Speech < $S4_IMAGE/testinput/speech.in
+org.apache.s4.example.speech01.Speech < $S4_IMAGE/testinput/speech.in
perl $S4_IMAGE/s4-driver/scripts/inject.pl RawSentence \
-io.s4.example.speech01.Sentence < $S4_IMAGE/testinput/sentence.in
+org.apache.s4.example.speech01.Sentence < $S4_IMAGE/testinput/sentence.in
## Request-Response
@@ -84,11 +84,11 @@ io.s4.example.speech01.Sentence < $S4_IMAGE/testinput/sentence.in
# Example 1: query the prototype of the joiner (SentenceJoinPE)
# in the speech02 application.
python $S4_IMAGE/s4-driver/scripts/request.py '#sentenceJoinPE' \
-'io.s4.message.PrototypeRequest' < $S4_IMAGE/testinput/proto-query
+'org.apache.s4.message.PrototypeRequest' < $S4_IMAGE/testinput/proto-query
# Example 2: request to a single PE from
python $S4_IMAGE/s4-driver/scripts/request.py '#sentenceJoinPE' \
-'io.s4.message.SinglePERequest' < $S4_IMAGE/testinput/pe-query
+'org.apache.s4.message.SinglePERequest' < $S4_IMAGE/testinput/pe-query
-------
http://git-wip-us.apache.org/repos/asf/incubator-s4/blob/d382e44b/s4-core/src/main/resources/s4-core/conf/default/adapter-conf.xml
----------------------------------------------------------------------
diff --git a/s4-core/src/main/resources/s4-core/conf/default/adapter-conf.xml b/s4-core/src/main/resources/s4-core/conf/default/adapter-conf.xml
index f19c1e7..ee07dfb 100644
--- a/s4-core/src/main/resources/s4-core/conf/default/adapter-conf.xml
+++ b/s4-core/src/main/resources/s4-core/conf/default/adapter-conf.xml
@@ -7,23 +7,23 @@
<property name="ignoreUnresolvablePlaceholders" value="true"/>
</bean>
- <bean id="commLayerEmitter" class="io.s4.emitter.CommLayerEmitter" init-method="init">
+ <bean id="commLayerEmitter" class="org.apache.s4.emitter.CommLayerEmitter" init-method="init">
<property name="serDeser" ref="serDeser"/>
<property name="appName" value="${appName}"/>
<property name="listenerAppName" value="${listenerAppName}"/>
<property name="monitor" ref="monitor"/>
</bean>
- <bean id="serDeser" class="io.s4.serialize.KryoSerDeser"/>
+ <bean id="serDeser" class="org.apache.s4.serialize.KryoSerDeser"/>
- <bean id="monitor" class="io.s4.logger.Log4jMonitor" lazy-init="true" init-method="init">
+ <bean id="monitor" class="org.apache.s4.logger.Log4jMonitor" lazy-init="true" init-method="init">
<property name="flushInterval" value="30"/>
<property name="loggerName" value="monitor"/>
</bean>
- <bean id="dummyPartitioner" class="io.s4.dispatcher.partitioner.DummyPartitioner"/>
+ <bean id="dummyPartitioner" class="org.apache.s4.dispatcher.partitioner.DummyPartitioner"/>
- <bean id="dispatcher" class="io.s4.dispatcher.Dispatcher" init-method="init">
+ <bean id="dispatcher" class="org.apache.s4.dispatcher.Dispatcher" init-method="init">
<property name="partitioners">
<list>
<ref bean="dummyPartitioner"/>
@@ -33,7 +33,7 @@
<property name="loggerName" value="s4"/>
</bean>
- <bean id="adapter" class="io.s4.adapter.Adapter"
+ <bean id="adapter" class="org.apache.s4.adapter.Adapter"
init-method="init">
<property name="dispatcher" ref="dispatcher"/>
</bean>
http://git-wip-us.apache.org/repos/asf/incubator-s4/blob/d382e44b/s4-core/src/main/resources/s4-core/conf/default/client-adapter-conf.xml
----------------------------------------------------------------------
diff --git a/s4-core/src/main/resources/s4-core/conf/default/client-adapter-conf.xml b/s4-core/src/main/resources/s4-core/conf/default/client-adapter-conf.xml
index 51e8607..af3b5b6 100644
--- a/s4-core/src/main/resources/s4-core/conf/default/client-adapter-conf.xml
+++ b/s4-core/src/main/resources/s4-core/conf/default/client-adapter-conf.xml
@@ -7,7 +7,7 @@
<property name="ignoreUnresolvablePlaceholders" value="true"/>
</bean>
- <bean id="commLayerEmitter" class="io.s4.emitter.CommLayerEmitter" init-method="init">
+ <bean id="commLayerEmitter" class="org.apache.s4.emitter.CommLayerEmitter" init-method="init">
<property name="serDeser" ref="serDeser"/>
<property name="appName" value="${appName}"/>
<property name="listenerAppName" value="${listenerAppName}"/>
@@ -15,9 +15,9 @@
<property name="monitor" ref="monitor"/>
</bean>
- <bean id="serDeser" class="io.s4.serialize.KryoSerDeser"/>
+ <bean id="serDeser" class="org.apache.s4.serialize.KryoSerDeser"/>
- <bean id="rawListener" class="io.s4.listener.CommLayerListener" init-method="init">
+ <bean id="rawListener" class="org.apache.s4.listener.CommLayerListener" init-method="init">
<property name="serDeser" ref="serDeser"/>
<property name="clusterManagerAddress" value="${zk_address}"/>
<!-- <property name="clusterType" value="ADAPTER"/> -->
@@ -26,27 +26,27 @@
<property name="monitor" ref="monitor"/>
</bean>
- <bean id="eventListener" class="io.s4.collector.EventListener" init-method="init">
+ <bean id="eventListener" class="org.apache.s4.collector.EventListener" init-method="init">
<property name="rawListener" ref="rawListener"/>
<property name="monitor" ref="monitor"/>
</bean>
- <bean id="monitor" class="io.s4.logger.Log4jMonitor" lazy-init="true" init-method="init">
+ <bean id="monitor" class="org.apache.s4.logger.Log4jMonitor" lazy-init="true" init-method="init">
<property name="flushInterval" value="30"/>
<property name="loggerName" value="monitor"/>
</bean>
- <bean id="dummyPartitioner" class="io.s4.dispatcher.partitioner.DummyPartitioner"/>
+ <bean id="dummyPartitioner" class="org.apache.s4.dispatcher.partitioner.DummyPartitioner"/>
- <bean id="hasher" class="io.s4.dispatcher.partitioner.DefaultHasher"/>
+ <bean id="hasher" class="org.apache.s4.dispatcher.partitioner.DefaultHasher"/>
- <bean id="genericPartitioner" class="io.s4.dispatcher.partitioner.DefaultPartitioner">
+ <bean id="genericPartitioner" class="org.apache.s4.dispatcher.partitioner.DefaultPartitioner">
<property name="hasher" ref="hasher"/>
<property name="debug" value="false"/>
</bean>
- <bean id="dispatcher" class="io.s4.dispatcher.Dispatcher" init-method="init">
+ <bean id="dispatcher" class="org.apache.s4.dispatcher.Dispatcher" init-method="init">
<property name="partitioners">
<list>
<ref bean="genericPartitioner"/>
@@ -56,7 +56,7 @@
<property name="loggerName" value="s4"/>
</bean>
- <bean id="client_adapter" class="io.s4.client.Adapter"
+ <bean id="client_adapter" class="org.apache.s4.client.Adapter"
init-method="init">
<property name="dispatcher" ref="dispatcher"/>
<property name="clusterEventListener" ref="eventListener"/>
http://git-wip-us.apache.org/repos/asf/incubator-s4/blob/d382e44b/s4-core/src/main/resources/s4-core/conf/default/client-stub-conf.xml
----------------------------------------------------------------------
diff --git a/s4-core/src/main/resources/s4-core/conf/default/client-stub-conf.xml b/s4-core/src/main/resources/s4-core/conf/default/client-stub-conf.xml
index 851c0a5..6af5414 100644
--- a/s4-core/src/main/resources/s4-core/conf/default/client-stub-conf.xml
+++ b/s4-core/src/main/resources/s4-core/conf/default/client-stub-conf.xml
@@ -7,7 +7,7 @@
<property name="ignoreUnresolvablePlaceholders" value="true"/>
</bean>
- <bean id="genericStub" class="io.s4.client.GenericJsonClientStub" init-method="init">
+ <bean id="genericStub" class="org.apache.s4.client.GenericJsonClientStub" init-method="init">
<property name="connectionPort" value="2334"/>
</bean>
</beans>
http://git-wip-us.apache.org/repos/asf/incubator-s4/blob/d382e44b/s4-core/src/main/resources/s4-core/conf/default/event-clock.xml
----------------------------------------------------------------------
diff --git a/s4-core/src/main/resources/s4-core/conf/default/event-clock.xml b/s4-core/src/main/resources/s4-core/conf/default/event-clock.xml
index 9305786..6399c51 100644
--- a/s4-core/src/main/resources/s4-core/conf/default/event-clock.xml
+++ b/s4-core/src/main/resources/s4-core/conf/default/event-clock.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
- <bean id="clock" class="io.s4.util.clock.EventClock"/>
+ <bean id="clock" class="org.apache.s4.util.clock.EventClock"/>
</beans>
http://git-wip-us.apache.org/repos/asf/incubator-s4/blob/d382e44b/s4-core/src/main/resources/s4-core/conf/default/s4-core-conf.xml
----------------------------------------------------------------------
diff --git a/s4-core/src/main/resources/s4-core/conf/default/s4-core-conf.xml b/s4-core/src/main/resources/s4-core/conf/default/s4-core-conf.xml
index 1eccd39..b3dd487 100644
--- a/s4-core/src/main/resources/s4-core/conf/default/s4-core-conf.xml
+++ b/s4-core/src/main/resources/s4-core/conf/default/s4-core-conf.xml
@@ -13,22 +13,22 @@
<property name="ignoreUnresolvablePlaceholders" value="true"/>
</bean>
- <bean id="hasher" class="io.s4.dispatcher.partitioner.DefaultHasher"/>
+ <bean id="hasher" class="org.apache.s4.dispatcher.partitioner.DefaultHasher"/>
- <bean id="commLayerEmitterToAdapter" class="io.s4.emitter.CommLayerEmitter" init-method="init">
+ <bean id="commLayerEmitterToAdapter" class="org.apache.s4.emitter.CommLayerEmitter" init-method="init">
<property name="serDeser" ref="serDeser"/>
<property name="listener" ref="rawListener"/>
<property name="listenerAppName" value="${adapter_app_name}"/>
<property name="monitor" ref="monitor"/>
</bean>
- <bean id="commLayerEmitter" class="io.s4.emitter.CommLayerEmitter" init-method="init">
+ <bean id="commLayerEmitter" class="org.apache.s4.emitter.CommLayerEmitter" init-method="init">
<property name="serDeser" ref="serDeser"/>
<property name="listener" ref="rawListener"/>
<property name="monitor" ref="monitor"/>
</bean>
- <bean id="serDeser" class="io.s4.serialize.KryoSerDeser">
+ <bean id="serDeser" class="org.apache.s4.serialize.KryoSerDeser">
<property name="initialBufferSize" value="${kryoSerDeser.initialBufferSize}"/>
<property name="maxBufferSize" value="${kryoSerDeser.maxBufferSize}"/>
</bean>
@@ -39,7 +39,7 @@
then the event is sent to the adapter
(via ctrlDispatcherAdapter). Else it is sent to the
S4 cluster itself (via ctrlDispatcherS4) -->
- <bean id="ctrlDispatcher" class="io.s4.dispatcher.MultiDispatcher">
+ <bean id="ctrlDispatcher" class="org.apache.s4.dispatcher.MultiDispatcher">
<property name="dispatchers">
<list>
<ref bean="ctrlDispatcherFilteredS4"/>
@@ -48,7 +48,7 @@
</property>
</bean>
- <bean id="ctrlDispatcherFilteredAdapter" class="io.s4.dispatcher.StreamSelectingDispatcher">
+ <bean id="ctrlDispatcherFilteredAdapter" class="org.apache.s4.dispatcher.StreamSelectingDispatcher">
<property name="dispatcher" ref="ctrlDispatcherAdapter"/>
<property name="streams">
<list>
@@ -57,7 +57,7 @@
</property>
</bean>
- <bean id="ctrlDispatcherFilteredS4" class="io.s4.dispatcher.StreamExcludingDispatcher">
+ <bean id="ctrlDispatcherFilteredS4" class="org.apache.s4.dispatcher.StreamExcludingDispatcher">
<property name="dispatcher" ref="ctrlDispatcherS4"/>
<property name="streams">
<list>
@@ -66,12 +66,12 @@
</property>
</bean>
- <bean id="genericPartitioner" class="io.s4.dispatcher.partitioner.DefaultPartitioner">
+ <bean id="genericPartitioner" class="org.apache.s4.dispatcher.partitioner.DefaultPartitioner">
<property name="hasher" ref="hasher"/>
<property name="debug" value="false"/>
</bean>
- <bean id="ctrlDispatcherS4" class="io.s4.dispatcher.Dispatcher" init-method="init">
+ <bean id="ctrlDispatcherS4" class="org.apache.s4.dispatcher.Dispatcher" init-method="init">
<property name="partitioners">
<list>
<ref bean="genericPartitioner"/>
@@ -81,7 +81,7 @@
<property name="loggerName" value="s4"/>
</bean>
- <bean id="ctrlDispatcherAdapter" class="io.s4.dispatcher.Dispatcher" init-method="init">
+ <bean id="ctrlDispatcherAdapter" class="org.apache.s4.dispatcher.Dispatcher" init-method="init">
<property name="partitioners">
<list>
<ref bean="genericPartitioner"/>
@@ -93,11 +93,11 @@
<!-- END: Dispatchers for control events -->
<!-- Control Events handler -->
- <bean id="ctrlHandler" class="io.s4.processor.ControlEventProcessor">
+ <bean id="ctrlHandler" class="org.apache.s4.processor.ControlEventProcessor">
<property name="dispatcher" ref="ctrlDispatcher"/>
</bean>
- <bean id="peContainer" class="io.s4.processor.PEContainer" init-method="init" lazy-init="true">
+ <bean id="peContainer" class="org.apache.s4.processor.PEContainer" init-method="init" lazy-init="true">
<property name="maxQueueSize" value="${pe_container_max_queue_size}"/>
<property name="monitor" ref="monitor"/>
<property name="trackByKey" value="true"/>
@@ -105,7 +105,7 @@
<property name="controlEventProcessor" ref="ctrlHandler"/>
</bean>
- <bean id="rawListener" class="io.s4.listener.CommLayerListener" init-method="init">
+ <bean id="rawListener" class="org.apache.s4.listener.CommLayerListener" init-method="init">
<property name="serDeser" ref="serDeser"/>
<property name="clusterManagerAddress" value="${zk_address}"/>
<property name="appName" value="${s4_app_name}"/>
@@ -113,18 +113,18 @@
<property name="monitor" ref="monitor"/>
</bean>
- <bean id="eventListener" class="io.s4.collector.EventListener" init-method="init">
+ <bean id="eventListener" class="org.apache.s4.collector.EventListener" init-method="init">
<property name="rawListener" ref="rawListener"/>
<property name="peContainer" ref="peContainer"/>
<property name="monitor" ref="monitor"/>
</bean>
- <bean id="monitor" class="io.s4.logger.Log4jMonitor" lazy-init="true" init-method="init">
+ <bean id="monitor" class="org.apache.s4.logger.Log4jMonitor" lazy-init="true" init-method="init">
<property name="flushInterval" value="30"/>
<property name="loggerName" value="monitor"/>
</bean>
- <bean id="watcher" class="io.s4.util.Watcher" init-method="init" lazy-init="true">
+ <bean id="watcher" class="org.apache.s4.util.Watcher" init-method="init" lazy-init="true">
<property name="monitor" ref="monitor"/>
<property name="peContainer" ref="peContainer"/>
<property name="minimumMemory" value="52428800"/>
@@ -136,7 +136,7 @@
<!-- Some useful beans related to client-adapter for apps -->
<!-- Dispatcher to send to all adapter nodes. -->
- <bean id="dispatcherToClientAdapters" class="io.s4.dispatcher.Dispatcher" init-method="init">
+ <bean id="dispatcherToClientAdapters" class="org.apache.s4.dispatcher.Dispatcher" init-method="init">
<property name="partitioners">
<list>
<ref bean="broadcastPartitioner"/>
@@ -147,6 +147,6 @@
</bean>
<!-- Partitioner to achieve broadcast -->
- <bean id="broadcastPartitioner" class="io.s4.dispatcher.partitioner.BroadcastPartitioner"/>
+ <bean id="broadcastPartitioner" class="org.apache.s4.dispatcher.partitioner.BroadcastPartitioner"/>
</beans>
http://git-wip-us.apache.org/repos/asf/incubator-s4/blob/d382e44b/s4-core/src/main/resources/s4-core/conf/default/wall-clock.xml
----------------------------------------------------------------------
diff --git a/s4-core/src/main/resources/s4-core/conf/default/wall-clock.xml b/s4-core/src/main/resources/s4-core/conf/default/wall-clock.xml
index e149ecc..cc571a6 100644
--- a/s4-core/src/main/resources/s4-core/conf/default/wall-clock.xml
+++ b/s4-core/src/main/resources/s4-core/conf/default/wall-clock.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
- <bean id="clock" class="io.s4.util.clock.WallClock"/>
+ <bean id="clock" class="org.apache.s4.util.clock.WallClock"/>
</beans>
http://git-wip-us.apache.org/repos/asf/incubator-s4/blob/d382e44b/s4-core/src/main/resources/s4-core/conf/dynamic/adapter-conf.xml
----------------------------------------------------------------------
diff --git a/s4-core/src/main/resources/s4-core/conf/dynamic/adapter-conf.xml b/s4-core/src/main/resources/s4-core/conf/dynamic/adapter-conf.xml
index 4d1f3e5..7f84d8a 100644
--- a/s4-core/src/main/resources/s4-core/conf/dynamic/adapter-conf.xml
+++ b/s4-core/src/main/resources/s4-core/conf/dynamic/adapter-conf.xml
@@ -7,7 +7,7 @@
<property name="ignoreUnresolvablePlaceholders" value="true"/>
</bean>
- <bean id="commLayerEmitter" class="io.s4.emitter.CommLayerEmitter" init-method="init">
+ <bean id="commLayerEmitter" class="org.apache.s4.emitter.CommLayerEmitter" init-method="init">
<property name="clusterManagerAddress" value="${zk_address}"/>
<property name="serDeser" ref="serDeser"/>
<property name="appName" value="${appName}"/>
@@ -15,16 +15,16 @@
<property name="monitor" ref="monitor"/>
</bean>
- <bean id="serDeser" class="io.s4.serialize.KryoSerDeser"/>
+ <bean id="serDeser" class="org.apache.s4.serialize.KryoSerDeser"/>
- <bean id="monitor" class="io.s4.logger.Log4jMonitor" lazy-init="true" init-method="init">
+ <bean id="monitor" class="org.apache.s4.logger.Log4jMonitor" lazy-init="true" init-method="init">
<property name="flushInterval" value="30"/>
<property name="loggerName" value="monitor"/>
</bean>
- <bean id="dummyPartitioner" class="io.s4.dispatcher.partitioner.DummyPartitioner"/>
+ <bean id="dummyPartitioner" class="org.apache.s4.dispatcher.partitioner.DummyPartitioner"/>
- <bean id="dispatcher" class="io.s4.dispatcher.Dispatcher" init-method="init">
+ <bean id="dispatcher" class="org.apache.s4.dispatcher.Dispatcher" init-method="init">
<property name="partitioners">
<list>
<ref bean="dummyPartitioner"/>
@@ -34,7 +34,7 @@
<property name="loggerName" value="s4"/>
</bean>
- <bean id="adapter" class="io.s4.adapter.Adapter"
+ <bean id="adapter" class="org.apache.s4.adapter.Adapter"
init-method="init">
<property name="dispatcher" ref="dispatcher"/>
</bean>
http://git-wip-us.apache.org/repos/asf/incubator-s4/blob/d382e44b/s4-core/src/main/resources/s4-core/conf/dynamic/client-adapter-conf.xml
----------------------------------------------------------------------
diff --git a/s4-core/src/main/resources/s4-core/conf/dynamic/client-adapter-conf.xml b/s4-core/src/main/resources/s4-core/conf/dynamic/client-adapter-conf.xml
index 51e8607..af3b5b6 100644
--- a/s4-core/src/main/resources/s4-core/conf/dynamic/client-adapter-conf.xml
+++ b/s4-core/src/main/resources/s4-core/conf/dynamic/client-adapter-conf.xml
@@ -7,7 +7,7 @@
<property name="ignoreUnresolvablePlaceholders" value="true"/>
</bean>
- <bean id="commLayerEmitter" class="io.s4.emitter.CommLayerEmitter" init-method="init">
+ <bean id="commLayerEmitter" class="org.apache.s4.emitter.CommLayerEmitter" init-method="init">
<property name="serDeser" ref="serDeser"/>
<property name="appName" value="${appName}"/>
<property name="listenerAppName" value="${listenerAppName}"/>
@@ -15,9 +15,9 @@
<property name="monitor" ref="monitor"/>
</bean>
- <bean id="serDeser" class="io.s4.serialize.KryoSerDeser"/>
+ <bean id="serDeser" class="org.apache.s4.serialize.KryoSerDeser"/>
- <bean id="rawListener" class="io.s4.listener.CommLayerListener" init-method="init">
+ <bean id="rawListener" class="org.apache.s4.listener.CommLayerListener" init-method="init">
<property name="serDeser" ref="serDeser"/>
<property name="clusterManagerAddress" value="${zk_address}"/>
<!-- <property name="clusterType" value="ADAPTER"/> -->
@@ -26,27 +26,27 @@
<property name="monitor" ref="monitor"/>
</bean>
- <bean id="eventListener" class="io.s4.collector.EventListener" init-method="init">
+ <bean id="eventListener" class="org.apache.s4.collector.EventListener" init-method="init">
<property name="rawListener" ref="rawListener"/>
<property name="monitor" ref="monitor"/>
</bean>
- <bean id="monitor" class="io.s4.logger.Log4jMonitor" lazy-init="true" init-method="init">
+ <bean id="monitor" class="org.apache.s4.logger.Log4jMonitor" lazy-init="true" init-method="init">
<property name="flushInterval" value="30"/>
<property name="loggerName" value="monitor"/>
</bean>
- <bean id="dummyPartitioner" class="io.s4.dispatcher.partitioner.DummyPartitioner"/>
+ <bean id="dummyPartitioner" class="org.apache.s4.dispatcher.partitioner.DummyPartitioner"/>
- <bean id="hasher" class="io.s4.dispatcher.partitioner.DefaultHasher"/>
+ <bean id="hasher" class="org.apache.s4.dispatcher.partitioner.DefaultHasher"/>
- <bean id="genericPartitioner" class="io.s4.dispatcher.partitioner.DefaultPartitioner">
+ <bean id="genericPartitioner" class="org.apache.s4.dispatcher.partitioner.DefaultPartitioner">
<property name="hasher" ref="hasher"/>
<property name="debug" value="false"/>
</bean>
- <bean id="dispatcher" class="io.s4.dispatcher.Dispatcher" init-method="init">
+ <bean id="dispatcher" class="org.apache.s4.dispatcher.Dispatcher" init-method="init">
<property name="partitioners">
<list>
<ref bean="genericPartitioner"/>
@@ -56,7 +56,7 @@
<property name="loggerName" value="s4"/>
</bean>
- <bean id="client_adapter" class="io.s4.client.Adapter"
+ <bean id="client_adapter" class="org.apache.s4.client.Adapter"
init-method="init">
<property name="dispatcher" ref="dispatcher"/>
<property name="clusterEventListener" ref="eventListener"/>
http://git-wip-us.apache.org/repos/asf/incubator-s4/blob/d382e44b/s4-core/src/main/resources/s4-core/conf/dynamic/client-stub-conf.xml
----------------------------------------------------------------------
diff --git a/s4-core/src/main/resources/s4-core/conf/dynamic/client-stub-conf.xml b/s4-core/src/main/resources/s4-core/conf/dynamic/client-stub-conf.xml
index 851c0a5..6af5414 100644
--- a/s4-core/src/main/resources/s4-core/conf/dynamic/client-stub-conf.xml
+++ b/s4-core/src/main/resources/s4-core/conf/dynamic/client-stub-conf.xml
@@ -7,7 +7,7 @@
<property name="ignoreUnresolvablePlaceholders" value="true"/>
</bean>
- <bean id="genericStub" class="io.s4.client.GenericJsonClientStub" init-method="init">
+ <bean id="genericStub" class="org.apache.s4.client.GenericJsonClientStub" init-method="init">
<property name="connectionPort" value="2334"/>
</bean>
</beans>
http://git-wip-us.apache.org/repos/asf/incubator-s4/blob/d382e44b/s4-core/src/main/resources/s4-core/conf/dynamic/event-clock.xml
----------------------------------------------------------------------
diff --git a/s4-core/src/main/resources/s4-core/conf/dynamic/event-clock.xml b/s4-core/src/main/resources/s4-core/conf/dynamic/event-clock.xml
index 9305786..6399c51 100644
--- a/s4-core/src/main/resources/s4-core/conf/dynamic/event-clock.xml
+++ b/s4-core/src/main/resources/s4-core/conf/dynamic/event-clock.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
- <bean id="clock" class="io.s4.util.clock.EventClock"/>
+ <bean id="clock" class="org.apache.s4.util.clock.EventClock"/>
</beans>
http://git-wip-us.apache.org/repos/asf/incubator-s4/blob/d382e44b/s4-core/src/main/resources/s4-core/conf/dynamic/s4-core-conf.xml
----------------------------------------------------------------------
diff --git a/s4-core/src/main/resources/s4-core/conf/dynamic/s4-core-conf.xml b/s4-core/src/main/resources/s4-core/conf/dynamic/s4-core-conf.xml
index 1eccd39..b3dd487 100644
--- a/s4-core/src/main/resources/s4-core/conf/dynamic/s4-core-conf.xml
+++ b/s4-core/src/main/resources/s4-core/conf/dynamic/s4-core-conf.xml
@@ -13,22 +13,22 @@
<property name="ignoreUnresolvablePlaceholders" value="true"/>
</bean>
- <bean id="hasher" class="io.s4.dispatcher.partitioner.DefaultHasher"/>
+ <bean id="hasher" class="org.apache.s4.dispatcher.partitioner.DefaultHasher"/>
- <bean id="commLayerEmitterToAdapter" class="io.s4.emitter.CommLayerEmitter" init-method="init">
+ <bean id="commLayerEmitterToAdapter" class="org.apache.s4.emitter.CommLayerEmitter" init-method="init">
<property name="serDeser" ref="serDeser"/>
<property name="listener" ref="rawListener"/>
<property name="listenerAppName" value="${adapter_app_name}"/>
<property name="monitor" ref="monitor"/>
</bean>
- <bean id="commLayerEmitter" class="io.s4.emitter.CommLayerEmitter" init-method="init">
+ <bean id="commLayerEmitter" class="org.apache.s4.emitter.CommLayerEmitter" init-method="init">
<property name="serDeser" ref="serDeser"/>
<property name="listener" ref="rawListener"/>
<property name="monitor" ref="monitor"/>
</bean>
- <bean id="serDeser" class="io.s4.serialize.KryoSerDeser">
+ <bean id="serDeser" class="org.apache.s4.serialize.KryoSerDeser">
<property name="initialBufferSize" value="${kryoSerDeser.initialBufferSize}"/>
<property name="maxBufferSize" value="${kryoSerDeser.maxBufferSize}"/>
</bean>
@@ -39,7 +39,7 @@
then the event is sent to the adapter
(via ctrlDispatcherAdapter). Else it is sent to the
S4 cluster itself (via ctrlDispatcherS4) -->
- <bean id="ctrlDispatcher" class="io.s4.dispatcher.MultiDispatcher">
+ <bean id="ctrlDispatcher" class="org.apache.s4.dispatcher.MultiDispatcher">
<property name="dispatchers">
<list>
<ref bean="ctrlDispatcherFilteredS4"/>
@@ -48,7 +48,7 @@
</property>
</bean>
- <bean id="ctrlDispatcherFilteredAdapter" class="io.s4.dispatcher.StreamSelectingDispatcher">
+ <bean id="ctrlDispatcherFilteredAdapter" class="org.apache.s4.dispatcher.StreamSelectingDispatcher">
<property name="dispatcher" ref="ctrlDispatcherAdapter"/>
<property name="streams">
<list>
@@ -57,7 +57,7 @@
</property>
</bean>
- <bean id="ctrlDispatcherFilteredS4" class="io.s4.dispatcher.StreamExcludingDispatcher">
+ <bean id="ctrlDispatcherFilteredS4" class="org.apache.s4.dispatcher.StreamExcludingDispatcher">
<property name="dispatcher" ref="ctrlDispatcherS4"/>
<property name="streams">
<list>
@@ -66,12 +66,12 @@
</property>
</bean>
- <bean id="genericPartitioner" class="io.s4.dispatcher.partitioner.DefaultPartitioner">
+ <bean id="genericPartitioner" class="org.apache.s4.dispatcher.partitioner.DefaultPartitioner">
<property name="hasher" ref="hasher"/>
<property name="debug" value="false"/>
</bean>
- <bean id="ctrlDispatcherS4" class="io.s4.dispatcher.Dispatcher" init-method="init">
+ <bean id="ctrlDispatcherS4" class="org.apache.s4.dispatcher.Dispatcher" init-method="init">
<property name="partitioners">
<list>
<ref bean="genericPartitioner"/>
@@ -81,7 +81,7 @@
<property name="loggerName" value="s4"/>
</bean>
- <bean id="ctrlDispatcherAdapter" class="io.s4.dispatcher.Dispatcher" init-method="init">
+ <bean id="ctrlDispatcherAdapter" class="org.apache.s4.dispatcher.Dispatcher" init-method="init">
<property name="partitioners">
<list>
<ref bean="genericPartitioner"/>
@@ -93,11 +93,11 @@
<!-- END: Dispatchers for control events -->
<!-- Control Events handler -->
- <bean id="ctrlHandler" class="io.s4.processor.ControlEventProcessor">
+ <bean id="ctrlHandler" class="org.apache.s4.processor.ControlEventProcessor">
<property name="dispatcher" ref="ctrlDispatcher"/>
</bean>
- <bean id="peContainer" class="io.s4.processor.PEContainer" init-method="init" lazy-init="true">
+ <bean id="peContainer" class="org.apache.s4.processor.PEContainer" init-method="init" lazy-init="true">
<property name="maxQueueSize" value="${pe_container_max_queue_size}"/>
<property name="monitor" ref="monitor"/>
<property name="trackByKey" value="true"/>
@@ -105,7 +105,7 @@
<property name="controlEventProcessor" ref="ctrlHandler"/>
</bean>
- <bean id="rawListener" class="io.s4.listener.CommLayerListener" init-method="init">
+ <bean id="rawListener" class="org.apache.s4.listener.CommLayerListener" init-method="init">
<property name="serDeser" ref="serDeser"/>
<property name="clusterManagerAddress" value="${zk_address}"/>
<property name="appName" value="${s4_app_name}"/>
@@ -113,18 +113,18 @@
<property name="monitor" ref="monitor"/>
</bean>
- <bean id="eventListener" class="io.s4.collector.EventListener" init-method="init">
+ <bean id="eventListener" class="org.apache.s4.collector.EventListener" init-method="init">
<property name="rawListener" ref="rawListener"/>
<property name="peContainer" ref="peContainer"/>
<property name="monitor" ref="monitor"/>
</bean>
- <bean id="monitor" class="io.s4.logger.Log4jMonitor" lazy-init="true" init-method="init">
+ <bean id="monitor" class="org.apache.s4.logger.Log4jMonitor" lazy-init="true" init-method="init">
<property name="flushInterval" value="30"/>
<property name="loggerName" value="monitor"/>
</bean>
- <bean id="watcher" class="io.s4.util.Watcher" init-method="init" lazy-init="true">
+ <bean id="watcher" class="org.apache.s4.util.Watcher" init-method="init" lazy-init="true">
<property name="monitor" ref="monitor"/>
<property name="peContainer" ref="peContainer"/>
<property name="minimumMemory" value="52428800"/>
@@ -136,7 +136,7 @@
<!-- Some useful beans related to client-adapter for apps -->
<!-- Dispatcher to send to all adapter nodes. -->
- <bean id="dispatcherToClientAdapters" class="io.s4.dispatcher.Dispatcher" init-method="init">
+ <bean id="dispatcherToClientAdapters" class="org.apache.s4.dispatcher.Dispatcher" init-method="init">
<property name="partitioners">
<list>
<ref bean="broadcastPartitioner"/>
@@ -147,6 +147,6 @@
</bean>
<!-- Partitioner to achieve broadcast -->
- <bean id="broadcastPartitioner" class="io.s4.dispatcher.partitioner.BroadcastPartitioner"/>
+ <bean id="broadcastPartitioner" class="org.apache.s4.dispatcher.partitioner.BroadcastPartitioner"/>
</beans>
http://git-wip-us.apache.org/repos/asf/incubator-s4/blob/d382e44b/s4-core/src/main/resources/s4-core/conf/dynamic/wall-clock.xml
----------------------------------------------------------------------
diff --git a/s4-core/src/main/resources/s4-core/conf/dynamic/wall-clock.xml b/s4-core/src/main/resources/s4-core/conf/dynamic/wall-clock.xml
index e149ecc..cc571a6 100644
--- a/s4-core/src/main/resources/s4-core/conf/dynamic/wall-clock.xml
+++ b/s4-core/src/main/resources/s4-core/conf/dynamic/wall-clock.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
- <bean id="clock" class="io.s4.util.clock.WallClock"/>
+ <bean id="clock" class="org.apache.s4.util.clock.WallClock"/>
</beans>
http://git-wip-us.apache.org/repos/asf/incubator-s4/blob/d382e44b/s4-core/src/main/resources/scripts/generate-load.sh
----------------------------------------------------------------------
diff --git a/s4-core/src/main/resources/scripts/generate-load.sh b/s4-core/src/main/resources/scripts/generate-load.sh
index e09f68b..1d8fd01 100755
--- a/s4-core/src/main/resources/scripts/generate-load.sh
+++ b/s4-core/src/main/resources/scripts/generate-load.sh
@@ -124,6 +124,6 @@ if [ "x$USER_CLASS_PATH" != "x" ] ; then
fi
-CMD="${JAVA_LOC}java $JAVA_OPTS -classpath $CLASSPATH io.s4.util.LoadGenerator -a ${SENDER_CLUSTER_NAME} -g ${LISTENER_CLUSTER_NAME} -z ${CLUSTER_MANAGER} -r${RATE} -d ${DISPLAY_INTERVAL} $INPUT_FILE"
+CMD="${JAVA_LOC}java $JAVA_OPTS -classpath $CLASSPATH org.apache.s4.util.LoadGenerator -a ${SENDER_CLUSTER_NAME} -g ${LISTENER_CLUSTER_NAME} -z ${CLUSTER_MANAGER} -r${RATE} -d ${DISPLAY_INTERVAL} $INPUT_FILE"
echo "Running ${CMD}"
$CMD
http://git-wip-us.apache.org/repos/asf/incubator-s4/blob/d382e44b/s4-core/src/main/resources/scripts/run-adapter.sh
----------------------------------------------------------------------
diff --git a/s4-core/src/main/resources/scripts/run-adapter.sh b/s4-core/src/main/resources/scripts/run-adapter.sh
index f8e1ace..5a8651d 100755
--- a/s4-core/src/main/resources/scripts/run-adapter.sh
+++ b/s4-core/src/main/resources/scripts/run-adapter.sh
@@ -148,6 +148,6 @@ cat $TMP1/adapter.properties
CLASSPATH=${CLASSPATH}${CP_SEP}${TMP1}
-CMD="${JAVA_LOC}java $JAVA_OPTS -Dlog4j.configuration=file:${CONF_LOC}/log4j.xml -classpath $CLASSPATH io.s4.adapter.Adapter -t ${CONF_TYPE} -c ${CORE_HOME} -d ${DATA_ADAPTER_CONF}"
+CMD="${JAVA_LOC}java $JAVA_OPTS -Dlog4j.configuration=file:${CONF_LOC}/log4j.xml -classpath $CLASSPATH org.apache.s4.adapter.Adapter -t ${CONF_TYPE} -c ${CORE_HOME} -d ${DATA_ADAPTER_CONF}"
echo "Running ${CMD}"
$CMD
http://git-wip-us.apache.org/repos/asf/incubator-s4/blob/d382e44b/s4-core/src/main/resources/scripts/run-client-adapter.sh
----------------------------------------------------------------------
diff --git a/s4-core/src/main/resources/scripts/run-client-adapter.sh b/s4-core/src/main/resources/scripts/run-client-adapter.sh
index 0a82b44..a15443b 100755
--- a/s4-core/src/main/resources/scripts/run-client-adapter.sh
+++ b/s4-core/src/main/resources/scripts/run-client-adapter.sh
@@ -152,6 +152,6 @@ cat $TMP1/client-adapter.properties
CLASSPATH=${CLASSPATH}${CP_SEP}${TMP1}
-CMD="${JAVA_LOC}java $JAVA_OPTS -Dlog4j.configuration=file:${CONF_LOC}/log4j.xml -classpath $CLASSPATH io.s4.client.Adapter -t ${CONF_TYPE} -c ${CORE_HOME} -d ${DATA_ADAPTER_CONF}"
+CMD="${JAVA_LOC}java $JAVA_OPTS -Dlog4j.configuration=file:${CONF_LOC}/log4j.xml -classpath $CLASSPATH org.apache.s4.client.Adapter -t ${CONF_TYPE} -c ${CORE_HOME} -d ${DATA_ADAPTER_CONF}"
echo "Running ${CMD}"
$CMD
http://git-wip-us.apache.org/repos/asf/incubator-s4/blob/d382e44b/s4-core/src/main/resources/scripts/start-s4.sh
----------------------------------------------------------------------
diff --git a/s4-core/src/main/resources/scripts/start-s4.sh b/s4-core/src/main/resources/scripts/start-s4.sh
index 0727f6e..ec99661 100755
--- a/s4-core/src/main/resources/scripts/start-s4.sh
+++ b/s4-core/src/main/resources/scripts/start-s4.sh
@@ -195,7 +195,7 @@ CLASSPATH=$CLASSPATH$CP_SEP$TMP1$CP_SEP$CONF_LOC
#STARTING S4
#---------------------------------------------
-CMD="${JAVA_LOC}java $GC_OPTS $DEBUG_OPTS $MEM_OPTS $JAVA_OPTS -classpath $CORE_HOME$CP_SEP$CLASSPATH -DDequeuerCount=6 -Dlog4j.configuration=file:${CONF_LOC}/log4j.xml io.s4.MainApp -c ${CORE_HOME} -a ${APPS_HOME} -e ${EXTS_HOME} -t ${CONF_TYPE} -d ${S4_CLOCK} $S4_OPTS"
+CMD="${JAVA_LOC}java $GC_OPTS $DEBUG_OPTS $MEM_OPTS $JAVA_OPTS -classpath $CORE_HOME$CP_SEP$CLASSPATH -DDequeuerCount=6 -Dlog4j.configuration=file:${CONF_LOC}/log4j.xml org.apache.s4.MainApp -c ${CORE_HOME} -a ${APPS_HOME} -e ${EXTS_HOME} -t ${CONF_TYPE} -d ${S4_CLOCK} $S4_OPTS"
echo "RUNNING $CMD"
exec ${CMD}
http://git-wip-us.apache.org/repos/asf/incubator-s4/blob/d382e44b/s4-core/src/main/resources/scripts/task-setup.sh
----------------------------------------------------------------------
diff --git a/s4-core/src/main/resources/scripts/task-setup.sh b/s4-core/src/main/resources/scripts/task-setup.sh
index 7ecd17a..3d1d282 100644
--- a/s4-core/src/main/resources/scripts/task-setup.sh
+++ b/s4-core/src/main/resources/scripts/task-setup.sh
@@ -37,6 +37,6 @@ fi
CP=`find ${CORE_HOME}/lib -name "*.jar" | awk '{p=$0"'$CP_SEP'"p;} END {print p}'`
-cmd="${JAVA_LOC}java -classpath $CP io.s4.comm.tools.TaskSetupApp $*"
+cmd="${JAVA_LOC}java -classpath $CP org.apache.s4.comm.tools.TaskSetupApp $*"
echo "RUNNING $cmd"
$cmd
http://git-wip-us.apache.org/repos/asf/incubator-s4/blob/d382e44b/s4-core/src/test/java/org/apache/s4/ft/adapter_conf.xml
----------------------------------------------------------------------
diff --git a/s4-core/src/test/java/org/apache/s4/ft/adapter_conf.xml b/s4-core/src/test/java/org/apache/s4/ft/adapter_conf.xml
index f19c1e7..ee07dfb 100644
--- a/s4-core/src/test/java/org/apache/s4/ft/adapter_conf.xml
+++ b/s4-core/src/test/java/org/apache/s4/ft/adapter_conf.xml
@@ -7,23 +7,23 @@
<property name="ignoreUnresolvablePlaceholders" value="true"/>
</bean>
- <bean id="commLayerEmitter" class="io.s4.emitter.CommLayerEmitter" init-method="init">
+ <bean id="commLayerEmitter" class="org.apache.s4.emitter.CommLayerEmitter" init-method="init">
<property name="serDeser" ref="serDeser"/>
<property name="appName" value="${appName}"/>
<property name="listenerAppName" value="${listenerAppName}"/>
<property name="monitor" ref="monitor"/>
</bean>
- <bean id="serDeser" class="io.s4.serialize.KryoSerDeser"/>
+ <bean id="serDeser" class="org.apache.s4.serialize.KryoSerDeser"/>
- <bean id="monitor" class="io.s4.logger.Log4jMonitor" lazy-init="true" init-method="init">
+ <bean id="monitor" class="org.apache.s4.logger.Log4jMonitor" lazy-init="true" init-method="init">
<property name="flushInterval" value="30"/>
<property name="loggerName" value="monitor"/>
</bean>
- <bean id="dummyPartitioner" class="io.s4.dispatcher.partitioner.DummyPartitioner"/>
+ <bean id="dummyPartitioner" class="org.apache.s4.dispatcher.partitioner.DummyPartitioner"/>
- <bean id="dispatcher" class="io.s4.dispatcher.Dispatcher" init-method="init">
+ <bean id="dispatcher" class="org.apache.s4.dispatcher.Dispatcher" init-method="init">
<property name="partitioners">
<list>
<ref bean="dummyPartitioner"/>
@@ -33,7 +33,7 @@
<property name="loggerName" value="s4"/>
</bean>
- <bean id="adapter" class="io.s4.adapter.Adapter"
+ <bean id="adapter" class="org.apache.s4.adapter.Adapter"
init-method="init">
<property name="dispatcher" ref="dispatcher"/>
</bean>
http://git-wip-us.apache.org/repos/asf/incubator-s4/blob/d382e44b/s4-core/src/test/java/org/apache/s4/ft/app_conf.xml
----------------------------------------------------------------------
diff --git a/s4-core/src/test/java/org/apache/s4/ft/app_conf.xml b/s4-core/src/test/java/org/apache/s4/ft/app_conf.xml
index 3eec6ec..84346e5 100644
--- a/s4-core/src/test/java/org/apache/s4/ft/app_conf.xml
+++ b/s4-core/src/test/java/org/apache/s4/ft/app_conf.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
- <!-- <bean id="printEventPE" class="io.s4.processor.PrintEventPE">
+ <!-- <bean id="printEventPE" class="org.apache.s4.processor.PrintEventPE">
<property name="id" value="printEventPE"/>
<property name="keys">
<list>
@@ -10,7 +10,7 @@
</property>
</bean> -->
- <bean id="statefulPE" class="io.s4.ft.StatefulTestPE">
+ <bean id="statefulPE" class="org.apache.s4.ft.StatefulTestPE">
<property name="id" value="statefulPE"/>
<property name="keys">
<list>
http://git-wip-us.apache.org/repos/asf/incubator-s4/blob/d382e44b/s4-core/src/test/java/org/apache/s4/ft/s4_core_conf_bk_backend.xml
----------------------------------------------------------------------
diff --git a/s4-core/src/test/java/org/apache/s4/ft/s4_core_conf_bk_backend.xml b/s4-core/src/test/java/org/apache/s4/ft/s4_core_conf_bk_backend.xml
index 6b35e97..b63b9ab 100644
--- a/s4-core/src/test/java/org/apache/s4/ft/s4_core_conf_bk_backend.xml
+++ b/s4-core/src/test/java/org/apache/s4/ft/s4_core_conf_bk_backend.xml
@@ -16,9 +16,9 @@
<property name="ignoreUnresolvablePlaceholders" value="true" />
</bean>
- <bean id="hasher" class="io.s4.dispatcher.partitioner.DefaultHasher" />
+ <bean id="hasher" class="org.apache.s4.dispatcher.partitioner.DefaultHasher" />
- <bean id="commLayerEmitterToAdapter" class="io.s4.emitter.CommLayerEmitter"
+ <bean id="commLayerEmitterToAdapter" class="org.apache.s4.emitter.CommLayerEmitter"
init-method="init">
<property name="serDeser" ref="serDeser" />
<property name="listener" ref="rawListener" />
@@ -26,14 +26,14 @@
<property name="monitor" ref="monitor" />
</bean>
- <bean id="commLayerEmitter" class="io.s4.emitter.CommLayerEmitter"
+ <bean id="commLayerEmitter" class="org.apache.s4.emitter.CommLayerEmitter"
init-method="init">
<property name="serDeser" ref="serDeser" />
<property name="listener" ref="rawListener" />
<property name="monitor" ref="monitor" />
</bean>
- <bean id="serDeser" class="io.s4.serialize.KryoSerDeser">
+ <bean id="serDeser" class="org.apache.s4.serialize.KryoSerDeser">
<property name="initialBufferSize" value="${kryoSerDeser.initialBufferSize}" />
<property name="maxBufferSize" value="${kryoSerDeser.maxBufferSize}" />
</bean>
@@ -41,7 +41,7 @@
<!--START: Dispatchers for control event processor. If stream name in Response
is @adapter or @client, then the event is sent to the adapter (via ctrlDispatcherAdapter).
Else it is sent to the S4 cluster itself (via ctrlDispatcherS4) -->
- <bean id="ctrlDispatcher" class="io.s4.dispatcher.MultiDispatcher">
+ <bean id="ctrlDispatcher" class="org.apache.s4.dispatcher.MultiDispatcher">
<property name="dispatchers">
<list>
<ref bean="ctrlDispatcherFilteredS4" />
@@ -50,7 +50,7 @@
</property>
</bean>
- <bean id="ctrlDispatcherFilteredAdapter" class="io.s4.dispatcher.StreamSelectingDispatcher">
+ <bean id="ctrlDispatcherFilteredAdapter" class="org.apache.s4.dispatcher.StreamSelectingDispatcher">
<property name="dispatcher" ref="ctrlDispatcherAdapter" />
<property name="streams">
<list>
@@ -59,7 +59,7 @@
</property>
</bean>
- <bean id="ctrlDispatcherFilteredS4" class="io.s4.dispatcher.StreamExcludingDispatcher">
+ <bean id="ctrlDispatcherFilteredS4" class="org.apache.s4.dispatcher.StreamExcludingDispatcher">
<property name="dispatcher" ref="ctrlDispatcherS4" />
<property name="streams">
<list>
@@ -68,12 +68,12 @@
</property>
</bean>
- <bean id="genericPartitioner" class="io.s4.dispatcher.partitioner.DefaultPartitioner">
+ <bean id="genericPartitioner" class="org.apache.s4.dispatcher.partitioner.DefaultPartitioner">
<property name="hasher" ref="hasher" />
<property name="debug" value="false" />
</bean>
- <bean id="ctrlDispatcherS4" class="io.s4.dispatcher.Dispatcher"
+ <bean id="ctrlDispatcherS4" class="org.apache.s4.dispatcher.Dispatcher"
init-method="init">
<property name="partitioners">
<list>
@@ -84,7 +84,7 @@
<property name="loggerName" value="s4" />
</bean>
- <bean id="ctrlDispatcherAdapter" class="io.s4.dispatcher.Dispatcher"
+ <bean id="ctrlDispatcherAdapter" class="org.apache.s4.dispatcher.Dispatcher"
init-method="init">
<property name="partitioners">
<list>
@@ -97,11 +97,11 @@
<!-- END: Dispatchers for control events -->
<!-- Control Events handler -->
- <bean id="ctrlHandler" class="io.s4.processor.ControlEventProcessor">
+ <bean id="ctrlHandler" class="org.apache.s4.processor.ControlEventProcessor">
<property name="dispatcher" ref="ctrlDispatcher" />
</bean>
- <bean id="peContainer" class="io.s4.processor.PEContainer"
+ <bean id="peContainer" class="org.apache.s4.processor.PEContainer"
init-method="init" lazy-init="true">
<property name="maxQueueSize" value="${pe_container_max_queue_size}" />
<property name="monitor" ref="monitor" />
@@ -111,7 +111,7 @@
<property name="safeKeeper" ref="safeKeeper" />
</bean>
- <bean id="rawListener" class="io.s4.listener.CommLayerListener"
+ <bean id="rawListener" class="org.apache.s4.listener.CommLayerListener"
init-method="init">
<property name="serDeser" ref="serDeser" />
<property name="clusterManagerAddress" value="${zk_address}" />
@@ -120,20 +120,20 @@
<property name="monitor" ref="monitor" />
</bean>
- <bean id="eventListener" class="io.s4.collector.EventListener"
+ <bean id="eventListener" class="org.apache.s4.collector.EventListener"
init-method="init">
<property name="rawListener" ref="rawListener" />
<property name="peContainer" ref="peContainer" />
<property name="monitor" ref="monitor" />
</bean>
- <bean id="monitor" class="io.s4.logger.Log4jMonitor" lazy-init="true"
+ <bean id="monitor" class="org.apache.s4.logger.Log4jMonitor" lazy-init="true"
init-method="init">
<property name="flushInterval" value="30" />
<property name="loggerName" value="monitor" />
</bean>
- <bean id="watcher" class="io.s4.util.Watcher" init-method="init"
+ <bean id="watcher" class="org.apache.s4.util.Watcher" init-method="init"
lazy-init="true">
<property name="monitor" ref="monitor" />
<property name="peContainer" ref="peContainer" />
@@ -146,7 +146,7 @@
<!-- Some useful beans related to client-adapter for apps -->
<!-- Dispatcher to send to all adapter nodes. -->
- <bean id="dispatcherToClientAdapters" class="io.s4.dispatcher.Dispatcher"
+ <bean id="dispatcherToClientAdapters" class="org.apache.s4.dispatcher.Dispatcher"
init-method="init">
<property name="partitioners">
<list>
@@ -158,11 +158,11 @@
</bean>
<!-- Partitioner to achieve broadcast -->
- <bean id="broadcastPartitioner" class="io.s4.dispatcher.partitioner.BroadcastPartitioner" />
+ <bean id="broadcastPartitioner" class="org.apache.s4.dispatcher.partitioner.BroadcastPartitioner" />
- <bean id="loopbackDispatcher" class="io.s4.dispatcher.Dispatcher"
+ <bean id="loopbackDispatcher" class="org.apache.s4.dispatcher.Dispatcher"
init-method="init">
<property name="partitioners">
<list>
@@ -173,11 +173,11 @@
<property name="loggerName" value="s4" />
</bean>
- <bean id="loopbackPartitioner" class="io.s4.dispatcher.partitioner.LoopbackPartitioner">
+ <bean id="loopbackPartitioner" class="org.apache.s4.dispatcher.partitioner.LoopbackPartitioner">
<property name="eventEmitter" ref="commLayerEmitter"/>
</bean>
- <bean id="safeKeeper" class="io.s4.ft.SafeKeeper" init-method="init">
+ <bean id="safeKeeper" class="org.apache.s4.ft.SafeKeeper" init-method="init">
<property name="stateStorage" ref="bkStateStorage" />
<property name="loopbackDispatcher" ref="loopbackDispatcher" />
<property name="serializer" ref="serDeser"/>
@@ -185,9 +185,9 @@
<property name="storageCallbackFactory" ref="loggingStorageCallbackFactory"/>
</bean>
- <bean id="loggingStorageCallbackFactory" class="io.s4.ft.LoggingStorageCallbackFactory"/>
+ <bean id="loggingStorageCallbackFactory" class="org.apache.s4.ft.LoggingStorageCallbackFactory"/>
- <bean id="bkStateStorage" class="io.s4.ft.BookKeeperStateStorage" init-method="init">
+ <bean id="bkStateStorage" class="org.apache.s4.ft.BookKeeperStateStorage" init-method="init">
<!-- if not specified, default is <current_dir>/tmp/storage
<property name="storageRootPath" value="${storage_root_path}" /> -->
<property name="zkServers" value="localhost:21810"/>
http://git-wip-us.apache.org/repos/asf/incubator-s4/blob/d382e44b/s4-core/src/test/java/org/apache/s4/ft/s4_core_conf_fs_backend.xml
----------------------------------------------------------------------
diff --git a/s4-core/src/test/java/org/apache/s4/ft/s4_core_conf_fs_backend.xml b/s4-core/src/test/java/org/apache/s4/ft/s4_core_conf_fs_backend.xml
index 57d67d7..a1fcc6e 100755
--- a/s4-core/src/test/java/org/apache/s4/ft/s4_core_conf_fs_backend.xml
+++ b/s4-core/src/test/java/org/apache/s4/ft/s4_core_conf_fs_backend.xml
@@ -16,9 +16,9 @@
<property name="ignoreUnresolvablePlaceholders" value="true" />
</bean>
- <bean id="hasher" class="io.s4.dispatcher.partitioner.DefaultHasher" />
+ <bean id="hasher" class="org.apache.s4.dispatcher.partitioner.DefaultHasher" />
- <bean id="commLayerEmitterToAdapter" class="io.s4.emitter.CommLayerEmitter"
+ <bean id="commLayerEmitterToAdapter" class="org.apache.s4.emitter.CommLayerEmitter"
init-method="init">
<property name="serDeser" ref="serDeser" />
<property name="listener" ref="rawListener" />
@@ -26,14 +26,14 @@
<property name="monitor" ref="monitor" />
</bean>
- <bean id="commLayerEmitter" class="io.s4.emitter.CommLayerEmitter"
+ <bean id="commLayerEmitter" class="org.apache.s4.emitter.CommLayerEmitter"
init-method="init">
<property name="serDeser" ref="serDeser" />
<property name="listener" ref="rawListener" />
<property name="monitor" ref="monitor" />
</bean>
- <bean id="serDeser" class="io.s4.serialize.KryoSerDeser">
+ <bean id="serDeser" class="org.apache.s4.serialize.KryoSerDeser">
<property name="initialBufferSize" value="${kryoSerDeser.initialBufferSize}" />
<property name="maxBufferSize" value="${kryoSerDeser.maxBufferSize}" />
</bean>
@@ -41,7 +41,7 @@
<!--START: Dispatchers for control event processor. If stream name in Response
is @adapter or @client, then the event is sent to the adapter (via ctrlDispatcherAdapter).
Else it is sent to the S4 cluster itself (via ctrlDispatcherS4) -->
- <bean id="ctrlDispatcher" class="io.s4.dispatcher.MultiDispatcher">
+ <bean id="ctrlDispatcher" class="org.apache.s4.dispatcher.MultiDispatcher">
<property name="dispatchers">
<list>
<ref bean="ctrlDispatcherFilteredS4" />
@@ -50,7 +50,7 @@
</property>
</bean>
- <bean id="ctrlDispatcherFilteredAdapter" class="io.s4.dispatcher.StreamSelectingDispatcher">
+ <bean id="ctrlDispatcherFilteredAdapter" class="org.apache.s4.dispatcher.StreamSelectingDispatcher">
<property name="dispatcher" ref="ctrlDispatcherAdapter" />
<property name="streams">
<list>
@@ -59,7 +59,7 @@
</property>
</bean>
- <bean id="ctrlDispatcherFilteredS4" class="io.s4.dispatcher.StreamExcludingDispatcher">
+ <bean id="ctrlDispatcherFilteredS4" class="org.apache.s4.dispatcher.StreamExcludingDispatcher">
<property name="dispatcher" ref="ctrlDispatcherS4" />
<property name="streams">
<list>
@@ -68,12 +68,12 @@
</property>
</bean>
- <bean id="genericPartitioner" class="io.s4.dispatcher.partitioner.DefaultPartitioner">
+ <bean id="genericPartitioner" class="org.apache.s4.dispatcher.partitioner.DefaultPartitioner">
<property name="hasher" ref="hasher" />
<property name="debug" value="false" />
</bean>
- <bean id="ctrlDispatcherS4" class="io.s4.dispatcher.Dispatcher"
+ <bean id="ctrlDispatcherS4" class="org.apache.s4.dispatcher.Dispatcher"
init-method="init">
<property name="partitioners">
<list>
@@ -84,7 +84,7 @@
<property name="loggerName" value="s4" />
</bean>
- <bean id="ctrlDispatcherAdapter" class="io.s4.dispatcher.Dispatcher"
+ <bean id="ctrlDispatcherAdapter" class="org.apache.s4.dispatcher.Dispatcher"
init-method="init">
<property name="partitioners">
<list>
@@ -97,11 +97,11 @@
<!-- END: Dispatchers for control events -->
<!-- Control Events handler -->
- <bean id="ctrlHandler" class="io.s4.processor.ControlEventProcessor">
+ <bean id="ctrlHandler" class="org.apache.s4.processor.ControlEventProcessor">
<property name="dispatcher" ref="ctrlDispatcher" />
</bean>
- <bean id="peContainer" class="io.s4.processor.PEContainer"
+ <bean id="peContainer" class="org.apache.s4.processor.PEContainer"
init-method="init" lazy-init="true">
<property name="maxQueueSize" value="${pe_container_max_queue_size}" />
<property name="monitor" ref="monitor" />
@@ -111,7 +111,7 @@
<property name="safeKeeper" ref="safeKeeper" />
</bean>
- <bean id="rawListener" class="io.s4.listener.CommLayerListener"
+ <bean id="rawListener" class="org.apache.s4.listener.CommLayerListener"
init-method="init">
<property name="serDeser" ref="serDeser" />
<property name="clusterManagerAddress" value="${zk_address}" />
@@ -120,20 +120,20 @@
<property name="monitor" ref="monitor" />
</bean>
- <bean id="eventListener" class="io.s4.collector.EventListener"
+ <bean id="eventListener" class="org.apache.s4.collector.EventListener"
init-method="init">
<property name="rawListener" ref="rawListener" />
<property name="peContainer" ref="peContainer" />
<property name="monitor" ref="monitor" />
</bean>
- <bean id="monitor" class="io.s4.logger.Log4jMonitor" lazy-init="true"
+ <bean id="monitor" class="org.apache.s4.logger.Log4jMonitor" lazy-init="true"
init-method="init">
<property name="flushInterval" value="30" />
<property name="loggerName" value="monitor" />
</bean>
- <bean id="watcher" class="io.s4.util.Watcher" init-method="init"
+ <bean id="watcher" class="org.apache.s4.util.Watcher" init-method="init"
lazy-init="true">
<property name="monitor" ref="monitor" />
<property name="peContainer" ref="peContainer" />
@@ -146,7 +146,7 @@
<!-- Some useful beans related to client-adapter for apps -->
<!-- Dispatcher to send to all adapter nodes. -->
- <bean id="dispatcherToClientAdapters" class="io.s4.dispatcher.Dispatcher"
+ <bean id="dispatcherToClientAdapters" class="org.apache.s4.dispatcher.Dispatcher"
init-method="init">
<property name="partitioners">
<list>
@@ -158,11 +158,11 @@
</bean>
<!-- Partitioner to achieve broadcast -->
- <bean id="broadcastPartitioner" class="io.s4.dispatcher.partitioner.BroadcastPartitioner" />
+ <bean id="broadcastPartitioner" class="org.apache.s4.dispatcher.partitioner.BroadcastPartitioner" />
- <bean id="loopbackDispatcher" class="io.s4.dispatcher.Dispatcher"
+ <bean id="loopbackDispatcher" class="org.apache.s4.dispatcher.Dispatcher"
init-method="init">
<property name="partitioners">
<list>
@@ -173,11 +173,11 @@
<property name="loggerName" value="s4" />
</bean>
- <bean id="loopbackPartitioner" class="io.s4.dispatcher.partitioner.LoopbackPartitioner">
+ <bean id="loopbackPartitioner" class="org.apache.s4.dispatcher.partitioner.LoopbackPartitioner">
<property name="eventEmitter" ref="commLayerEmitter"/>
</bean>
- <bean id="safeKeeper" class="io.s4.ft.SafeKeeper" init-method="init">
+ <bean id="safeKeeper" class="org.apache.s4.ft.SafeKeeper" init-method="init">
<property name="stateStorage" ref="fsStateStorage" />
<property name="loopbackDispatcher" ref="loopbackDispatcher" />
<property name="serializer" ref="serDeser"/>
@@ -185,9 +185,9 @@
<property name="storageCallbackFactory" ref="loggingStorageCallbackFactory"/>
</bean>
- <bean id="loggingStorageCallbackFactory" class="io.s4.ft.LoggingStorageCallbackFactory"/>
+ <bean id="loggingStorageCallbackFactory" class="org.apache.s4.ft.LoggingStorageCallbackFactory"/>
- <bean id="fsStateStorage" class="io.s4.ft.DefaultFileSystemStateStorage" init-method="init">
+ <bean id="fsStateStorage" class="org.apache.s4.ft.DefaultFileSystemStateStorage" init-method="init">
<!-- if not specified, default is <current_dir>/tmp/storage
<property name="storageRootPath" value="${storage_root_path}" /> -->
</bean>
http://git-wip-us.apache.org/repos/asf/incubator-s4/blob/d382e44b/s4-core/src/test/java/org/apache/s4/ft/wall_clock.xml
----------------------------------------------------------------------
diff --git a/s4-core/src/test/java/org/apache/s4/ft/wall_clock.xml b/s4-core/src/test/java/org/apache/s4/ft/wall_clock.xml
index e149ecc..cc571a6 100644
--- a/s4-core/src/test/java/org/apache/s4/ft/wall_clock.xml
+++ b/s4-core/src/test/java/org/apache/s4/ft/wall_clock.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
- <bean id="clock" class="io.s4.util.clock.WallClock"/>
+ <bean id="clock" class="org.apache.s4.util.clock.WallClock"/>
</beans>
http://git-wip-us.apache.org/repos/asf/incubator-s4/blob/d382e44b/s4-core/src/test/java/org/apache/s4/ft/wordcount/app_conf.xml
----------------------------------------------------------------------
diff --git a/s4-core/src/test/java/org/apache/s4/ft/wordcount/app_conf.xml b/s4-core/src/test/java/org/apache/s4/ft/wordcount/app_conf.xml
index d1032c0..d9ef189 100644
--- a/s4-core/src/test/java/org/apache/s4/ft/wordcount/app_conf.xml
+++ b/s4-core/src/test/java/org/apache/s4/ft/wordcount/app_conf.xml
@@ -3,11 +3,11 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
- <!-- <bean id="printEventPE" class="io.s4.processor.PrintEventPE"> <property
+ <!-- <bean id="printEventPE" class="org.apache.s4.processor.PrintEventPE"> <property
name="id" value="printEventPE"/> <property name="keys"> <list> <value>TopicSeen
topic</value> </list> </property> </bean> -->
- <bean id="wordSplitter" class="io.s4.wordcount.WordSplitter">
+ <bean id="wordSplitter" class="org.apache.s4.wordcount.WordSplitter">
<property name="id" value="wordSplitter" />
<property name="keys">
<list>
@@ -18,7 +18,7 @@
<property name="dispatcher" ref="wordDispatcher" />
</bean>
- <bean id="wordCounter" class="io.s4.wordcount.WordCounter">
+ <bean id="wordCounter" class="org.apache.s4.wordcount.WordCounter">
<property name="id" value="wordMapper" />
<property name="keys">
<list>
@@ -31,7 +31,7 @@
<property name="checkpointingFrequencyByEventCount" value="1" />
</bean>
- <bean id="wordClassifier" class="io.s4.wordcount.WordClassifier">
+ <bean id="wordClassifier" class="org.apache.s4.wordcount.WordClassifier">
<property name="id" value="wordClassifier" />
<property name="keys">
<list>
@@ -42,7 +42,7 @@
<property name="checkpointingFrequencyByEventCount" value="1" />
</bean>
- <bean id="wordDispatcher" class="io.s4.dispatcher.Dispatcher"
+ <bean id="wordDispatcher" class="org.apache.s4.dispatcher.Dispatcher"
init-method="init">
<property name="partitioners">
<list>
@@ -53,7 +53,7 @@
<property name="loggerName" value="s4" />
</bean>
- <bean id="wordPartitioner" class="io.s4.dispatcher.partitioner.DefaultPartitioner">
+ <bean id="wordPartitioner" class="org.apache.s4.dispatcher.partitioner.DefaultPartitioner">
<property name="streamNames">
<list>
<value>Words</value>
@@ -68,7 +68,7 @@
<property name="debug" value="false" />
</bean>
- <bean id="wordsCountDispatcher" class="io.s4.dispatcher.Dispatcher"
+ <bean id="wordsCountDispatcher" class="org.apache.s4.dispatcher.Dispatcher"
init-method="init">
<property name="partitioners">
<list>
@@ -79,7 +79,7 @@
<property name="loggerName" value="s4" />
</bean>
- <bean id="wordsCountPartitioner" class="io.s4.dispatcher.partitioner.DefaultPartitioner">
+ <bean id="wordsCountPartitioner" class="org.apache.s4.dispatcher.partitioner.DefaultPartitioner">
<property name="streamNames">
<list>
<value>WordsCount</value>
http://git-wip-us.apache.org/repos/asf/incubator-s4/blob/d382e44b/s4-core/src/test/java/org/apache/s4/ft/wordcount/s4_core_conf_fs_backend.xml
----------------------------------------------------------------------
diff --git a/s4-core/src/test/java/org/apache/s4/ft/wordcount/s4_core_conf_fs_backend.xml b/s4-core/src/test/java/org/apache/s4/ft/wordcount/s4_core_conf_fs_backend.xml
index 1092868..03affc5 100755
--- a/s4-core/src/test/java/org/apache/s4/ft/wordcount/s4_core_conf_fs_backend.xml
+++ b/s4-core/src/test/java/org/apache/s4/ft/wordcount/s4_core_conf_fs_backend.xml
@@ -16,9 +16,9 @@
<property name="ignoreUnresolvablePlaceholders" value="true" />
</bean>
- <bean id="hasher" class="io.s4.dispatcher.partitioner.DefaultHasher" />
+ <bean id="hasher" class="org.apache.s4.dispatcher.partitioner.DefaultHasher" />
- <bean id="commLayerEmitterToAdapter" class="io.s4.emitter.CommLayerEmitter"
+ <bean id="commLayerEmitterToAdapter" class="org.apache.s4.emitter.CommLayerEmitter"
init-method="init">
<property name="serDeser" ref="serDeser" />
<property name="listener" ref="rawListener" />
@@ -26,14 +26,14 @@
<property name="monitor" ref="monitor" />
</bean>
- <bean id="commLayerEmitter" class="io.s4.emitter.CommLayerEmitter"
+ <bean id="commLayerEmitter" class="org.apache.s4.emitter.CommLayerEmitter"
init-method="init">
<property name="serDeser" ref="serDeser" />
<property name="listener" ref="rawListener" />
<property name="monitor" ref="monitor" />
</bean>
- <bean id="serDeser" class="io.s4.serialize.KryoSerDeser">
+ <bean id="serDeser" class="org.apache.s4.serialize.KryoSerDeser">
<property name="initialBufferSize" value="${kryoSerDeser.initialBufferSize}" />
<property name="maxBufferSize" value="${kryoSerDeser.maxBufferSize}" />
</bean>
@@ -41,7 +41,7 @@
<!--START: Dispatchers for control event processor. If stream name in Response
is @adapter or @client, then the event is sent to the adapter (via ctrlDispatcherAdapter).
Else it is sent to the S4 cluster itself (via ctrlDispatcherS4) -->
- <bean id="ctrlDispatcher" class="io.s4.dispatcher.MultiDispatcher">
+ <bean id="ctrlDispatcher" class="org.apache.s4.dispatcher.MultiDispatcher">
<property name="dispatchers">
<list>
<ref bean="ctrlDispatcherFilteredS4" />
@@ -50,7 +50,7 @@
</property>
</bean>
- <bean id="ctrlDispatcherFilteredAdapter" class="io.s4.dispatcher.StreamSelectingDispatcher">
+ <bean id="ctrlDispatcherFilteredAdapter" class="org.apache.s4.dispatcher.StreamSelectingDispatcher">
<property name="dispatcher" ref="ctrlDispatcherAdapter" />
<property name="streams">
<list>
@@ -59,7 +59,7 @@
</property>
</bean>
- <bean id="ctrlDispatcherFilteredS4" class="io.s4.dispatcher.StreamExcludingDispatcher">
+ <bean id="ctrlDispatcherFilteredS4" class="org.apache.s4.dispatcher.StreamExcludingDispatcher">
<property name="dispatcher" ref="ctrlDispatcherS4" />
<property name="streams">
<list>
@@ -68,12 +68,12 @@
</property>
</bean>
- <bean id="genericPartitioner" class="io.s4.dispatcher.partitioner.DefaultPartitioner">
+ <bean id="genericPartitioner" class="org.apache.s4.dispatcher.partitioner.DefaultPartitioner">
<property name="hasher" ref="hasher" />
<property name="debug" value="false" />
</bean>
- <bean id="ctrlDispatcherS4" class="io.s4.dispatcher.Dispatcher"
+ <bean id="ctrlDispatcherS4" class="org.apache.s4.dispatcher.Dispatcher"
init-method="init">
<property name="partitioners">
<list>
@@ -84,7 +84,7 @@
<property name="loggerName" value="s4" />
</bean>
- <bean id="ctrlDispatcherAdapter" class="io.s4.dispatcher.Dispatcher"
+ <bean id="ctrlDispatcherAdapter" class="org.apache.s4.dispatcher.Dispatcher"
init-method="init">
<property name="partitioners">
<list>
@@ -97,11 +97,11 @@
<!-- END: Dispatchers for control events -->
<!-- Control Events handler -->
- <bean id="ctrlHandler" class="io.s4.processor.ControlEventProcessor">
+ <bean id="ctrlHandler" class="org.apache.s4.processor.ControlEventProcessor">
<property name="dispatcher" ref="ctrlDispatcher" />
</bean>
- <bean id="peContainer" class="io.s4.processor.PEContainer"
+ <bean id="peContainer" class="org.apache.s4.processor.PEContainer"
init-method="init" lazy-init="true">
<property name="maxQueueSize" value="${pe_container_max_queue_size}" />
<property name="monitor" ref="monitor" />
@@ -111,7 +111,7 @@
<property name="safeKeeper" ref="safeKeeper" />
</bean>
- <bean id="rawListener" class="io.s4.listener.CommLayerListener"
+ <bean id="rawListener" class="org.apache.s4.listener.CommLayerListener"
init-method="init">
<property name="serDeser" ref="serDeser" />
<property name="clusterManagerAddress" value="${zk_address}" />
@@ -120,20 +120,20 @@
<property name="monitor" ref="monitor" />
</bean>
- <bean id="eventListener" class="io.s4.collector.EventListener"
+ <bean id="eventListener" class="org.apache.s4.collector.EventListener"
init-method="init">
<property name="rawListener" ref="rawListener" />
<property name="peContainer" ref="peContainer" />
<property name="monitor" ref="monitor" />
</bean>
- <bean id="monitor" class="io.s4.logger.Log4jMonitor" lazy-init="true"
+ <bean id="monitor" class="org.apache.s4.logger.Log4jMonitor" lazy-init="true"
init-method="init">
<property name="flushInterval" value="30" />
<property name="loggerName" value="monitor" />
</bean>
- <bean id="watcher" class="io.s4.util.Watcher" init-method="init"
+ <bean id="watcher" class="org.apache.s4.util.Watcher" init-method="init"
lazy-init="true">
<property name="monitor" ref="monitor" />
<property name="peContainer" ref="peContainer" />
@@ -146,7 +146,7 @@
<!-- Some useful beans related to client-adapter for apps -->
<!-- Dispatcher to send to all adapter nodes. -->
- <bean id="dispatcherToClientAdapters" class="io.s4.dispatcher.Dispatcher"
+ <bean id="dispatcherToClientAdapters" class="org.apache.s4.dispatcher.Dispatcher"
init-method="init">
<property name="partitioners">
<list>
@@ -158,11 +158,11 @@
</bean>
<!-- Partitioner to achieve broadcast -->
- <bean id="broadcastPartitioner" class="io.s4.dispatcher.partitioner.BroadcastPartitioner" />
+ <bean id="broadcastPartitioner" class="org.apache.s4.dispatcher.partitioner.BroadcastPartitioner" />
- <bean id="loopbackDispatcher" class="io.s4.dispatcher.Dispatcher"
+ <bean id="loopbackDispatcher" class="org.apache.s4.dispatcher.Dispatcher"
init-method="init">
<property name="partitioners">
<list>
@@ -173,11 +173,11 @@
<property name="loggerName" value="s4" />
</bean>
- <bean id="loopbackPartitioner" class="io.s4.dispatcher.partitioner.LoopbackPartitioner">
+ <bean id="loopbackPartitioner" class="org.apache.s4.dispatcher.partitioner.LoopbackPartitioner">
<property name="eventEmitter" ref="commLayerEmitter"/>
</bean>
- <bean id="safeKeeper" class="io.s4.ft.SafeKeeper" init-method="init">
+ <bean id="safeKeeper" class="org.apache.s4.ft.SafeKeeper" init-method="init">
<property name="stateStorage" ref="fsStateStorage" />
<property name="loopbackDispatcher" ref="loopbackDispatcher" />
<property name="serializer" ref="serDeser"/>
@@ -185,9 +185,9 @@
<property name="storageCallbackFactory" ref="loggingStorageCallbackFactory"/>
</bean>
- <bean id="loggingStorageCallbackFactory" class="io.s4.ft.LoggingStorageCallbackFactory"/>
+ <bean id="loggingStorageCallbackFactory" class="org.apache.s4.ft.LoggingStorageCallbackFactory"/>
- <bean id="fsStateStorage" class="io.s4.ft.DefaultFileSystemStateStorage" init-method="init">
+ <bean id="fsStateStorage" class="org.apache.s4.ft.DefaultFileSystemStateStorage" init-method="init">
<!-- if not specified, default is <current_dir>/tmp/storage
<property name="storageRootPath" value="${storage_root_path}" /> -->
</bean>
http://git-wip-us.apache.org/repos/asf/incubator-s4/blob/d382e44b/s4-core/src/test/java/org/apache/s4/ft/wordcount/s4_core_conf_redis_backend.xml
----------------------------------------------------------------------
diff --git a/s4-core/src/test/java/org/apache/s4/ft/wordcount/s4_core_conf_redis_backend.xml b/s4-core/src/test/java/org/apache/s4/ft/wordcount/s4_core_conf_redis_backend.xml
index 3b6e251..adf250c 100755
--- a/s4-core/src/test/java/org/apache/s4/ft/wordcount/s4_core_conf_redis_backend.xml
+++ b/s4-core/src/test/java/org/apache/s4/ft/wordcount/s4_core_conf_redis_backend.xml
@@ -16,9 +16,9 @@
<property name="ignoreUnresolvablePlaceholders" value="true" />
</bean>
- <bean id="hasher" class="io.s4.dispatcher.partitioner.DefaultHasher" />
+ <bean id="hasher" class="org.apache.s4.dispatcher.partitioner.DefaultHasher" />
- <bean id="commLayerEmitterToAdapter" class="io.s4.emitter.CommLayerEmitter"
+ <bean id="commLayerEmitterToAdapter" class="org.apache.s4.emitter.CommLayerEmitter"
init-method="init">
<property name="serDeser" ref="serDeser" />
<property name="listener" ref="rawListener" />
@@ -26,14 +26,14 @@
<property name="monitor" ref="monitor" />
</bean>
- <bean id="commLayerEmitter" class="io.s4.emitter.CommLayerEmitter"
+ <bean id="commLayerEmitter" class="org.apache.s4.emitter.CommLayerEmitter"
init-method="init">
<property name="serDeser" ref="serDeser" />
<property name="listener" ref="rawListener" />
<property name="monitor" ref="monitor" />
</bean>
- <bean id="serDeser" class="io.s4.serialize.KryoSerDeser">
+ <bean id="serDeser" class="org.apache.s4.serialize.KryoSerDeser">
<property name="initialBufferSize" value="${kryoSerDeser.initialBufferSize}" />
<property name="maxBufferSize" value="${kryoSerDeser.maxBufferSize}" />
</bean>
@@ -41,7 +41,7 @@
<!--START: Dispatchers for control event processor. If stream name in Response
is @adapter or @client, then the event is sent to the adapter (via ctrlDispatcherAdapter).
Else it is sent to the S4 cluster itself (via ctrlDispatcherS4) -->
- <bean id="ctrlDispatcher" class="io.s4.dispatcher.MultiDispatcher">
+ <bean id="ctrlDispatcher" class="org.apache.s4.dispatcher.MultiDispatcher">
<property name="dispatchers">
<list>
<ref bean="ctrlDispatcherFilteredS4" />
@@ -50,7 +50,7 @@
</property>
</bean>
- <bean id="ctrlDispatcherFilteredAdapter" class="io.s4.dispatcher.StreamSelectingDispatcher">
+ <bean id="ctrlDispatcherFilteredAdapter" class="org.apache.s4.dispatcher.StreamSelectingDispatcher">
<property name="dispatcher" ref="ctrlDispatcherAdapter" />
<property name="streams">
<list>
@@ -59,7 +59,7 @@
</property>
</bean>
- <bean id="ctrlDispatcherFilteredS4" class="io.s4.dispatcher.StreamExcludingDispatcher">
+ <bean id="ctrlDispatcherFilteredS4" class="org.apache.s4.dispatcher.StreamExcludingDispatcher">
<property name="dispatcher" ref="ctrlDispatcherS4" />
<property name="streams">
<list>
@@ -68,12 +68,12 @@
</property>
</bean>
- <bean id="genericPartitioner" class="io.s4.dispatcher.partitioner.DefaultPartitioner">
+ <bean id="genericPartitioner" class="org.apache.s4.dispatcher.partitioner.DefaultPartitioner">
<property name="hasher" ref="hasher" />
<property name="debug" value="false" />
</bean>
- <bean id="ctrlDispatcherS4" class="io.s4.dispatcher.Dispatcher"
+ <bean id="ctrlDispatcherS4" class="org.apache.s4.dispatcher.Dispatcher"
init-method="init">
<property name="partitioners">
<list>
@@ -84,7 +84,7 @@
<property name="loggerName" value="s4" />
</bean>
- <bean id="ctrlDispatcherAdapter" class="io.s4.dispatcher.Dispatcher"
+ <bean id="ctrlDispatcherAdapter" class="org.apache.s4.dispatcher.Dispatcher"
init-method="init">
<property name="partitioners">
<list>
@@ -97,11 +97,11 @@
<!-- END: Dispatchers for control events -->
<!-- Control Events handler -->
- <bean id="ctrlHandler" class="io.s4.processor.ControlEventProcessor">
+ <bean id="ctrlHandler" class="org.apache.s4.processor.ControlEventProcessor">
<property name="dispatcher" ref="ctrlDispatcher" />
</bean>
- <bean id="peContainer" class="io.s4.processor.PEContainer"
+ <bean id="peContainer" class="org.apache.s4.processor.PEContainer"
init-method="init" lazy-init="true">
<property name="maxQueueSize" value="${pe_container_max_queue_size}" />
<property name="monitor" ref="monitor" />
@@ -111,7 +111,7 @@
<property name="safeKeeper" ref="safeKeeper" />
</bean>
- <bean id="rawListener" class="io.s4.listener.CommLayerListener"
+ <bean id="rawListener" class="org.apache.s4.listener.CommLayerListener"
init-method="init">
<property name="serDeser" ref="serDeser" />
<property name="clusterManagerAddress" value="${zk_address}" />
@@ -120,20 +120,20 @@
<property name="monitor" ref="monitor" />
</bean>
- <bean id="eventListener" class="io.s4.collector.EventListener"
+ <bean id="eventListener" class="org.apache.s4.collector.EventListener"
init-method="init">
<property name="rawListener" ref="rawListener" />
<property name="peContainer" ref="peContainer" />
<property name="monitor" ref="monitor" />
</bean>
- <bean id="monitor" class="io.s4.logger.Log4jMonitor" lazy-init="true"
+ <bean id="monitor" class="org.apache.s4.logger.Log4jMonitor" lazy-init="true"
init-method="init">
<property name="flushInterval" value="30" />
<property name="loggerName" value="monitor" />
</bean>
- <bean id="watcher" class="io.s4.util.Watcher" init-method="init"
+ <bean id="watcher" class="org.apache.s4.util.Watcher" init-method="init"
lazy-init="true">
<property name="monitor" ref="monitor" />
<property name="peContainer" ref="peContainer" />
@@ -146,7 +146,7 @@
<!-- Some useful beans related to client-adapter for apps -->
<!-- Dispatcher to send to all adapter nodes. -->
- <bean id="dispatcherToClientAdapters" class="io.s4.dispatcher.Dispatcher"
+ <bean id="dispatcherToClientAdapters" class="org.apache.s4.dispatcher.Dispatcher"
init-method="init">
<property name="partitioners">
<list>
@@ -158,11 +158,11 @@
</bean>
<!-- Partitioner to achieve broadcast -->
- <bean id="broadcastPartitioner" class="io.s4.dispatcher.partitioner.BroadcastPartitioner" />
+ <bean id="broadcastPartitioner" class="org.apache.s4.dispatcher.partitioner.BroadcastPartitioner" />
- <bean id="loopbackDispatcher" class="io.s4.dispatcher.Dispatcher"
+ <bean id="loopbackDispatcher" class="org.apache.s4.dispatcher.Dispatcher"
init-method="init">
<property name="partitioners">
<list>
@@ -173,11 +173,11 @@
<property name="loggerName" value="s4" />
</bean>
- <bean id="loopbackPartitioner" class="io.s4.dispatcher.partitioner.LoopbackPartitioner">
+ <bean id="loopbackPartitioner" class="org.apache.s4.dispatcher.partitioner.LoopbackPartitioner">
<property name="eventEmitter" ref="commLayerEmitter"/>
</bean>
- <bean id="safeKeeper" class="io.s4.ft.SafeKeeper" init-method="init">
+ <bean id="safeKeeper" class="org.apache.s4.ft.SafeKeeper" init-method="init">
<property name="stateStorage" ref="redisStateStorage" />
<property name="loopbackDispatcher" ref="loopbackDispatcher" />
<property name="serializer" ref="serDeser"/>
@@ -185,10 +185,10 @@
<property name="storageCallbackFactory" ref="loggingStorageCallbackFactory"/>
</bean>
- <bean id="loggingStorageCallbackFactory" class="io.s4.ft.LoggingStorageCallbackFactory"/>
+ <bean id="loggingStorageCallbackFactory" class="org.apache.s4.ft.LoggingStorageCallbackFactory"/>
- <bean id="redisStateStorage" class="io.s4.ft.RedisStateStorage" init-method="init">
+ <bean id="redisStateStorage" class="org.apache.s4.ft.RedisStateStorage" init-method="init">
<property name="redisHost" value="localhost"/>
<property name="redisPort" value="6379"/>
</bean>
http://git-wip-us.apache.org/repos/asf/incubator-s4/blob/d382e44b/s4-core/src/test/java/org/apache/s4/ft/wordcount/wall_clock.xml
----------------------------------------------------------------------
diff --git a/s4-core/src/test/java/org/apache/s4/ft/wordcount/wall_clock.xml b/s4-core/src/test/java/org/apache/s4/ft/wordcount/wall_clock.xml
index e149ecc..cc571a6 100644
--- a/s4-core/src/test/java/org/apache/s4/ft/wordcount/wall_clock.xml
+++ b/s4-core/src/test/java/org/apache/s4/ft/wordcount/wall_clock.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
- <bean id="clock" class="io.s4.util.clock.WallClock"/>
+ <bean id="clock" class="org.apache.s4.util.clock.WallClock"/>
</beans>
http://git-wip-us.apache.org/repos/asf/incubator-s4/blob/d382e44b/s4-core/src/test/java/org/apache/s4/wordcount/app_conf.xml
----------------------------------------------------------------------
diff --git a/s4-core/src/test/java/org/apache/s4/wordcount/app_conf.xml b/s4-core/src/test/java/org/apache/s4/wordcount/app_conf.xml
index f03ea26..98fd5c9 100644
--- a/s4-core/src/test/java/org/apache/s4/wordcount/app_conf.xml
+++ b/s4-core/src/test/java/org/apache/s4/wordcount/app_conf.xml
@@ -3,11 +3,11 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
- <!-- <bean id="printEventPE" class="io.s4.processor.PrintEventPE"> <property
+ <!-- <bean id="printEventPE" class="org.apache.s4.processor.PrintEventPE"> <property
name="id" value="printEventPE"/> <property name="keys"> <list> <value>TopicSeen
topic</value> </list> </property> </bean> -->
- <bean id="wordSplitter" class="io.s4.wordcount.WordSplitter">
+ <bean id="wordSplitter" class="org.apache.s4.wordcount.WordSplitter">
<property name="id" value="wordSplitter" />
<property name="keys">
<list>
@@ -18,7 +18,7 @@
<property name="dispatcher" ref="wordDispatcher" />
</bean>
- <bean id="wordCounter" class="io.s4.wordcount.WordCounter">
+ <bean id="wordCounter" class="org.apache.s4.wordcount.WordCounter">
<property name="id" value="wordCounter" />
<property name="keys">
<list>
@@ -30,7 +30,7 @@
<property name="dispatcher" ref="wordsCountDispatcher" />
</bean>
- <bean id="wordClassifier" class="io.s4.wordcount.WordClassifier">
+ <bean id="wordClassifier" class="org.apache.s4.wordcount.WordClassifier">
<property name="id" value="wordClassifier" />
<property name="keys">
<list>
@@ -40,7 +40,7 @@
</property>
</bean>
- <bean id="wordDispatcher" class="io.s4.dispatcher.Dispatcher"
+ <bean id="wordDispatcher" class="org.apache.s4.dispatcher.Dispatcher"
init-method="init">
<property name="partitioners">
<list>
@@ -51,7 +51,7 @@
<property name="loggerName" value="s4" />
</bean>
- <bean id="wordPartitioner" class="io.s4.dispatcher.partitioner.DefaultPartitioner">
+ <bean id="wordPartitioner" class="org.apache.s4.dispatcher.partitioner.DefaultPartitioner">
<property name="streamNames">
<list>
<value>Words</value>
@@ -66,7 +66,7 @@
<property name="debug" value="false" />
</bean>
- <bean id="wordsCountDispatcher" class="io.s4.dispatcher.Dispatcher"
+ <bean id="wordsCountDispatcher" class="org.apache.s4.dispatcher.Dispatcher"
init-method="init">
<property name="partitioners">
<list>
@@ -77,7 +77,7 @@
<property name="loggerName" value="s4" />
</bean>
- <bean id="wordsCountPartitioner" class="io.s4.dispatcher.partitioner.DefaultPartitioner">
+ <bean id="wordsCountPartitioner" class="org.apache.s4.dispatcher.partitioner.DefaultPartitioner">
<property name="streamNames">
<list>
<value>WordsCount</value>