diff --git a/akka-docs/pending/guice-integration.rst b/akka-docs/java/guice-integration.rst similarity index 93% rename from akka-docs/pending/guice-integration.rst rename to akka-docs/java/guice-integration.rst index 6392bddfd3..de00b701cb 100644 --- a/akka-docs/pending/guice-integration.rst +++ b/akka-docs/java/guice-integration.rst @@ -45,6 +45,8 @@ Retrieve the external Guice dependency -------------------------------------- The external dependency can be retrieved like this: -``_ -Ext ext = manager.getExternalDependency(Ext.class); -``_ + +.. code-block:: java + + Ext ext = manager.getExternalDependency(Ext.class); + diff --git a/akka-docs/java/index.rst b/akka-docs/java/index.rst index 54b2adf201..1d09b3e437 100644 --- a/akka-docs/java/index.rst +++ b/akka-docs/java/index.rst @@ -17,3 +17,4 @@ Java API fault-tolerance dispatchers routing + guice-integration diff --git a/akka-docs/pending/logging.rst b/akka-docs/pending/logging.rst deleted file mode 100644 index 833f2f419b..0000000000 --- a/akka-docs/pending/logging.rst +++ /dev/null @@ -1,4 +0,0 @@ -Logging -======= - -Logging has been removed. See the `Event Handler `_. diff --git a/akka-docs/pending/servlet.rst b/akka-docs/pending/servlet.rst deleted file mode 100644 index 6859657a72..0000000000 --- a/akka-docs/pending/servlet.rst +++ /dev/null @@ -1,41 +0,0 @@ -Akka Servlet -============ - -= - -Module stability: **STABLE** - -Akka has a servlet; ‘se.scalablesolutions.akka.comet.AkkaServlet’ that can use to deploy your Akka-based application in an external Servlet container. All you need to do is to add the servlet to the ‘web.xml’, set ‘$AKKA_HOME’ to the root of the distribution (needs the ‘$AKKA_HOME/config/*’ files) and add the JARs in the ‘$AKKA_HOME/lib’ to your classpath (or put them in the ‘WEB-INF/lib’ directory in the WAR file). - -Also, you need to add the Akka initialize/cleanup listener in web.xml - -.. code-block:: xml - - - ... - - se.scalablesolutions.akka.servlet.Initializer - - ... - - -And to support REST actors and/or comet actors, you need to add the following servlet declaration: - -``_ - -... - - Akka - - se.scalablesolutions.akka.comet.AkkaServlet - - se.scalablesolutions.akka.rest.AkkaServlet - - - * - Akka - -... - - -``_