Permalink
Browse files

Rename packages in preparation for move to Apache

  • Loading branch information...
1 parent df4c807 commit d382e44bb772fcecd25133979a48f1186cb04737 Bruce Robbins committed Nov 21, 2011
Showing with 238 additions and 238 deletions.
  1. +8 −8 dev-notes.txt
  2. +6 −6 s4-core/src/main/resources/s4-core/conf/default/adapter-conf.xml
  3. +10 −10 s4-core/src/main/resources/s4-core/conf/default/client-adapter-conf.xml
  4. +1 −1 s4-core/src/main/resources/s4-core/conf/default/client-stub-conf.xml
  5. +1 −1 s4-core/src/main/resources/s4-core/conf/default/event-clock.xml
  6. +18 −18 s4-core/src/main/resources/s4-core/conf/default/s4-core-conf.xml
  7. +1 −1 s4-core/src/main/resources/s4-core/conf/default/wall-clock.xml
  8. +6 −6 s4-core/src/main/resources/s4-core/conf/dynamic/adapter-conf.xml
  9. +10 −10 s4-core/src/main/resources/s4-core/conf/dynamic/client-adapter-conf.xml
  10. +1 −1 s4-core/src/main/resources/s4-core/conf/dynamic/client-stub-conf.xml
  11. +1 −1 s4-core/src/main/resources/s4-core/conf/dynamic/event-clock.xml
  12. +18 −18 s4-core/src/main/resources/s4-core/conf/dynamic/s4-core-conf.xml
  13. +1 −1 s4-core/src/main/resources/s4-core/conf/dynamic/wall-clock.xml
  14. +1 −1 s4-core/src/main/resources/scripts/generate-load.sh
  15. +1 −1 s4-core/src/main/resources/scripts/run-adapter.sh
  16. +1 −1 s4-core/src/main/resources/scripts/run-client-adapter.sh
  17. +1 −1 s4-core/src/main/resources/scripts/start-s4.sh
  18. +1 −1 s4-core/src/main/resources/scripts/task-setup.sh
  19. +6 −6 s4-core/src/test/java/org/apache/s4/ft/adapter_conf.xml
  20. +2 −2 s4-core/src/test/java/org/apache/s4/ft/app_conf.xml
  21. +23 −23 s4-core/src/test/java/org/apache/s4/ft/s4_core_conf_bk_backend.xml
  22. +23 −23 s4-core/src/test/java/org/apache/s4/ft/s4_core_conf_fs_backend.xml
  23. +1 −1 s4-core/src/test/java/org/apache/s4/ft/wall_clock.xml
  24. +8 −8 s4-core/src/test/java/org/apache/s4/ft/wordcount/app_conf.xml
  25. +23 −23 s4-core/src/test/java/org/apache/s4/ft/wordcount/s4_core_conf_fs_backend.xml
  26. +23 −23 s4-core/src/test/java/org/apache/s4/ft/wordcount/s4_core_conf_redis_backend.xml
  27. +1 −1 s4-core/src/test/java/org/apache/s4/ft/wordcount/wall_clock.xml
  28. +8 −8 s4-core/src/test/java/org/apache/s4/wordcount/app_conf.xml
  29. +22 −22 s4-core/src/test/java/org/apache/s4/wordcount/s4_core_conf.xml
  30. +1 −1 s4-core/src/test/java/org/apache/s4/wordcount/wall_clock.xml
  31. +1 −1 s4-driver/examples/src/main/resources/scripts/inject.sh
  32. +1 −1 s4-driver/examples/src/main/resources/scripts/read.sh
  33. +2 −2 s4-driver/examples/src/main/resources/scripts/request.py
  34. +1 −1 s4-driver/examples/src/main/resources/scripts/request.sh
  35. +2 −2 s4-driver/examples/src/main/resources/scripts/test.py
  36. +2 −2 s4-examples/twittertopiccount-ft/src/main/resources/adapter-conf.xml
  37. +1 −1 s4-tools/loadgenerator/src/main/resources/scripts/generate-load.sh
View
@@ -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,22 +73,22 @@ 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
# 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
-------
@@ -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>
@@ -7,17 +7,17 @@
<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="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"/>
- <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"/>
@@ -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>
@@ -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>
@@ -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,38 +93,38 @@
<!-- 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"/>
<property name="clock" ref="clock"/>
<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}"/>
<property name="maxQueueSize" value="${listener_max_queue_size}"/>
<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>
@@ -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>
@@ -7,24 +7,24 @@
<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}"/>
<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"/>
@@ -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>
Oops, something went wrong.

0 comments on commit d382e44

Please sign in to comment.