raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 10

Merge branch 'master' of github.com:jboner/akka

Browse source
This commit is contained in:
Viktor Klang 2011-11-18 17:03:52 +01:00
commit d588e5abc2
7 changed files with 29 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
akka-docs/dev/building-akka.rst
View file

@ -128,7 +128,7 @@ Dependencies
You can look at the Ivy dependency resolution information that is created on
``sbt update`` and found in ``~/.ivy2/cache``. For example, the
``.ivy2/cache/se.scalablesolutions.akka-akka-cluster-compile.xml`` file contains
``~/.ivy2/cache/com.typesafe.akka-akka-remote-compile.xml`` file contains
the resolution information for the akka-cluster module compile dependencies. If
you open this file in a web browser you will get an easy to navigate view of
dependencies.

4
akka-docs/intro/deployment-scenarios.rst
View file

@ -54,7 +54,7 @@ To use the plugin, first add a plugin definition to your sbt project by creating
resolvers += Classpaths.typesafeResolver
addSbtPlugin("se.scalablesolutions.akka" % "akka-sbt-plugin" % "2.0-SNAPSHOT")
addSbtPlugin("com.typesafe.akka" % "akka-sbt-plugin" % "2.0-SNAPSHOT")
Then use the AkkaKernelPlugin settings. In a 'light' configuration (build.sbt)::
@ -75,7 +75,7 @@ Or in a 'full' configuration (Build.scala). For example::
version := "0.1",
scalaVersion := "2.9.1"
resolvers += "Typesafe Repo" at "http://repo.typesafe.com/typesafe/releases/",
libraryDependencies += "se.scalablesolutions.akka" % "akka-kernel" % "2.0-SNAPSHOT"
libraryDependencies += "com.typesafe.akka" % "akka-kernel" % "2.0-SNAPSHOT"
)
)
}

2
akka-docs/intro/getting-started-first-java.rst
View file

@ -180,7 +180,7 @@ It should now look something like this:
<dependencies>
<dependency>
<groupId>se.scalablesolutions.akka</groupId>
<groupId>com.typesafe.akka</groupId>
<artifactId>akka-actor</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>

8
akka-docs/intro/getting-started-first-scala.rst
View file

@ -192,7 +192,7 @@ in the directory you want to create your project in::
resolvers += "Typesafe Repository" at "http://repo.typesafe.com/typesafe/releases/"
libraryDependencies += "se.scalablesolutions.akka" % "akka-actor" % "2.0-SNAPSHOT"
libraryDependencies += "com.typesafe.akka" % "akka-actor" % "2.0-SNAPSHOT"
Create a directory ``src/main/scala`` in which you will store the Scala source
files.
@ -202,11 +202,11 @@ modules beyond ``akka-actor``, you can add these as ``libraryDependencies`` in
``build.sbt``. Note that there must be a blank line between each. Here is an
example adding ``akka-remote`` and ``akka-stm``::
libraryDependencies += "se.scalablesolutions.akka" % "akka-actor" % "2.0-SNAPSHOT"
libraryDependencies += "com.typesafe.akka" % "akka-actor" % "2.0-SNAPSHOT"
libraryDependencies += "se.scalablesolutions.akka" % "akka-remote" % "2.0-SNAPSHOT"
libraryDependencies += "com.typesafe.akka" % "akka-remote" % "2.0-SNAPSHOT"
libraryDependencies += "se.scalablesolutions.akka" % "akka-stm" % "2.0-SNAPSHOT"
libraryDependencies += "com.typesafe.akka" % "akka-stm" % "2.0-SNAPSHOT"
So, now we are all set.

4
akka-docs/intro/getting-started.rst
View file

@ -117,7 +117,7 @@ Summary of the essential parts for using Akka with Maven:
.. code-block:: xml
<dependency>
<groupId>se.scalablesolutions.akka</groupId>
<groupId>com.typesafe.akka</groupId>
<artifactId>akka-actor</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
@ -145,7 +145,7 @@ SBT installation instructions on `https://github.com/harrah/xsbt/wiki/Setup <htt
resolvers += "Typesafe Repository" at "http://repo.typesafe.com/typesafe/releases/"
libraryDependencies += "se.scalablesolutions.akka" % "akka-actor" % "2.0-SNAPSHOT"
libraryDependencies += "com.typesafe.akka" % "akka-actor" % "2.0-SNAPSHOT"
Using Akka with Eclipse

18
akka-docs/project/links.rst
View file

@ -47,4 +47,22 @@ directly.
* http://download.java.net/maven/glassfish
* http://databinder.net/repo
SNAPSHOT Versions
=================
Nightly builds are available in `<http://repo.typesafe.com/typesafe/maven-timestamps/>`_ repository as
timestamped snapshot versions. Pick a timestamp from
`<http://repo.typesafe.com/typesafe/maven-timestamps/com/typesafe/akka/akka-actor/>`_.
All Akka modules that belong to the same build have the same timestamp.
Make sure that you add the repository to the sbt resolvers or maven repositories::
resolvers += "Typesafe Timestamp Repo" at "http://repo.typesafe.com/typesafe/maven-timestamps/"
Define the library dependencies with the timestamp as version::
libraryDependencies += "com.typesafe.akka" % "akka-actor" % "2.0-20111118-000627"
libraryDependencies += "com.typesafe.akka" % "akka-remote" % "2.0-20111118-000627"

2
akka-docs/scala/http.rst
View file

@ -99,7 +99,7 @@ If you want to use jetty-run in SBT you need to exclude the version of Jetty tha
override def ivyXML =
<dependencies>
<dependency org="se.scalablesolutions.akka" name="akka-http" rev="AKKA_VERSION_GOES_HERE">
<dependency org="com.typesafe.akka" name="akka-http" rev="AKKA_VERSION_GOES_HERE">
<exclude module="jetty"/>
</dependency>
</dependencies>