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
[16/50] [abbrv] Rename packages in preparation for move to Apache
http://git-wip-us.apache.org/repos/asf/incubator-s4/blob/d382e44b/s4-core/src/test/java/org/apache/s4/wordcount/s4_core_conf.xml
----------------------------------------------------------------------
diff --git a/s4-core/src/test/java/org/apache/s4/wordcount/s4_core_conf.xml b/s4-core/src/test/java/org/apache/s4/wordcount/s4_core_conf.xml
index 20c8bb1..4e8812f 100755
--- a/s4-core/src/test/java/org/apache/s4/wordcount/s4_core_conf.xml
+++ b/s4-core/src/test/java/org/apache/s4/wordcount/s4_core_conf.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,18 +173,18 @@
<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"/>
<property name="hasher" ref="hasher"/>
</bean>
- <bean id="fsStateStorage" class="io.s4.ft.DefaultFileSystemStateStorage" init-method="checkStorageDir">
+ <bean id="fsStateStorage" class="org.apache.s4.ft.DefaultFileSystemStateStorage" init-method="checkStorageDir">
<!-- 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/wordcount/wall_clock.xml
----------------------------------------------------------------------
diff --git a/s4-core/src/test/java/org/apache/s4/wordcount/wall_clock.xml b/s4-core/src/test/java/org/apache/s4/wordcount/wall_clock.xml
index e149ecc..cc571a6 100644
--- a/s4-core/src/test/java/org/apache/s4/wordcount/wall_clock.xml
+++ b/s4-core/src/test/java/org/apache/s4/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-driver/examples/src/main/resources/scripts/inject.sh
----------------------------------------------------------------------
diff --git a/s4-driver/examples/src/main/resources/scripts/inject.sh b/s4-driver/examples/src/main/resources/scripts/inject.sh
index 5dab068..956b186 100644
--- a/s4-driver/examples/src/main/resources/scripts/inject.sh
+++ b/s4-driver/examples/src/main/resources/scripts/inject.sh
@@ -22,7 +22,7 @@ if [ "x$JAVA_HOME" != "x" ] ; then
JAVA_LOC=${JAVA_HOME}"/bin/"
fi
-CMD="${JAVA_LOC}java -classpath $CLASSPATH io.s4.client.example.Inject $1 $2 $3 $4"
+CMD="${JAVA_LOC}java -classpath $CLASSPATH org.apache.s4.client.example.Inject $1 $2 $3 $4"
#echo $CMD
$CMD
http://git-wip-us.apache.org/repos/asf/incubator-s4/blob/d382e44b/s4-driver/examples/src/main/resources/scripts/read.sh
----------------------------------------------------------------------
diff --git a/s4-driver/examples/src/main/resources/scripts/read.sh b/s4-driver/examples/src/main/resources/scripts/read.sh
index d0fdfa8..57c18e0 100644
--- a/s4-driver/examples/src/main/resources/scripts/read.sh
+++ b/s4-driver/examples/src/main/resources/scripts/read.sh
@@ -6,7 +6,7 @@ if [ "x$JAVA_HOME" != "x" ] ; then
JAVA_LOC=${JAVA_HOME}"/bin/"
fi
-CMD="${JAVA_LOC}java -classpath $CLASSPATH io.s4.client.example.Read $1 $2 $3 $4 $5 $6"
+CMD="${JAVA_LOC}java -classpath $CLASSPATH org.apache.s4.client.example.Read $1 $2 $3 $4 $5 $6"
echo $CMD
$CMD
http://git-wip-us.apache.org/repos/asf/incubator-s4/blob/d382e44b/s4-driver/examples/src/main/resources/scripts/request.py
----------------------------------------------------------------------
diff --git a/s4-driver/examples/src/main/resources/scripts/request.py b/s4-driver/examples/src/main/resources/scripts/request.py
index 2119181..3fb3075 100644
--- a/s4-driver/examples/src/main/resources/scripts/request.py
+++ b/s4-driver/examples/src/main/resources/scripts/request.py
@@ -1,4 +1,4 @@
-import io.s4.client.driver
+import org.apache.s4.client.driver
import pprint;
import sys;
@@ -7,7 +7,7 @@ mode = {'readMode': 'private', 'writeMode': 'enabled'};
stream = sys.argv[1];
clazz = sys.argv[2];
-d = io.s4.client.driver.Driver('localhost', 2334)
+d = org.apache.s4.client.driver.Driver('localhost', 2334)
d.setDebug(True);
d.initialize();
http://git-wip-us.apache.org/repos/asf/incubator-s4/blob/d382e44b/s4-driver/examples/src/main/resources/scripts/request.sh
----------------------------------------------------------------------
diff --git a/s4-driver/examples/src/main/resources/scripts/request.sh b/s4-driver/examples/src/main/resources/scripts/request.sh
index 44a5b8b..bd176cd 100644
--- a/s4-driver/examples/src/main/resources/scripts/request.sh
+++ b/s4-driver/examples/src/main/resources/scripts/request.sh
@@ -6,7 +6,7 @@ if [ "x$JAVA_HOME" != "x" ] ; then
JAVA_LOC=${JAVA_HOME}"/bin/"
fi
-CMD="${JAVA_LOC}java -classpath $CLASSPATH io.s4.client.example.Request $1 $2 $3 $4 $5"
+CMD="${JAVA_LOC}java -classpath $CLASSPATH org.apache.s4.client.example.Request $1 $2 $3 $4 $5"
echo $CMD
$CMD
http://git-wip-us.apache.org/repos/asf/incubator-s4/blob/d382e44b/s4-driver/examples/src/main/resources/scripts/test.py
----------------------------------------------------------------------
diff --git a/s4-driver/examples/src/main/resources/scripts/test.py b/s4-driver/examples/src/main/resources/scripts/test.py
index 5e83de3..1d6035a 100644
--- a/s4-driver/examples/src/main/resources/scripts/test.py
+++ b/s4-driver/examples/src/main/resources/scripts/test.py
@@ -1,4 +1,4 @@
-import io.s4.client.driver
+import org.apache.s4.client.driver
import sys;
if (len(sys.argv) > 1):
@@ -6,7 +6,7 @@ if (len(sys.argv) > 1):
else:
mode = {'readMode': 'all', 'writeMode': 'disabled'};
-d = io.s4.client.driver.Driver('localhost', 2334)
+d = org.apache.s4.client.driver.Driver('localhost', 2334)
d.setDebug(True);
d.initialize();
http://git-wip-us.apache.org/repos/asf/incubator-s4/blob/d382e44b/s4-examples/twittertopiccount-ft/src/main/resources/adapter-conf.xml
----------------------------------------------------------------------
diff --git a/s4-examples/twittertopiccount-ft/src/main/resources/adapter-conf.xml b/s4-examples/twittertopiccount-ft/src/main/resources/adapter-conf.xml
index c9173cb..225dea0 100644
--- a/s4-examples/twittertopiccount-ft/src/main/resources/adapter-conf.xml
+++ b/s4-examples/twittertopiccount-ft/src/main/resources/adapter-conf.xml
@@ -6,7 +6,7 @@
http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
- <bean id="twitterFeedListener" class="io.s4.example.twittertopiccount.TwitterFeedListener"
+ <bean id="twitterFeedListener" class="org.apache.s4.example.twittertopiccount.TwitterFeedListener"
init-method="init">
<property name="userid" value=""/>
<property name="password" value=""/>
@@ -16,7 +16,7 @@
<!--
// uncomment this for reading from twitter dumps rather than live stream
- <bean id="twitterFeedReader" class="io.s4.example.twittertopiccount.TwitterFeedReader"
+ <bean id="twitterFeedReader" class="org.apache.s4.example.twittertopiccount.TwitterFeedReader"
init-method="init">
<property name="streamName" value="RawStatus"/>
// twitter dumps are assumed to reside in a directory
http://git-wip-us.apache.org/repos/asf/incubator-s4/blob/d382e44b/s4-tools/loadgenerator/src/main/resources/scripts/generate-load.sh
----------------------------------------------------------------------
diff --git a/s4-tools/loadgenerator/src/main/resources/scripts/generate-load.sh b/s4-tools/loadgenerator/src/main/resources/scripts/generate-load.sh
index c9013cc..09b1685 100755
--- a/s4-tools/loadgenerator/src/main/resources/scripts/generate-load.sh
+++ b/s4-tools/loadgenerator/src/main/resources/scripts/generate-load.sh
@@ -88,6 +88,6 @@ fi
CLASSPATH=`find $CORE_HOME -name "*.jar" | awk '{p=$0"'$CP_SEP'"p;} END {print p}'`
CLASSPATH=$CLASSPATH$CP_SEP`find $LOAD_GENERATOR_HOME -name "*.jar" | awk '{p=$0"'$CP_SEP'"p;} END {print p}'`
-CMD="${JAVA_LOC}java $JAVA_OPTS -classpath $CLASSPATH io.s4.tools.loadgenerator.LoadGenerator -a ${ADAPTER_ADDRESS} -r${RATE} -d ${DISPLAY_INTERVAL} $INPUT_FILE"
+CMD="${JAVA_LOC}java $JAVA_OPTS -classpath $CLASSPATH org.apache.s4.tools.loadgenerator.LoadGenerator -a ${ADAPTER_ADDRESS} -r${RATE} -d ${DISPLAY_INTERVAL} $INPUT_FILE"
#echo "Running ${CMD}"
$CMD