@@ -81,21 +81,23 @@ trait Actor extends Logging with TransactionManagement { // ==== USER CALLBACKS TO OVERRIDE ==== // ==================================== + /** * User overridable callback/setting. * - * Defines the default timeout for '!!' invocations, e.g. the timeout for the future returned by the call to '!!'. + * Identifier for actor, does not have to be a unique one. Default is the class name. + * + * This field is used for logging etc. but also as the identifier for persistence, which means that you can + * use a custom name to be able to retrieve the "correct" persisted state upon restart, remote restart etc. */ - @volatile var timeout: Long = Actor.TIMEOUT + protected[this] var id: String = this.getClass.toString /** * User overridable callback/setting. * - * Defines the life-cycle for a supervised actor. - * - * Needs to be set if the actor is supervised programmatically. + * Defines the default timeout for '!!' invocations, e.g. the timeout for the future returned by the call to '!!'. */ - @volatile var lifeCycle: Option[LifeCycle] = None + @volatile var timeout: Long = Actor.TIMEOUT /** * User overridable callback/setting. @@ -127,13 +129,6 @@ trait Actor extends Logging with TransactionManagement { /** * User overridable callback/setting. * - * Identifier for actor, does not have to be a unique one. Simply the one used in logging etc. - */ - protected[this] var id: String = this.getClass.toString - - /** - * User overridable callback/setting. - * * Set trapExit to true if actor should be able to trap linked actors exit messages. */ protected[this] var trapExit: Boolean = false @@ -141,14 +136,6 @@ trait Actor extends Logging with TransactionManagement { /** * User overridable callback/setting. * - * Set to true if messages should have REQUIRES_NEW semantics, e.g. a new transaction should - * start if there is no one running, else it joins the existing transaction. - */ - @volatile protected var isTransactionRequiresNew = false - - /** - * User overridable callback/setting. - * * If 'trapExit' is set for the actor to act as supervisor, then a faultHandler must be defined. * Can be one of: * <pre/> @@ -162,6 +149,23 @@ trait Actor extends Logging with TransactionManagement { /** * User overridable callback/setting. * + * Defines the life-cycle for a supervised actor. + * + * Needs to be set if the actor is supervised programmatically. + */ + @volatile var lifeCycle: Option[LifeCycle] = None + + /** + * User overridable callback/setting. + * + * Set to true if messages should have REQUIRES_NEW semantics, e.g. a new transaction should + * start if there is no one running, else it joins the existing transaction. + */ + @volatile protected var isTransactionRequiresNew = false + + /** + * User overridable callback/setting. + * * Partial function implementing the server logic. * To be implemented by subclassing server. * <p/> akka-actors/src/main/scala/actor/Actor.scala @@ -56,6 +56,9 @@ trait CassandraSession extends Closeable with Flushable { def /(key: String, columnParent: ColumnParent, start: Array[Byte], end: Array[Byte], ascending: Boolean, count: Int, consistencyLevel: Int): List[ColumnOrSuperColumn] = client.get_slice(keyspace, key, columnParent, new SlicePredicate(null, new SliceRange(start, end, ascending, count)), consistencyLevel).toList + def /(key: String, columnParent: ColumnParent, slicePredicate: SlicePredicate): List[ColumnOrSuperColumn] = + client.get_slice(keyspace, key, columnParent, slicePredicate, consistencyLevel).toList + def /(key: String, columnParent: ColumnParent, slicePredicate: SlicePredicate, consistencyLevel: Int): List[ColumnOrSuperColumn] = client.get_slice(keyspace, key, columnParent, slicePredicate, consistencyLevel).toList @@ -74,6 +77,9 @@ trait CassandraSession extends Closeable with Flushable { def ++|(key: String, colPath: ColumnPath, value: Array[Byte]): Unit = ++|(key, colPath, value, obtainedAt, consistencyLevel) + def ++|(key: String, colPath: ColumnPath, value: Array[Byte], consistencyLevel: Int): Unit = + ++|(key, colPath, value, obtainedAt, consistencyLevel) + def ++|(key: String, colPath: ColumnPath, value: Array[Byte], timestamp: Long): Unit = ++|(key, colPath, value, timestamp, consistencyLevel) akka-persistence/src/main/scala/CassandraSession.scala @@ -6,10 +6,10 @@ package se.scalablesolutions.akka.state import java.io.{Flushable, Closeable} -import util.Logging -import util.Helpers._ -import serialization.Serializer -import Config.config +import se.scalablesolutions.akka.util.Logging +import se.scalablesolutions.akka.util.Helpers._ +import se.scalablesolutions.akka.serialization.Serializer +import se.scalablesolutions.akka.Config.config import org.apache.cassandra.db.ColumnFamily import org.apache.cassandra.service._ @@ -33,7 +33,15 @@ object CassandraStorage extends MapStorage val CASSANDRA_SERVER_HOSTNAME = config.getString("akka.storage.cassandra.hostname", "127.0.0.1") val CASSANDRA_SERVER_PORT = config.getInt("akka.storage.cassandra.port", 9160) - val CONSISTENCY_LEVEL = config.getInt("akka.storage.cassandra.consistency-level", 1) + val CONSISTENCY_LEVEL = { + config.getString("akka.storage.cassandra.consistency-level", "QUORUM") match { + case "ZERO" => 0 + case "ONE" => 1 + case "QUORUM" => 2 + case "ALL" => 3 + case unknown => throw new IllegalArgumentException("Consistency level [" + unknown + "] is not supported. Expected one of [ZERO, ONE, QUORUM, ALL]") + } + } val IS_ASCENDING = true @volatile private[this] var isRunning = false @@ -61,7 +69,7 @@ object CassandraStorage extends MapStorage } } - private[this] var sessions = new CassandraSessionPool( + private[this] val sessions = new CassandraSessionPool( KEYSPACE, StackPool(SocketProvider(CASSANDRA_SERVER_HOSTNAME, CASSANDRA_SERVER_PORT)), protocol, akka-persistence/src/main/scala/CassandraStorage.scala @@ -7,8 +7,6 @@ package se.scalablesolutions.akka.state import se.scalablesolutions.akka.stm.TransactionManagement.currentTransaction import se.scalablesolutions.akka.collection._ -import org.codehaus.aspectwerkz.proxy.Uuid - class NoTransactionInScopeException extends RuntimeException sealed abstract class PersistentStateConfig akka-persistence/src/main/scala/PersistentState.scala @@ -526,17 +526,6 @@ <root url="jar://$MAVEN_REPOSITORY$/com/google/protobuf/protobuf-java/2.1.0/protobuf-java-2.1.0-sources.jar!/" /> </SOURCES> </library> - <library name="Maven: org.multiverse:multiverse:0.3"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/org/multiverse/multiverse/0.3/multiverse-0.3.jar!/" /> - </CLASSES> - <JAVADOC> - <root url="jar://$MAVEN_REPOSITORY$/org/multiverse/multiverse/0.3/multiverse-0.3-javadoc.jar!/" /> - </JAVADOC> - <SOURCES> - <root url="jar://$MAVEN_REPOSITORY$/org/multiverse/multiverse/0.3/multiverse-0.3-sources.jar!/" /> - </SOURCES> - </library> <library name="Maven: org.codehaus.aspectwerkz:aspectwerkz-nodeps-jdk5:2.1"> <CLASSES> <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/aspectwerkz/aspectwerkz-nodeps-jdk5/2.1/aspectwerkz-nodeps-jdk5-2.1.jar!/" /> @@ -1010,28 +999,6 @@ <root url="jar://$MAVEN_REPOSITORY$/net/liftweb/lift-util/1.1-SNAPSHOT/lift-util-1.1-SNAPSHOT-sources.jar!/" /> </SOURCES> </library> - <library name="Maven: javax.mail:mail:1.4"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/javax/mail/mail/1.4/mail-1.4.jar!/" /> - </CLASSES> - <JAVADOC> - <root url="jar://$MAVEN_REPOSITORY$/javax/mail/mail/1.4/mail-1.4-javadoc.jar!/" /> - </JAVADOC> - <SOURCES> - <root url="jar://$MAVEN_REPOSITORY$/javax/mail/mail/1.4/mail-1.4-sources.jar!/" /> - </SOURCES> - </library> - <library name="Maven: commons-httpclient:commons-httpclient:3.1"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.jar!/" /> - </CLASSES> - <JAVADOC> - <root url="jar://$MAVEN_REPOSITORY$/commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1-javadoc.jar!/" /> - </JAVADOC> - <SOURCES> - <root url="jar://$MAVEN_REPOSITORY$/commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1-sources.jar!/" /> - </SOURCES> - </library> <library name="Maven: commons-codec:commons-codec:1.3"> <CLASSES> <root url="jar://$MAVEN_REPOSITORY$/commons-codec/commons-codec/1.3/commons-codec-1.3.jar!/" /> @@ -1142,17 +1109,6 @@ <root url="jar://$MAVEN_REPOSITORY$/junit/junit/4.5/junit-4.5-sources.jar!/" /> </SOURCES> </library> - <library name="Maven: org.scala-tools.testing:scalatest:0.9.5"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/org/scala-tools/testing/scalatest/0.9.5/scalatest-0.9.5.jar!/" /> - </CLASSES> - <JAVADOC> - <root url="jar://$MAVEN_REPOSITORY$/org/scala-tools/testing/scalatest/0.9.5/scalatest-0.9.5-javadoc.jar!/" /> - </JAVADOC> - <SOURCES> - <root url="jar://$MAVEN_REPOSITORY$/org/scala-tools/testing/scalatest/0.9.5/scalatest-0.9.5-sources.jar!/" /> - </SOURCES> - </library> <library name="Maven: rome:rome:0.9"> <CLASSES> <root url="jar://$MAVEN_REPOSITORY$/rome/rome/0.9/rome-0.9.jar!/" /> @@ -1208,28 +1164,6 @@ <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-library/1.1/hamcrest-library-1.1-sources.jar!/" /> </SOURCES> </library> - <library name="Maven: org.scala-lang:scala-compiler:2.7.5"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/org/scala-lang/scala-compiler/2.7.5/scala-compiler-2.7.5.jar!/" /> - </CLASSES> - <JAVADOC> - <root url="jar://$MAVEN_REPOSITORY$/org/scala-lang/scala-compiler/2.7.5/scala-compiler-2.7.5-javadoc.jar!/" /> - </JAVADOC> - <SOURCES> - <root url="jar://$MAVEN_REPOSITORY$/org/scala-lang/scala-compiler/2.7.5/scala-compiler-2.7.5-sources.jar!/" /> - </SOURCES> - </library> - <library name="Maven: net.liftweb:lift-webkit:1.1-SNAPSHOT"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/net/liftweb/lift-webkit/1.1-SNAPSHOT/lift-webkit-1.1-SNAPSHOT.jar!/" /> - </CLASSES> - <JAVADOC> - <root url="jar://$MAVEN_REPOSITORY$/net/liftweb/lift-webkit/1.1-SNAPSHOT/lift-webkit-1.1-SNAPSHOT-javadoc.jar!/" /> - </JAVADOC> - <SOURCES> - <root url="jar://$MAVEN_REPOSITORY$/net/liftweb/lift-webkit/1.1-SNAPSHOT/lift-webkit-1.1-SNAPSHOT-sources.jar!/" /> - </SOURCES> - </library> <library name="Maven: net.liftweb:lift-actor:1.1-SNAPSHOT"> <CLASSES> <root url="jar://$MAVEN_REPOSITORY$/net/liftweb/lift-actor/1.1-SNAPSHOT/lift-actor-1.1-SNAPSHOT.jar!/" /> @@ -1241,39 +1175,6 @@ <root url="jar://$MAVEN_REPOSITORY$/net/liftweb/lift-actor/1.1-SNAPSHOT/lift-actor-1.1-SNAPSHOT-sources.jar!/" /> </SOURCES> </library> - <library name="Maven: org.mortbay.jetty:jetty:6.1.21"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/org/mortbay/jetty/jetty/6.1.21/jetty-6.1.21.jar!/" /> - </CLASSES> - <JAVADOC> - <root url="jar://$MAVEN_REPOSITORY$/org/mortbay/jetty/jetty/6.1.21/jetty-6.1.21-javadoc.jar!/" /> - </JAVADOC> - <SOURCES> - <root url="jar://$MAVEN_REPOSITORY$/org/mortbay/jetty/jetty/6.1.21/jetty-6.1.21-sources.jar!/" /> - </SOURCES> - </library> - <library name="Maven: org.mortbay.jetty:jetty-util:6.1.21"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/org/mortbay/jetty/jetty-util/6.1.21/jetty-util-6.1.21.jar!/" /> - </CLASSES> - <JAVADOC> - <root url="jar://$MAVEN_REPOSITORY$/org/mortbay/jetty/jetty-util/6.1.21/jetty-util-6.1.21-javadoc.jar!/" /> - </JAVADOC> - <SOURCES> - <root url="jar://$MAVEN_REPOSITORY$/org/mortbay/jetty/jetty-util/6.1.21/jetty-util-6.1.21-sources.jar!/" /> - </SOURCES> - </library> - <library name="Maven: org.mortbay.jetty:servlet-api:2.5-20081211"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/org/mortbay/jetty/servlet-api/2.5-20081211/servlet-api-2.5-20081211.jar!/" /> - </CLASSES> - <JAVADOC> - <root url="jar://$MAVEN_REPOSITORY$/org/mortbay/jetty/servlet-api/2.5-20081211/servlet-api-2.5-20081211-javadoc.jar!/" /> - </JAVADOC> - <SOURCES> - <root url="jar://$MAVEN_REPOSITORY$/org/mortbay/jetty/servlet-api/2.5-20081211/servlet-api-2.5-20081211-sources.jar!/" /> - </SOURCES> - </library> <library name="Maven: sjson.json:sjson:0.2"> <CLASSES> <root url="jar://$MAVEN_REPOSITORY$/sjson/json/sjson/0.2/sjson-0.2.jar!/" /> @@ -1428,6 +1329,123 @@ <root url="jar://$MAVEN_REPOSITORY$/asm/asm-util/3.1/asm-util-3.1-sources.jar!/" /> </SOURCES> </library> + <library name="Maven: javax.mail:mail:1.4.3-SNAPSHOT"> + <CLASSES> + <root url="jar://$MAVEN_REPOSITORY$/javax/mail/mail/1.4.3-SNAPSHOT/mail-1.4.3-SNAPSHOT.jar!/" /> + <root url="jar://$MAVEN_REPOSITORY$/javax/mail/mail/1.4.3-SNAPSHOT/mail-1.4.3-SNAPSHOT.jar!/" /> + <root url="jar://$MAVEN_REPOSITORY$/javax/mail/mail/1.4.3-SNAPSHOT/mail-1.4.3-SNAPSHOT.jar!/" /> + <root url="jar://$MAVEN_REPOSITORY$/javax/mail/mail/1.4.3-SNAPSHOT/mail-1.4.3-SNAPSHOT.jar!/" /> + <root url="jar://$MAVEN_REPOSITORY$/javax/mail/mail/1.4.3-SNAPSHOT/mail-1.4.3-SNAPSHOT.jar!/" /> + <root url="jar://$MAVEN_REPOSITORY$/javax/mail/mail/1.4.3-SNAPSHOT/mail-1.4.3-SNAPSHOT.jar!/" /> + <root url="jar://$MAVEN_REPOSITORY$/javax/mail/mail/1.4.3-SNAPSHOT/mail-1.4.3-SNAPSHOT.jar!/" /> + </CLASSES> + <JAVADOC> + <root url="jar://$MAVEN_REPOSITORY$/javax/mail/mail/1.4.3-SNAPSHOT/mail-1.4.3-SNAPSHOT-javadoc.jar!/" /> + <root url="jar://$MAVEN_REPOSITORY$/javax/mail/mail/1.4.3-SNAPSHOT/mail-1.4.3-SNAPSHOT-javadoc.jar!/" /> + <root url="jar://$MAVEN_REPOSITORY$/javax/mail/mail/1.4.3-SNAPSHOT/mail-1.4.3-SNAPSHOT-javadoc.jar!/" /> + <root url="jar://$MAVEN_REPOSITORY$/javax/mail/mail/1.4.3-SNAPSHOT/mail-1.4.3-SNAPSHOT-javadoc.jar!/" /> + <root url="jar://$MAVEN_REPOSITORY$/javax/mail/mail/1.4.3-SNAPSHOT/mail-1.4.3-SNAPSHOT-javadoc.jar!/" /> + <root url="jar://$MAVEN_REPOSITORY$/javax/mail/mail/1.4.3-SNAPSHOT/mail-1.4.3-SNAPSHOT-javadoc.jar!/" /> + <root url="jar://$MAVEN_REPOSITORY$/javax/mail/mail/1.4.3-SNAPSHOT/mail-1.4.3-SNAPSHOT-javadoc.jar!/" /> + </JAVADOC> + <SOURCES> + <root url="jar://$MAVEN_REPOSITORY$/javax/mail/mail/1.4.3-SNAPSHOT/mail-1.4.3-SNAPSHOT-sources.jar!/" /> + <root url="jar://$MAVEN_REPOSITORY$/javax/mail/mail/1.4.3-SNAPSHOT/mail-1.4.3-SNAPSHOT-sources.jar!/" /> + <root url="jar://$MAVEN_REPOSITORY$/javax/mail/mail/1.4.3-SNAPSHOT/mail-1.4.3-SNAPSHOT-sources.jar!/" /> + <root url="jar://$MAVEN_REPOSITORY$/javax/mail/mail/1.4.3-SNAPSHOT/mail-1.4.3-SNAPSHOT-sources.jar!/" /> + <root url="jar://$MAVEN_REPOSITORY$/javax/mail/mail/1.4.3-SNAPSHOT/mail-1.4.3-SNAPSHOT-sources.jar!/" /> + <root url="jar://$MAVEN_REPOSITORY$/javax/mail/mail/1.4.3-SNAPSHOT/mail-1.4.3-SNAPSHOT-sources.jar!/" /> + <root url="jar://$MAVEN_REPOSITORY$/javax/mail/mail/1.4.3-SNAPSHOT/mail-1.4.3-SNAPSHOT-sources.jar!/" /> + </SOURCES> + </library> + <library name="Maven: net.lag:configgy:1.4"> + <CLASSES> + <root url="jar://$MAVEN_REPOSITORY$/net/lag/configgy/1.4/configgy-1.4.jar!/" /> + </CLASSES> + <JAVADOC> + <root url="jar://$MAVEN_REPOSITORY$/net/lag/configgy/1.4/configgy-1.4-javadoc.jar!/" /> + </JAVADOC> + <SOURCES> + <root url="jar://$MAVEN_REPOSITORY$/net/lag/configgy/1.4/configgy-1.4-sources.jar!/" /> + </SOURCES> + </library> + <library name="Maven: org.scala-lang:scala-compiler:2.7.5"> + <CLASSES> + <root url="jar://$MAVEN_REPOSITORY$/org/scala-lang/scala-compiler/2.7.5/scala-compiler-2.7.5.jar!/" /> + </CLASSES> + <JAVADOC> + <root url="jar://$MAVEN_REPOSITORY$/org/scala-lang/scala-compiler/2.7.5/scala-compiler-2.7.5-javadoc.jar!/" /> + </JAVADOC> + <SOURCES> + <root url="jar://$MAVEN_REPOSITORY$/org/scala-lang/scala-compiler/2.7.5/scala-compiler-2.7.5-sources.jar!/" /> + </SOURCES> + </library> + <library name="Maven: net.liftweb:lift-webkit:1.1-SNAPSHOT"> + <CLASSES> + <root url="jar://$MAVEN_REPOSITORY$/net/liftweb/lift-webkit/1.1-SNAPSHOT/lift-webkit-1.1-SNAPSHOT.jar!/" /> + </CLASSES> + <JAVADOC> + <root url="jar://$MAVEN_REPOSITORY$/net/liftweb/lift-webkit/1.1-SNAPSHOT/lift-webkit-1.1-SNAPSHOT-javadoc.jar!/" /> + </JAVADOC> + <SOURCES> + <root url="jar://$MAVEN_REPOSITORY$/net/liftweb/lift-webkit/1.1-SNAPSHOT/lift-webkit-1.1-SNAPSHOT-sources.jar!/" /> + </SOURCES> + </library> + <library name="Maven: org.mortbay.jetty:jetty:6.1.21"> + <CLASSES> + <root url="jar://$MAVEN_REPOSITORY$/org/mortbay/jetty/jetty/6.1.21/jetty-6.1.21.jar!/" /> + </CLASSES> + <JAVADOC> + <root url="jar://$MAVEN_REPOSITORY$/org/mortbay/jetty/jetty/6.1.21/jetty-6.1.21-javadoc.jar!/" /> + </JAVADOC> + <SOURCES> + <root url="jar://$MAVEN_REPOSITORY$/org/mortbay/jetty/jetty/6.1.21/jetty-6.1.21-sources.jar!/" /> + </SOURCES> + </library> + <library name="Maven: org.mortbay.jetty:jetty-util:6.1.21"> + <CLASSES> + <root url="jar://$MAVEN_REPOSITORY$/org/mortbay/jetty/jetty-util/6.1.21/jetty-util-6.1.21.jar!/" /> + </CLASSES> + <JAVADOC> + <root url="jar://$MAVEN_REPOSITORY$/org/mortbay/jetty/jetty-util/6.1.21/jetty-util-6.1.21-javadoc.jar!/" /> + </JAVADOC> + <SOURCES> + <root url="jar://$MAVEN_REPOSITORY$/org/mortbay/jetty/jetty-util/6.1.21/jetty-util-6.1.21-sources.jar!/" /> + </SOURCES> + </library> + <library name="Maven: org.mortbay.jetty:servlet-api:2.5-20081211"> + <CLASSES> + <root url="jar://$MAVEN_REPOSITORY$/org/mortbay/jetty/servlet-api/2.5-20081211/servlet-api-2.5-20081211.jar!/" /> + </CLASSES> + <JAVADOC> + <root url="jar://$MAVEN_REPOSITORY$/org/mortbay/jetty/servlet-api/2.5-20081211/servlet-api-2.5-20081211-javadoc.jar!/" /> + </JAVADOC> + <SOURCES> + <root url="jar://$MAVEN_REPOSITORY$/org/mortbay/jetty/servlet-api/2.5-20081211/servlet-api-2.5-20081211-sources.jar!/" /> + </SOURCES> + </library> + <library name="Maven: org.scalatest:scalatest:1.0"> + <CLASSES> + <root url="jar://$MAVEN_REPOSITORY$/org/scalatest/scalatest/1.0/scalatest-1.0.jar!/" /> + </CLASSES> + <JAVADOC> + <root url="jar://$MAVEN_REPOSITORY$/org/scalatest/scalatest/1.0/scalatest-1.0-javadoc.jar!/" /> + </JAVADOC> + <SOURCES> + <root url="jar://$MAVEN_REPOSITORY$/org/scalatest/scalatest/1.0/scalatest-1.0-sources.jar!/" /> + </SOURCES> + </library> + <library name="Maven: org.mockito:mockito-all:1.8.0"> + <CLASSES> + <root url="jar://$MAVEN_REPOSITORY$/org/mockito/mockito-all/1.8.0/mockito-all-1.8.0.jar!/" /> + </CLASSES> + <JAVADOC> + <root url="jar://$MAVEN_REPOSITORY$/org/mockito/mockito-all/1.8.0/mockito-all-1.8.0-javadoc.jar!/" /> + </JAVADOC> + <SOURCES> + <root url="jar://$MAVEN_REPOSITORY$/org/mockito/mockito-all/1.8.0/mockito-all-1.8.0-sources.jar!/" /> + </SOURCES> + </library> </component> <UsedPathMacros> <macro name="MAVEN_REPOSITORY" description="Maven Local Repostiry" /> akka.ipr @@ -5,11 +5,17 @@ </component> <component name="ChangeListManager" verified="true"> <list default="true" readonly="true" id="188c966f-a83c-4d3a-9128-54d5a2947a12" name="Default" comment=""> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/pom.xml" afterPath="$PROJECT_DIR$/pom.xml" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/akka-actors/src/main/scala/actor/Actor.scala" afterPath="$PROJECT_DIR$/akka-actors/src/main/scala/actor/Actor.scala" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/config/akka-reference.conf" afterPath="$PROJECT_DIR$/config/akka-reference.conf" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/config/akka.conf" afterPath="$PROJECT_DIR$/config/akka.conf" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/akka-persistence/src/main/scala/CassandraStorage.scala" afterPath="$PROJECT_DIR$/akka-persistence/src/main/scala/CassandraStorage.scala" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/akka.ipr" afterPath="$PROJECT_DIR$/akka.ipr" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/akka.iws" afterPath="$PROJECT_DIR$/akka.iws" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/akka-persistence/src/main/scala/CassandraSession.scala" afterPath="$PROJECT_DIR$/akka-persistence/src/main/scala/CassandraSession.scala" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/akka-persistence/src/main/scala/PersistentState.scala" afterPath="$PROJECT_DIR$/akka-persistence/src/main/scala/PersistentState.scala" /> </list> - <ignored path="akka.iws" /> <ignored path=".idea/workspace.xml" /> + <ignored path="akka.iws" /> <option name="TRACKING_ENABLED" value="true" /> <option name="SHOW_DIALOG" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" /> @@ -52,149 +58,6 @@ <option name="CONDITION" value="" /> <option name="LOG_MESSAGE" value="" /> </breakpoint> - <breakpoint url="file://$PROJECT_DIR$/akka-actors/src/test/scala/InMemoryActorSpec.scala" line="220" class="Class at InMemoryActorSpec.scala:220" package=""> - <option name="ENABLED" value="true" /> - <option name="LOG_ENABLED" value="false" /> - <option name="LOG_EXPRESSION_ENABLED" value="false" /> - <option name="SUSPEND_POLICY" value="SuspendAll" /> - <option name="COUNT_FILTER_ENABLED" value="false" /> - <option name="COUNT_FILTER" value="0" /> - <option name="CONDITION_ENABLED" value="false" /> - <option name="CLASS_FILTERS_ENABLED" value="false" /> - <option name="INSTANCE_FILTERS_ENABLED" value="false" /> - <option name="CONDITION" value="" /> - <option name="LOG_MESSAGE" value="" /> - </breakpoint> - <breakpoint url="file://$PROJECT_DIR$/akka-fun-test-java/src/test/java/se/scalablesolutions/akka/api/InMemoryStateTest.java" line="53" class="se.scalablesolutions.akka.api.InMemoryStateTest" package="se.scalablesolutions.akka.api"> - <option name="ENABLED" value="true" /> - <option name="LOG_ENABLED" value="false" /> - <option name="LOG_EXPRESSION_ENABLED" value="false" /> - <option name="SUSPEND_POLICY" value="SuspendAll" /> - <option name="COUNT_FILTER_ENABLED" value="false" /> - <option name="COUNT_FILTER" value="0" /> - <option name="CONDITION_ENABLED" value="false" /> - <option name="CLASS_FILTERS_ENABLED" value="false" /> - <option name="INSTANCE_FILTERS_ENABLED" value="false" /> - <option name="CONDITION" value="" /> - <option name="LOG_MESSAGE" value="" /> - </breakpoint> - <breakpoint url="file://$PROJECT_DIR$/akka-fun-test-java/src/test/java/se/scalablesolutions/akka/api/InMemoryStateTest.java" line="57" class="se.scalablesolutions.akka.api.InMemoryStateTest" package="se.scalablesolutions.akka.api"> - <option name="ENABLED" value="true" /> - <option name="LOG_ENABLED" value="false" /> - <option name="LOG_EXPRESSION_ENABLED" value="false" /> - <option name="SUSPEND_POLICY" value="SuspendAll" /> - <option name="COUNT_FILTER_ENABLED" value="false" /> - <option name="COUNT_FILTER" value="0" /> - <option name="CONDITION_ENABLED" value="false" /> - <option name="CLASS_FILTERS_ENABLED" value="false" /> - <option name="INSTANCE_FILTERS_ENABLED" value="false" /> - <option name="CONDITION" value="" /> - <option name="LOG_MESSAGE" value="" /> - </breakpoint> - <breakpoint url="file://$PROJECT_DIR$/akka-fun-test-java/src/test/java/se/scalablesolutions/akka/api/InMemFailer.java" line="4" class="se.scalablesolutions.akka.api.InMemFailer" package="se.scalablesolutions.akka.api"> - <option name="ENABLED" value="true" /> - <option name="LOG_ENABLED" value="false" /> - <option name="LOG_EXPRESSION_ENABLED" value="false" /> - <option name="SUSPEND_POLICY" value="SuspendAll" /> - <option name="COUNT_FILTER_ENABLED" value="false" /> - <option name="COUNT_FILTER" value="0" /> - <option name="CONDITION_ENABLED" value="false" /> - <option name="CLASS_FILTERS_ENABLED" value="false" /> - <option name="INSTANCE_FILTERS_ENABLED" value="false" /> - <option name="CONDITION" value="" /> - <option name="LOG_MESSAGE" value="" /> - </breakpoint> - <breakpoint url="file://$PROJECT_DIR$/akka-actors/src/main/scala/actor/Actor.scala" line="547" class="Class at Actor.scala:540" package=""> - <option name="ENABLED" value="true" /> - <option name="LOG_ENABLED" value="false" /> - <option name="LOG_EXPRESSION_ENABLED" value="false" /> - <option name="SUSPEND_POLICY" value="SuspendAll" /> - <option name="COUNT_FILTER_ENABLED" value="false" /> - <option name="COUNT_FILTER" value="0" /> - <option name="CONDITION_ENABLED" value="false" /> - <option name="CLASS_FILTERS_ENABLED" value="false" /> - <option name="INSTANCE_FILTERS_ENABLED" value="false" /> - <option name="CONDITION" value="" /> - <option name="LOG_MESSAGE" value="" /> - </breakpoint> - <breakpoint url="file://$PROJECT_DIR$/akka-actors/src/main/scala/dispatch/Future.scala" line="107" class="Class at Future.scala:107" package=""> - <option name="ENABLED" value="true" /> - <option name="LOG_ENABLED" value="false" /> - <option name="LOG_EXPRESSION_ENABLED" value="false" /> - <option name="SUSPEND_POLICY" value="SuspendAll" /> - <option name="COUNT_FILTER_ENABLED" value="false" /> - <option name="COUNT_FILTER" value="0" /> - <option name="CONDITION_ENABLED" value="false" /> - <option name="CLASS_FILTERS_ENABLED" value="false" /> - <option name="INSTANCE_FILTERS_ENABLED" value="false" /> - <option name="CONDITION" value="" /> - <option name="LOG_MESSAGE" value="" /> - </breakpoint> - <breakpoint url="file://$PROJECT_DIR$/akka-actors/src/main/scala/dispatch/Future.scala" line="96" class="Class at Future.scala:96" package=""> - <option name="ENABLED" value="true" /> - <option name="LOG_ENABLED" value="false" /> - <option name="LOG_EXPRESSION_ENABLED" value="false" /> - <option name="SUSPEND_POLICY" value="SuspendAll" /> - <option name="COUNT_FILTER_ENABLED" value="false" /> - <option name="COUNT_FILTER" value="0" /> - <option name="CONDITION_ENABLED" value="false" /> - <option name="CLASS_FILTERS_ENABLED" value="false" /> - <option name="INSTANCE_FILTERS_ENABLED" value="false" /> - <option name="CONDITION" value="" /> - <option name="LOG_MESSAGE" value="" /> - </breakpoint> - <breakpoint url="file://$PROJECT_DIR$/akka-actors/src/main/scala/dispatch/Future.scala" line="42" class="Class at Future.scala:42" package=""> - <option name="ENABLED" value="true" /> - <option name="LOG_ENABLED" value="false" /> - <option name="LOG_EXPRESSION_ENABLED" value="false" /> - <option name="SUSPEND_POLICY" value="SuspendAll" /> - <option name="COUNT_FILTER_ENABLED" value="false" /> - <option name="COUNT_FILTER" value="0" /> - <option name="CONDITION_ENABLED" value="false" /> - <option name="CLASS_FILTERS_ENABLED" value="false" /> - <option name="INSTANCE_FILTERS_ENABLED" value="false" /> - <option name="CONDITION" value="" /> - <option name="LOG_MESSAGE" value="" /> - </breakpoint> - <breakpoint url="file://$PROJECT_DIR$/akka-actors/src/main/scala/actor/Actor.scala" line="554" class="Class at Actor.scala:547" package=""> - <option name="ENABLED" value="true" /> - <option name="LOG_ENABLED" value="false" /> - <option name="LOG_EXPRESSION_ENABLED" value="false" /> - <option name="SUSPEND_POLICY" value="SuspendAll" /> - <option name="COUNT_FILTER_ENABLED" value="false" /> - <option name="COUNT_FILTER" value="0" /> - <option name="CONDITION_ENABLED" value="false" /> - <option name="CLASS_FILTERS_ENABLED" value="false" /> - <option name="INSTANCE_FILTERS_ENABLED" value="false" /> - <option name="CONDITION" value="" /> - <option name="LOG_MESSAGE" value="" /> - </breakpoint> - <breakpoint url="file://$PROJECT_DIR$/akka-actors/src/main/scala/stm/Transaction.scala" line="63" class="Class at Transaction.scala:63" package=""> - <option name="ENABLED" value="true" /> - <option name="LOG_ENABLED" value="false" /> - <option name="LOG_EXPRESSION_ENABLED" value="false" /> - <option name="SUSPEND_POLICY" value="SuspendAll" /> - <option name="COUNT_FILTER_ENABLED" value="false" /> - <option name="COUNT_FILTER" value="0" /> - <option name="CONDITION_ENABLED" value="false" /> - <option name="CLASS_FILTERS_ENABLED" value="false" /> - <option name="INSTANCE_FILTERS_ENABLED" value="false" /> - <option name="CONDITION" value="" /> - <option name="LOG_MESSAGE" value="" /> - </breakpoint> - <breakpoint url="file://$PROJECT_DIR$/akka-actors/src/main/scala/stm/Transaction.scala" line="68" class="Class at Transaction.scala:68" package=""> - <option name="ENABLED" value="true" /> - <option name="LOG_ENABLED" value="false" /> - <option name="LOG_EXPRESSION_ENABLED" value="false" /> - <option name="SUSPEND_POLICY" value="SuspendAll" /> - <option name="COUNT_FILTER_ENABLED" value="false" /> - <option name="COUNT_FILTER" value="0" /> - <option name="CONDITION_ENABLED" value="false" /> - <option name="CLASS_FILTERS_ENABLED" value="false" /> - <option name="INSTANCE_FILTERS_ENABLED" value="false" /> - <option name="CONDITION" value="" /> - <option name="LOG_MESSAGE" value="" /> - </breakpoint> </line_breakpoints> <breakpoint_any> <breakpoint> @@ -237,64 +100,64 @@ <component name="FileColors" enabled="false" enabledForTabs="false" /> <component name="FileEditorManager"> <leaf> - <file leaf-file-name="AMQP.scala" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/akka-amqp/src/main/scala/AMQP.scala"> + <file leaf-file-name="akka-reference.conf" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/config/akka-reference.conf"> <provider selected="true" editor-type-id="text-editor"> - <state line="394" column="0" selection-start="14155" selection-end="14155" vertical-scroll-proportion="0.0"> + <state line="45" column="67" selection-start="1639" selection-end="1639" vertical-scroll-proportion="0.0"> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="pom.xml" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/akka-samples-lift/pom.xml"> + <file leaf-file-name="state.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/akka-util-java/src/main/java/se/scalablesolutions/akka/annotation/state.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0"> + <state line="10" column="18" selection-start="211" selection-end="211" vertical-scroll-proportion="0.0"> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="pom.xml" pinned="false" current="true" current-in-tab="true"> - <entry file="file://$PROJECT_DIR$/pom.xml"> + <file leaf-file-name="PersistentState.scala" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/akka-persistence/src/main/scala/PersistentState.scala"> <provider selected="true" editor-type-id="text-editor"> - <state line="195" column="0" selection-start="5602" selection-end="6048" vertical-scroll-proportion="0.37412095"> + <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0"> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="pom.xml" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/akka-actors/pom.xml"> + <file leaf-file-name="TransactionalState.scala" pinned="false" current="true" current-in-tab="true"> + <entry file="file://$PROJECT_DIR$/akka-actors/src/main/scala/stm/TransactionalState.scala"> <provider selected="true" editor-type-id="text-editor"> - <state line="60" column="0" selection-start="1852" selection-end="1852" vertical-scroll-proportion="0.0"> + <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="-0.071969695"> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="multiverse-properties-reference.txt" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/config/multiverse-properties-reference.txt"> + <file leaf-file-name="CassandraStorage.scala" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/akka-persistence/src/main/scala/CassandraStorage.scala"> <provider selected="true" editor-type-id="text-editor"> - <state line="37" column="30" selection-start="1630" selection-end="1688" vertical-scroll-proportion="0.0"> + <state line="28" column="6" selection-start="787" selection-end="787" vertical-scroll-proportion="0.0"> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="Config.scala" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/akka-util/src/main/scala/Config.scala"> + <file leaf-file-name="CassandraSession.scala" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/akka-persistence/src/main/scala/CassandraSession.scala"> <provider selected="true" editor-type-id="text-editor"> - <state line="21" column="30" selection-start="557" selection-end="557" vertical-scroll-proportion="0.0"> + <state line="61" column="79" selection-start="2219" selection-end="2249" vertical-scroll-proportion="0.0"> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="Actor.scala" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/akka-actors/src/main/scala/actor/Actor.scala"> + <file leaf-file-name="akka.conf" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/config/akka.conf"> <provider selected="true" editor-type-id="text-editor"> - <state line="58" column="6" selection-start="2171" selection-end="2171" vertical-scroll-proportion="0.0"> + <state line="5" column="82" selection-start="255" selection-end="255" vertical-scroll-proportion="0.0"> <folding /> </state> </provider> @@ -315,15 +178,9 @@ <component name="IdeDocumentHistory"> <option name="changedFiles"> <list> - <option value="$PROJECT_DIR$/akka-fun-test-java/src/test/java/se/scalablesolutions/akka/api/InMemNestedStateTest.java" /> - <option value="$PROJECT_DIR$/akka-fun-test-java/src/test/java/se/scalablesolutions/akka/api/InMemoryStateTest.java" /> - <option value="$PROJECT_DIR$/akka-fun-test-java/src/test/java/se/scalablesolutions/akka/api/InMemStateful.java" /> - <option value="$PROJECT_DIR$/akka-fun-test-java/src/test/java/se/scalablesolutions/akka/api/RemoteInMemoryStateTest.java" /> <option value="$PROJECT_DIR$/akka-actors/src/main/scala/stm/Transaction.scala" /> - <option value="$PROJECT_DIR$/akka-actors/src/main/scala/actor/Actor.scala" /> <option value="$PROJECT_DIR$/akka-actors/src/test/scala/InMemoryActorSpec.scala" /> <option value="$PROJECT_DIR$/akka-actors/src/main/scala/stm/TransactionalState.scala" /> - <option value="$PROJECT_DIR$/config/akka-reference.conf" /> <option value="$PROJECT_DIR$/akka-actors/src/main/scala/nio/RemoteServer.scala" /> <option value="$PROJECT_DIR$/akka-actors/src/main/scala/nio/RemoteClient.scala" /> <option value="$PROJECT_DIR$/akka-amqp/src/main/scala/AMQP.scala" /> @@ -331,6 +188,12 @@ <option value="$PROJECT_DIR$/config/multiverse-properties-reference.txt" /> <option value="$PROJECT_DIR$/akka-util/src/main/scala/Config.scala" /> <option value="$PROJECT_DIR$/pom.xml" /> + <option value="$PROJECT_DIR$/akka-actors/src/main/scala/actor/Actor.scala" /> + <option value="$PROJECT_DIR$/config/akka.conf" /> + <option value="$PROJECT_DIR$/config/akka-reference.conf" /> + <option value="$PROJECT_DIR$/akka-persistence/src/main/scala/CassandraStorage.scala" /> + <option value="$PROJECT_DIR$/akka-persistence/src/main/scala/CassandraSession.scala" /> + <option value="$PROJECT_DIR$/akka-persistence/src/main/scala/PersistentState.scala" /> </list> </option> </component> @@ -386,43 +249,23 @@ <sortByType /> </navigator> <panes> - <pane id="Scope"> - <subPane subId="Problems"> + <pane id="ProjectPane"> + <subPane> <PATH> - <PATH_ELEMENT USER_OBJECT="Root"> - <option name="myItemId" value="" /> - <option name="myItemType" value="" /> - </PATH_ELEMENT> - <PATH_ELEMENT USER_OBJECT="akka-fun-test-java"> - <option name="myItemId" value="" /> - <option name="myItemType" value="" /> - </PATH_ELEMENT> - <PATH_ELEMENT USER_OBJECT="akka-fun-test-java"> - <option name="myItemId" value="" /> - <option name="myItemType" value="" /> - </PATH_ELEMENT> - <PATH_ELEMENT USER_OBJECT="src/test/java"> - <option name="myItemId" value="" /> - <option name="myItemType" value="" /> - </PATH_ELEMENT> - <PATH_ELEMENT USER_OBJECT="se/scalablesolutions/akka/api"> - <option name="myItemId" value="" /> - <option name="myItemType" value="" /> + <PATH_ELEMENT> + <option name="myItemId" value="akka" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> </PATH> - </subPane> - </pane> - <pane id="PackagesPane"> - <subPane /> - </pane> - <pane id="Favorites" /> - <pane id="ProjectPane"> - <subPane> <PATH> <PATH_ELEMENT> <option name="myItemId" value="akka" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="akka" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> @@ -433,6 +276,10 @@ <option name="myItemId" value="akka" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="docs" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> @@ -482,22 +329,52 @@ </PATH> </subPane> </pane> + <pane id="Favorites" /> + <pane id="Scope"> + <subPane subId="Problems"> + <PATH> + <PATH_ELEMENT USER_OBJECT="Root"> + <option name="myItemId" value="" /> + <option name="myItemType" value="" /> + </PATH_ELEMENT> + <PATH_ELEMENT USER_OBJECT="akka-fun-test-java"> + <option name="myItemId" value="" /> + <option name="myItemType" value="" /> + </PATH_ELEMENT> + <PATH_ELEMENT USER_OBJECT="akka-fun-test-java"> + <option name="myItemId" value="" /> + <option name="myItemType" value="" /> + </PATH_ELEMENT> + <PATH_ELEMENT USER_OBJECT="src/test/java"> + <option name="myItemId" value="" /> + <option name="myItemType" value="" /> + </PATH_ELEMENT> + <PATH_ELEMENT USER_OBJECT="se/scalablesolutions/akka/api"> + <option name="myItemId" value="" /> + <option name="myItemType" value="" /> + </PATH_ELEMENT> + </PATH> + </subPane> + </pane> + <pane id="PackagesPane"> + <subPane /> + </pane> </panes> </component> <component name="PropertiesComponent"> - <property name="project.structure.proportion" value="0.15" /> <property name="GoToClass.includeJavaFiles" value="false" /> + <property name="project.structure.proportion" value="0.15" /> <property name="MemberChooser.copyJavadoc" value="false" /> <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder2" value="2" /> - <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder2" value="2" /> <property name="options.splitter.main.proportions" value="0.3" /> + <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder2" value="2" /> <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth3" value="924" /> <property name="GoToFile.includeJavaFiles" value="false" /> <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth0" value="113" /> <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth2" value="130" /> - <property name="options.splitter.details.proportions" value="0.2" /> - <property name="GoToClass.includeLibraries" value="false" /> <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth2" value="133" /> + <property name="GoToClass.includeLibraries" value="false" /> + <property name="options.splitter.details.proportions" value="0.2" /> <property name="MemberChooser.showClasses" value="true" /> <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder0" value="0" /> <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder3" value="3" /> @@ -509,13 +386,13 @@ <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder0" value="0" /> <property name="RunManagerConfig.showSettingsBeforeRunnig" value="false" /> <property name="project.structure.last.edited" value="Facets" /> - <property name="options.searchVisible" value="true" /> <property name="MemberChooser.sorted" value="false" /> + <property name="options.searchVisible" value="true" /> <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder1" value="1" /> <property name="recentsLimit" value="5" /> <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth1" value="162" /> - <property name="dynamic.classpath" value="false" /> <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth3" value="928" /> + <property name="dynamic.classpath" value="false" /> <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth1" value="166" /> <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder1" value="1" /> </component> @@ -671,6 +548,14 @@ <option name="Maven.BeforeRunTask" enabled="false" /> </method> </configuration> + <configuration default="true" type="FlexUnitRunConfigurationType" factoryName="FlexUnit" air_descriptor_path="" air_program_params="" air_publisher_id="" air_root_dir_path="" class_name="" html_or_swf_file_path="" main_class_name="" method_name="" module_name="" output_log_level="" package_name="" port="0" run_mode="HtmlOrSwfFile" scope="Class" socket_policy_port="0" url_to_launch="http://"> + <method> + <option name="AntTarget" enabled="false" /> + <option name="BuildArtifacts" enabled="false" /> + <option name="Make" enabled="true" /> + <option name="Maven.BeforeRunTask" enabled="false" /> + </method> + </configuration> <configuration default="true" type="TestNG" factoryName="TestNG" enabled="false" merge="false" runner="emma"> <module name="" /> <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> @@ -702,14 +587,6 @@ <option name="Maven.BeforeRunTask" enabled="false" /> </method> </configuration> - <configuration default="true" type="FlexUnitRunConfigurationType" factoryName="FlexUnit" air_descriptor_path="" air_program_params="" air_publisher_id="" air_root_dir_path="" class_name="" html_or_swf_file_path="" main_class_name="" method_name="" module_name="" output_log_level="" package_name="" port="0" run_mode="HtmlOrSwfFile" scope="Class" socket_policy_port="0" url_to_launch="http://"> - <method> - <option name="AntTarget" enabled="false" /> - <option name="BuildArtifacts" enabled="false" /> - <option name="Make" enabled="true" /> - <option name="Maven.BeforeRunTask" enabled="false" /> - </method> - </configuration> <configuration default="true" type="JUnit" factoryName="JUnit" enabled="false" merge="false" runner="emma"> <module name="" /> <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> @@ -926,11 +803,11 @@ <list size="7"> <item index="0" class="java.lang.String" itemvalue="JUnit.InMemNestedStateTest.testMapShouldNotRollbackStateForStatefulServerInCaseOfSuccess" /> <item index="1" class="java.lang.String" itemvalue="JUnit.InMemNestedStateTest.testRefShouldNotRollbackStateForStatefulServerInCaseOfSuccess" /> - <item index="2" class="java.lang.String" itemvalue="JUnit.RemoteInMemoryStateTest" /> - <item index="3" class="java.lang.String" itemvalue="JUnit.InMemoryActorSpec" /> - <item index="4" class="java.lang.String" itemvalue="JUnit.InMemoryStateTest" /> - <item index="5" class="java.lang.String" itemvalue="JUnit.InMemNestedStateTest" /> - <item index="6" class="java.lang.String" itemvalue="JUnit.InMemoryStateTest.testMapShouldRollbackStateForStatefulServerInCaseOfFailure" /> + <item index="2" class="java.lang.String" itemvalue="JUnit.InMemoryStateTest.testMapShouldRollbackStateForStatefulServerInCaseOfFailure" /> + <item index="3" class="java.lang.String" itemvalue="JUnit.RemoteInMemoryStateTest" /> + <item index="4" class="java.lang.String" itemvalue="JUnit.InMemoryActorSpec" /> + <item index="5" class="java.lang.String" itemvalue="JUnit.InMemoryStateTest" /> + <item index="6" class="java.lang.String" itemvalue="JUnit.InMemNestedStateTest" /> </list> <configuration name="&lt;template&gt;" type="WebApp" default="true" selected="false"> <Host>localhost</Host> @@ -971,14 +848,14 @@ </option> </component> <component name="ToolWindowManager"> - <frame x="4" y="22" width="1436" height="878" extended-state="6" /> + <frame x="4" y="22" width="1916" height="1178" extended-state="6" /> <editor active="true" /> <layout> <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" /> <window_info id="IDEtalk" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="5" side_tool="false" /> <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="true" /> <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" /> - <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.25613275" sideWeight="0.6989796" order="0" side_tool="false" /> + <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.2561629" sideWeight="0.6989796" order="0" side_tool="false" /> <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="true" /> <window_info id="Dependency Viewer" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" /> <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="4" side_tool="false" /> @@ -1030,114 +907,106 @@ <option name="FILTER_TARGETS" value="false" /> </component> <component name="editorHistoryManager"> - <entry file="file://$PROJECT_DIR$/akka-actors/src/main/scala/actor/ActiveObject.scala"> + <entry file="file://$PROJECT_DIR$/config/jndi.properties"> <provider selected="true" editor-type-id="text-editor"> - <state line="153" column="45" selection-start="6851" selection-end="6868" vertical-scroll-proportion="0.0"> - <folding /> - </state> + <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" /> </provider> </entry> - <entry file="file://$PROJECT_DIR$/akka-actors/src/main/scala/nio/RemoteServer.scala"> + <entry file="file://$PROJECT_DIR$/akka-amqp/src/main/scala/AMQP.scala"> <provider selected="true" editor-type-id="text-editor"> - <state line="27" column="68" selection-start="1102" selection-end="1102" vertical-scroll-proportion="0.0"> + <state line="394" column="0" selection-start="14757" selection-end="14757" vertical-scroll-proportion="0.0"> <folding /> </state> </provider> </entry> - <entry file="jar://$MAVEN_REPOSITORY$/com/rabbitmq/rabbitmq-client/0.9.1/rabbitmq-client-0.9.1.jar!/com/rabbitmq/client/AMQP.class"> + <entry file="file://$PROJECT_DIR$/akka-samples-lift/pom.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0"> - <folding /> - </state> + <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" /> </provider> </entry> - <entry file="file://$PROJECT_DIR$/akka-actors/src/main/scala/nio/RemoteClient.scala"> + <entry file="file://$PROJECT_DIR$/akka-actors/pom.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="215" column="30" selection-start="9306" selection-end="9306" vertical-scroll-proportion="0.84210527"> - <folding /> - </state> + <state line="60" column="0" selection-start="1852" selection-end="1852" vertical-scroll-proportion="0.0" /> </provider> </entry> - <entry file="file://$PROJECT_DIR$/akka-actors/src/main/scala/actor/Actor.scala"> + <entry file="file://$PROJECT_DIR$/config/multiverse-properties-reference.txt"> <provider selected="true" editor-type-id="text-editor"> - <state line="58" column="6" selection-start="2171" selection-end="2171" vertical-scroll-proportion="0.0"> - <folding /> - </state> + <state line="37" column="30" selection-start="1630" selection-end="1688" vertical-scroll-proportion="0.0" /> </provider> </entry> - <entry file="file://$PROJECT_DIR$/config/storage-conf.xml"> + <entry file="file://$PROJECT_DIR$/akka-util/src/main/scala/Config.scala"> <provider selected="true" editor-type-id="text-editor"> - <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0"> + <state line="21" column="30" selection-start="578" selection-end="578" vertical-scroll-proportion="0.0"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/config/log4j.properties"> + <entry file="file://$PROJECT_DIR$/pom.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0"> + <state line="195" column="0" selection-start="5602" selection-end="6048" vertical-scroll-proportion="0.0"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/config/jndi.properties"> + <entry file="file://$PROJECT_DIR$/akka-actors/src/main/scala/actor/Actor.scala"> <provider selected="true" editor-type-id="text-editor"> - <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0"> + <state line="37" column="0" selection-start="1569" selection-end="1569" vertical-scroll-proportion="0.25552353"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/config/akka-reference.conf"> + <entry file="file://$PROJECT_DIR$/config/akka.conf"> <provider selected="true" editor-type-id="text-editor"> - <state line="40" column="50" selection-start="1477" selection-end="1477" vertical-scroll-proportion="0.0"> + <state line="5" column="82" selection-start="255" selection-end="255" vertical-scroll-proportion="0.0"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/config/akka.conf"> + <entry file="jar://$MAVEN_REPOSITORY$/org/apache/cassandra/cassandra/0.4.1/cassandra-0.4.1.jar!/org/apache/cassandra/service/Cassandra.class"> <provider selected="true" editor-type-id="text-editor"> <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/akka-amqp/src/main/scala/AMQP.scala"> + <entry file="file://$PROJECT_DIR$/akka-persistence/src/main/scala/CassandraStorage.scala"> <provider selected="true" editor-type-id="text-editor"> - <state line="394" column="0" selection-start="14155" selection-end="14155" vertical-scroll-proportion="0.0"> + <state line="28" column="6" selection-start="787" selection-end="787" vertical-scroll-proportion="0.0"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/akka-samples-lift/pom.xml"> + <entry file="file://$PROJECT_DIR$/akka-persistence/src/main/scala/CassandraSession.scala"> <provider selected="true" editor-type-id="text-editor"> - <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0"> + <state line="61" column="79" selection-start="2219" selection-end="2249" vertical-scroll-proportion="0.0"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/akka-util/src/main/scala/Config.scala"> + <entry file="file://$PROJECT_DIR$/config/akka-reference.conf"> <provider selected="true" editor-type-id="text-editor"> - <state line="21" column="30" selection-start="557" selection-end="557" vertical-scroll-proportion="0.0"> + <state line="45" column="67" selection-start="1639" selection-end="1639" vertical-scroll-proportion="0.0"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/config/multiverse-properties-reference.txt"> + <entry file="file://$PROJECT_DIR$/akka-util-java/src/main/java/se/scalablesolutions/akka/annotation/state.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="37" column="30" selection-start="1630" selection-end="1688" vertical-scroll-proportion="0.0"> + <state line="10" column="18" selection-start="211" selection-end="211" vertical-scroll-proportion="0.0"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/akka-actors/pom.xml"> + <entry file="file://$PROJECT_DIR$/akka-persistence/src/main/scala/PersistentState.scala"> <provider selected="true" editor-type-id="text-editor"> - <state line="60" column="0" selection-start="1852" selection-end="1852" vertical-scroll-proportion="0.0"> + <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/pom.xml"> + <entry file="file://$PROJECT_DIR$/akka-actors/src/main/scala/stm/TransactionalState.scala"> <provider selected="true" editor-type-id="text-editor"> - <state line="195" column="0" selection-start="5602" selection-end="6048" vertical-scroll-proportion="0.37412095"> + <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="-0.071969695"> <folding /> </state> </provider> akka.iws @@ -62,7 +62,7 @@ hostname = "127.0.0.1" # IP address or hostname of one of the Cassandra cluster's seeds port = 9160 storage-format = "scala-json" # Options: java, scala-json, java-json, protobuf - consistency-level = 1 + consistency-level = "QUORUM" # Options: ZERO, ONE, QUORUM, ALL </cassandra> <mongodb> hostname = "127.0.0.1" # IP address or hostname of the MongoDB DB instance config/akka-reference.conf @@ -1,4 +1,6 @@ + +# This config import the Akka reference configuration. include "akka-reference.conf" -# This config import the Akka reference configuration. # In this file you can override any option defined in the 'akka-reference.conf' file. +# Copy in all or parts of the 'akka-reference.conf' file and modify as you please. config/akka.conf 75b1d3760cc6e44a4b2f515b61954ab50d03b3c0 jboner jboner@darkstar.lan http://github.com/jboner/akka/commit/14fa1ac17fc6b6fa32470ce33a1eb20f636edc0b 14fa1ac17fc6b6fa32470ce33a1eb20f636edc0b 2009-10-30T13:45:39-07:00 2009-10-30T13:45:39-07:00 Changed the Cassandra consistency level semantics to fit with new 0.4 nomenclature e545c7d9a8507c44d1ae6f57f9ac929193179b44 jboner jboner@darkstar.lan