=tra #3668 Deprecate transactors

akka · Dec 13, 2013 · dd3d3da · dd3d3da
1 parent b9c62ee
commit dd3d3da
Show file tree

Hide file tree

Showing 25 changed files with 20 additions and 987 deletions.
diff --git a/akka-docs/rst/general/configuration.rst b/akka-docs/rst/general/configuration.rst
@@ -379,12 +379,6 @@ akka-cluster
 .. literalinclude:: ../../../akka-cluster/src/main/resources/reference.conf
    :language: none
 
-akka-transactor
-~~~~~~~~~~~~~~~
-
-.. literalinclude:: ../../../akka-transactor/src/main/resources/reference.conf
-   :language: none
-
 akka-agent
 ~~~~~~~~~~
 

diff --git a/akka-docs/rst/intro/getting-started.rst b/akka-docs/rst/intro/getting-started.rst
@@ -48,9 +48,6 @@ Akka is very modular and consists of several JARs containing different features.
 
 - ``akka-testkit`` – Toolkit for testing Actor systems
 
-- ``akka-transactor`` – Transactors - transactional actors, integrated with
-  Scala STM
-
 - ``akka-zeromq`` – ZeroMQ integration
 
 In addition to these stable modules there are several which are on their way

diff --git a/akka-docs/rst/intro/what-is-akka.rst b/akka-docs/rst/intro/what-is-akka.rst
@@ -54,14 +54,6 @@ interactions of actors use pure message passing and everything is asynchronous.
 
 For an overview of the remoting see :ref:`remoting`
 
-Transactors
------------
-
-Transactors combine actors and Software Transactional Memory (STM) into transactional actors.
-It allows you to compose atomic message flows with automatic retry and rollback.
-
-See :ref:`Transactors (Scala) <transactors-scala>` and :ref:`Transactors (Java) <transactors-java>`
-
 Persistence
 -----------
 

diff --git a/akka-docs/rst/java/code/docs/transactor/CoordinatedCounter.java b/akka-docs/rst/java/code/docs/transactor/CoordinatedCounter.java
diff --git a/akka-docs/rst/java/code/docs/transactor/Coordinator.java b/akka-docs/rst/java/code/docs/transactor/Coordinator.java
diff --git a/akka-docs/rst/java/code/docs/transactor/Counter.java b/akka-docs/rst/java/code/docs/transactor/Counter.java
diff --git a/akka-docs/rst/java/code/docs/transactor/FriendlyCounter.java b/akka-docs/rst/java/code/docs/transactor/FriendlyCounter.java
diff --git a/akka-docs/rst/java/code/docs/transactor/Increment.java b/akka-docs/rst/java/code/docs/transactor/Increment.java
diff --git a/akka-docs/rst/java/code/docs/transactor/Message.java b/akka-docs/rst/java/code/docs/transactor/Message.java
diff --git a/akka-docs/rst/java/code/docs/transactor/TransactorDocJavaSpec.scala b/akka-docs/rst/java/code/docs/transactor/TransactorDocJavaSpec.scala
diff --git a/akka-docs/rst/java/code/docs/transactor/TransactorDocTest.java b/akka-docs/rst/java/code/docs/transactor/TransactorDocTest.java
diff --git a/akka-docs/rst/java/index-futures.rst b/akka-docs/rst/java/index-futures.rst
@@ -5,6 +5,4 @@ Futures and Agents
    :maxdepth: 2
 
    futures
-   stm
    agents
-   transactors
diff --git a/akka-docs/rst/java/stm.rst b/akka-docs/rst/java/stm.rst