diff --git a/akka-core/src/main/scala/stm/TransactionalState.scala b/akka-core/src/main/scala/stm/TransactionalState.scala
index c74fde4ab0..4f35f1199e 100644
--- a/akka-core/src/main/scala/stm/TransactionalState.scala
+++ b/akka-core/src/main/scala/stm/TransactionalState.scala
@@ -53,6 +53,17 @@ trait Committable {
}
/**
+ * Alias to TransactionalRef.
+ *
+ * @author Jonas Bonér
+ */
+object Ref {
+ def apply[T]() = new Ref[T]
+}
+
+/**
+ * Alias to Ref.
+ *
* @author Jonas Bonér
*/
object TransactionalRef {
@@ -65,8 +76,17 @@ object TransactionalRef {
def apply[T]() = new TransactionalRef[T]
}
+/**
+ * Implements a transactional managed reference.
+ * Alias to TransactionalRef.
+ *
+ * @author Jonas Bonér
+ */
+class Ref[T] extends TransactionalRef[T]
+
/**
* Implements a transactional managed reference.
+ * Alias to Ref.
*
* @author Jonas Bonér
*/
diff --git a/akka-samples/akka-sample-chat/src/main/scala/ChatServer.scala b/akka-samples/akka-sample-chat/src/main/scala/ChatServer.scala
index dcf8f74d6b..9b85972958 100644
--- a/akka-samples/akka-sample-chat/src/main/scala/ChatServer.scala
+++ b/akka-samples/akka-sample-chat/src/main/scala/ChatServer.scala
@@ -87,8 +87,9 @@ trait ChatStorage extends Actor
*/
class RedisChatStorage extends ChatStorage {
lifeCycle = Some(LifeCycle(Permanent))
-
- private var chatLog = atomic { RedisStorage.getVector("akka.chat.log") }
+ val CHAT_LOG = "akka.chat.log"
+
+ private var chatLog = atomic { RedisStorage.getVector(CHAT_LOG) }
log.info("Redis-based chat storage is starting up...")
@@ -106,7 +107,7 @@ class RedisChatStorage extends ChatStorage {
reply(ChatLog(messageList))
}
- override def postRestart(reason: Throwable) = chatLog = RedisStorage.getVector("akka.chat.log")
+ override def postRestart(reason: Throwable) = chatLog = RedisStorage.getVector(CHAT_LOG)
}
/**
diff --git a/project/build/AkkaProject.scala b/project/build/AkkaProject.scala
index 158f193494..cd46dbea5c 100644
--- a/project/build/AkkaProject.scala
+++ b/project/build/AkkaProject.scala
@@ -127,11 +127,11 @@ class AkkaParent(info: ProjectInfo) extends DefaultProject(info) {
// ------------------------------------------------------------
// publishing
override def managedStyle = ManagedStyle.Maven
- val publishTo = Resolver.file("maven-local", new java.io.File((Path.userHome / ".m2" / "repository").toString))
+ val publishTo = Resolver.file("maven-local", Path.userHome / ".m2" / "repository" asFile)
// Credentials(Path.userHome / ".akka_publish_credentials", log)
val sourceArtifact = Artifact(artifactID, "src", "jar", Some("sources"), Nil, None)
-// val docsArtifact = Artifact(artifactID, "docs", "jar", Some("javadoc"), Nil, None)
+ //val docsArtifact = Artifact(artifactID, "docs", "jar", Some("javadoc"), Nil, None)
override def packageDocsJar = defaultJarPath("-javadoc.jar")
override def packageSrcJar= defaultJarPath("-sources.jar")