diff --git a/akka-docs/additional/stability-matrix.rst b/akka-docs/additional/stability-matrix.rst index 636cab6c5f..61e5d247fb 100644 --- a/akka-docs/additional/stability-matrix.rst +++ b/akka-docs/additional/stability-matrix.rst @@ -28,7 +28,6 @@ AMQP Solid HTTP Solid Integration Guice Stable Integration Spring Stable -JTA Stable Scheduler Solid Redis Pub Sub In progress ================================ ============ ============ ============ diff --git a/akka-docs/intro/getting-started.rst b/akka-docs/intro/getting-started.rst index 8071c6887d..58632d3940 100644 --- a/akka-docs/intro/getting-started.rst +++ b/akka-docs/intro/getting-started.rst @@ -165,10 +165,6 @@ If you also want to include other Akka modules there is a convenience method: `` val akkaCamel = akkaModule("camel") val akkaCamelTyped = akkaModule("camel-typed") val akkaSpring = akkaModule("spring") - val akkaJta = akkaModule("jta") - val akkaCassandra = akkaModule("persistence-cassandra") - val akkaMongo = akkaModule("persistence-mongo") - val akkaRedis = akkaModule("persistence-redis") Using Akka with Eclipse diff --git a/akka-docs/java/stm.rst b/akka-docs/java/stm.rst index df6761b52a..ebdd553465 100644 --- a/akka-docs/java/stm.rst +++ b/akka-docs/java/stm.rst @@ -529,31 +529,3 @@ This illustration is taken from Rich Hickey's presentation. Copyright Rich Hicke .. image:: ../images/clojure-trees.png -JTA integration ---------------- - -The STM has JTA (Java Transaction API) integration. This means that it will, if enabled, hook in to JTA and start a JTA transaction when the STM transaction is started. It will also rollback the STM transaction if the JTA transaction has failed and vice versa. This does not mean that the STM is made durable, if you need that you should use one of the `persistence modules `_. It simply means that the STM will participate and interact with and external JTA provider, for example send a message using JMS atomically within an STM transaction, or use Hibernate to persist STM managed data etc. - -Akka also has an API for using JTA explicitly. Read the `section on JTA `_ for details. - -You can enable JTA support in the 'stm' section in the config: - -:: - - stm { - jta-aware = off # 'on' means that if there JTA Transaction Manager available then the STM will - # begin (or join), commit or rollback the JTA transaction. Default is 'off'. - } - -You also have to configure which JTA provider to use etc in the 'jta' config section: - -:: - - jta { - provider = "from-jndi" # Options: "from-jndi" (means that Akka will try to detect a TransactionManager in the JNDI) - # "atomikos" (means that Akka will use the Atomikos based JTA impl in 'akka-jta', - # e.g. you need the akka-jta JARs on classpath). - timeout = 60 - } - - diff --git a/akka-docs/scala/stm.rst b/akka-docs/scala/stm.rst index c5bb99bcb4..b11cf828e1 100644 --- a/akka-docs/scala/stm.rst +++ b/akka-docs/scala/stm.rst @@ -529,34 +529,6 @@ This illustration is taken from Rich Hickey's presentation. Copyright Rich Hicke .. image:: ../images/clojure-trees.png -JTA integration ---------------- - -The STM has JTA (Java Transaction API) integration. This means that it will, if enabled, hook in to JTA and start a JTA transaction when the STM transaction is started. It will also rollback the STM transaction if the JTA transaction has failed and vice versa. This does not mean that the STM is made durable, if you need that you should use one of the `persistence modules `_. It simply means that the STM will participate and interact with and external JTA provider, for example send a message using JMS atomically within an STM transaction, or use Hibernate to persist STM managed data etc. - -Akka also has an API for using JTA explicitly. Read the `section on JTA `_ for details. - -You can enable JTA support in the 'stm' section in the config: - -:: - - stm { - jta-aware = off # 'on' means that if there JTA Transaction Manager available then the STM will - # begin (or join), commit or rollback the JTA transaction. Default is 'off'. - } - -You also have to configure which JTA provider to use etc in the 'jta' config section: - -:: - - jta { - provider = "from-jndi" # Options: "from-jndi" (means that Akka will try to detect a TransactionManager in the JNDI) - # "atomikos" (means that Akka will use the Atomikos based JTA impl in 'akka-jta', - # e.g. you need the akka-jta JARs on classpath). - timeout = 60 - } - - Ants simulation sample ----------------------