docs/main/Features.rst | 2 +-
docs/main/IntegratingWithTG2.rst | 6 +++---
docs/main/Messaging.rst | 2 +-
docs/main/Producers.rst | 8 ++++----
docs/main/QuickstartTemplates.rst | 4 ++--
docs/main/Technology.rst | 2 +-
docs/main/Topics.rst | 2 +-
7 files changed, 13 insertions(+), 13 deletions(-)
New commits:
commit 25c21ba4c6098b77bba2ec038731e6ea42bde307
Author: Luke Macken <lmacken(a)redhat.com>
Date: Wed Dec 16 21:54:16 2009 -0500
More s/datastream/producer/g doc changes
diff --git a/docs/main/Features.rst b/docs/main/Features.rst
index 2009781..38d77f6 100644
--- a/docs/main/Features.rst
+++ b/docs/main/Features.rst
@@ -88,7 +88,7 @@ process incoming data. One could then easily build state-machines,
inference
engines, or even forward/backward-chaning rule-driven expert systems.
Moksha also provides a simple yet powerful API for creating
-:doc:`DataStreamers` that can do basically anything at anytime. It allows for
+:doc:`Producers` that can do basically anything at anytime. It allows for
the easy scripting of periodic tasks such as fetching data, polling resources,
warming caches, sending notifications, analyzing databases, etc. For example,
Moksha provides a :doc:`FeedStream`, that automatically handles fetching,
diff --git a/docs/main/IntegratingWithTG2.rst b/docs/main/IntegratingWithTG2.rst
index 8d394f1..b7c0d30 100644
--- a/docs/main/IntegratingWithTG2.rst
+++ b/docs/main/IntegratingWithTG2.rst
@@ -111,12 +111,12 @@ that your global resources are always injected.
</body>
</html>
-Create the Moksha Data Stream
------------------------------
+Create the Moksha Data Producer
+-------------------------------
In the original example, the JQPlotWidget would query a controller every 2
seconds, which returns JSON data. Since Moksha is event driven, we will create
-a Moksha :doc:`DataStreams` that will wake up every 2 seconds and send new data
+a Moksha :doc:`Producers` that will wake up every 2 seconds and send new data
to the message bus for a couple of given :doc:`Topics`. This makes it so our widgets
can simply subscribe to their corresponding topics, and patiently wait for new
data to arrive.
diff --git a/docs/main/Messaging.rst b/docs/main/Messaging.rst
index 2eefda8..2128ed7 100644
--- a/docs/main/Messaging.rst
+++ b/docs/main/Messaging.rst
@@ -6,7 +6,7 @@ Messaging
Topics
Consumers
- DataStreams
+ Producers
LiveWidget
MokshaHub
MessageBrokers
diff --git a/docs/main/Producers.rst b/docs/main/Producers.rst
index e02bbdc..a12b7df 100644
--- a/docs/main/Producers.rst
+++ b/docs/main/Producers.rst
@@ -10,8 +10,8 @@ The Producers contain a connection to the MokshaHub via the `self.hub`
object.
It also provides a `send_message(topic, message)` method that will send your
message to the hub.
-Polling Data Streams
---------------------
+Polling Producers
+------------------
The :class:`PollingProducer` will automatically wake up at a given `frequency`
(which can be a `datetime.timedelta` object, or the number of a seconds), and
@@ -34,10 +34,10 @@ seconds, and sends a 'Hello World!' message to the
'hello' `topic`.
Installing
----------
-To install your `Producer`, simply add it to the `[moksha.stream]` entry-point
+To install your `Producer`, simply add it to the `[moksha.producer]` entry-point
in your `setup.py`, like so:
.. code-block:: python
[moksha.producer]
- hello = myproject.streams.hello:HelloWorldProducer
+ hello = myproject.producers:HelloWorldProducer
diff --git a/docs/main/QuickstartTemplates.rst b/docs/main/QuickstartTemplates.rst
index 752a82b..9d9ac11 100644
--- a/docs/main/QuickstartTemplates.rst
+++ b/docs/main/QuickstartTemplates.rst
@@ -17,7 +17,7 @@ Moksha provides templates for easily creating basic components.
-c, --connector Create an example Moksha Connector
-u, --consumer Create an example Moksha Consumer
-C, --controller Create an example Moksha Controller
- -s, --stream Create an example Moksha DataStream
+ -P, --producer Create an example Moksha Producer
-p PACKAGE, --package=PACKAGE
package name for the code
-t TOPIC, --topic=TOPIC
@@ -34,7 +34,7 @@ Creating a new moksha app with all components
.. code-block:: bash
- $ paster moksha --livewidget --stream --consumer --controller
+ $ paster moksha --livewidget --producer --consumer --controller
Creating and installing an RPM for your new package
diff --git a/docs/main/Technology.rst b/docs/main/Technology.rst
index 0af4eaa..3755966 100644
--- a/docs/main/Technology.rst
+++ b/docs/main/Technology.rst
@@ -76,4 +76,4 @@ receives, stores, and routes messages using the AMQP protocol.
`Twisted <
http://twistedmatrix.com>`_
-------------------------------------
-Twisted is an event-driven networking engine written in Python. It is the core engine
for the :doc:`MokshaHub`, which reacts to incoming messages, as well as runs our
:doc:`DataStreams`.
+Twisted is an event-driven networking engine written in Python. It is the core engine
for the :doc:`MokshaHub`, which reacts to incoming messages, as well as runs our
:doc:`Producers`.
diff --git a/docs/main/Topics.rst b/docs/main/Topics.rst
index b93e507..4d8f4bf 100644
--- a/docs/main/Topics.rst
+++ b/docs/main/Topics.rst
@@ -11,4 +11,4 @@ potentially be represented by a STOMP destination, or even an AMQP
message
queue. These messaging backends can be swapped out and configured without
having to alter the applications that care about those `topics`.
-For details on how to interact with topics, see the documentation on :doc:`Consumers`,
:doc:`DataStreams`, and :doc:`MokshaHub`.
+For details on how to interact with topics, see the documentation on :doc:`Consumers`,
:doc:`Producers`, and :doc:`MokshaHub`.