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

initial draft of transactional actors

Browse source
This commit is contained in:
Jonas Boner 2009-03-23 19:17:49 +01:00
parent a8700ddc93
commit 9d4b4ef5de
18 changed files with 127 additions and 368 deletions
Download patch file Download diff file Expand all files Collapse all files

123
api-java/src/main/java/com/scalablesolutions/akka/api/ActiveObjectGuiceConfigurator.java
View file

@ -1,123 +0,0 @@
/**
* Copyright (C) 2009 Scalable Solutions.
*/
package com.scalablesolutions.akka.api;
import com.scalablesolutions.akka.kernel.configuration.*;
import com.google.inject.*;
import com.google.inject.jsr250.ResourceProviderFactory;
import com.scalablesolutions.akka.kernel.ActiveObjectFactory;
import com.scalablesolutions.akka.kernel.ActiveObjectProxy;
import java.util.List;
import java.util.ArrayList;
import java.util.Map;
import java.util.HashMap;
import com.scalablesolutions.akka.supervisor.Supervisor;
import com.scalablesolutions.akka.supervisor.Worker;
/**
* @author <a href="http://jonasboner.com">Jonas Bon&#233;r</a>
*/
public class ActiveObjectGuiceConfigurator {
private List<Module> modules = new ArrayList<Module>();
private Injector injector;
private Supervisor supervisor;
private RestartStrategy restartStrategy;
private Component[] components;
private Map<Class, Component> configRegistry = new HashMap<Class, Component>();
private Map<Class, ActiveObjectProxy> activeObjectRegistry = new HashMap<Class, ActiveObjectProxy>();
private ActiveObjectFactory activeObjectFactory = new ActiveObjectFactory();
public synchronized <T> T getExternalDependency(Class<T> clazz) {
return injector.getInstance(clazz);
}
/**
* Returns the active abject that has been put under supervision for the class specified.
*
* @param clazz the class for the active object
* @return the active object for the class
*/
public synchronized <T> T getActiveObject(Class<T> clazz) {
if (injector == null) throw new IllegalStateException("inject() and supervise() must be called before invoking newInstance(clazz)");
if (activeObjectRegistry.containsKey(clazz)) {
final ActiveObjectProxy activeObjectProxy = activeObjectRegistry.get(clazz);
activeObjectProxy.setTargetInstance(injector.getInstance(clazz));
return (T)activeObjectFactory.newInstance(clazz, activeObjectProxy);
} else throw new IllegalStateException("Class " + clazz.getName() + " has not been put under supervision (by passing in the config to the supervise() method");
}
public synchronized ActiveObjectGuiceConfigurator configureActiveObjects(final RestartStrategy restartStrategy, final Component[] components) {
this.restartStrategy = restartStrategy;
this.components = components;
modules.add(new AbstractModule() {
protected void configure() {
bind(ResourceProviderFactory.class);
for (int i = 0; i < components.length; i++) {
Component c = components[i];
bind((Class) c.intf()).to((Class) c.target()).in(Singleton.class);
}
}
});
return this;
}
public synchronized ActiveObjectGuiceConfigurator inject() {
if (injector != null) throw new IllegalStateException("inject() has already been called on this configurator");
injector = Guice.createInjector(modules);
return this;
}
public synchronized ActiveObjectGuiceConfigurator supervise() {
if (injector == null) inject();
injector = Guice.createInjector(modules);
List<Worker> workers = new ArrayList<Worker>();
for (int i = 0; i < components.length; i++) {
final Component c = components[i];
final ActiveObjectProxy activeObjectProxy = new ActiveObjectProxy(c.intf(), c.target(), c.timeout());
workers.add(c.newWorker(activeObjectProxy));
activeObjectRegistry.put(c.intf(), activeObjectProxy);
}
supervisor = activeObjectFactory.supervise(restartStrategy.transform(), workers);
return this;
}
/**
* Add additional services to be wired in.
* <pre>
* ActiveObjectGuiceConfigurator.addExternalGuiceModule(new AbstractModule {
* protected void configure() {
* bind(Foo.class).to(FooImpl.class).in(Scopes.SINGLETON);
* bind(BarImpl.class);
* link(Bar.class).to(BarImpl.class);
* bindConstant(named("port")).to(8080);
* }})
* </pre>
*/
public synchronized ActiveObjectGuiceConfigurator addExternalGuiceModule(Module module) {
modules.add(module);
return this;
}
public List<Module> getGuiceModules() {
return modules;
}
public synchronized void reset() {
modules = new ArrayList<Module>();
configRegistry = new HashMap<Class, Component>();
activeObjectRegistry = new HashMap<Class, ActiveObjectProxy>();
injector = null;
restartStrategy = null;
}
public synchronized void stop() {
// TODO: fix supervisor.stop();
}
}

169
api-java/src/test/java/com/scalablesolutions/akka/api/ActiveObjectGuiceConfiguratorTest.java
View file

@ -1,169 +0,0 @@
/**
* Copyright (C) 2009 Scalable Solutions.
*/
package com.scalablesolutions.akka.api;
import com.scalablesolutions.akka.annotation.oneway;
import com.scalablesolutions.akka.kernel.configuration.*;
import com.google.inject.Inject;
import com.google.inject.AbstractModule;
import com.google.inject.Scopes;
import junit.framework.TestCase;
public class ActiveObjectGuiceConfiguratorTest extends TestCase {
static String messageLog = "";
final private ActiveObjectGuiceConfigurator conf = new ActiveObjectGuiceConfigurator();
protected void setUp() {
conf.addExternalGuiceModule(new AbstractModule() {
protected void configure() {
bind(Ext.class).to(ExtImpl.class).in(Scopes.SINGLETON);
}
}).configureActiveObjects(
new RestartStrategy(new AllForOne(), 3, 100), new Component[]{
new Component(
Foo.class,
FooImpl.class,
new LifeCycle(new Permanent(), 100),
1000),
new Component(
Bar.class,
BarImpl.class,
new LifeCycle(new Permanent(), 100),
1000)
}).inject().supervise();
}
public void testGuiceActiveObjectInjection() {
messageLog = "";
Foo foo = conf.getActiveObject(Foo.class);
Bar bar = conf.getActiveObject(Bar.class);
assertTrue(foo.getBar().toString().equals(bar.toString()));
}
public void testGuiceExternalDependencyInjection() {
messageLog = "";
Bar bar = conf.getActiveObject(Bar.class);
Ext ext = conf.getExternalDependency(Ext.class);
assertTrue(bar.getExt().toString().equals(ext.toString()));
}
public void testActiveObjectInvocation() throws InterruptedException {
messageLog = "";
Foo foo = conf.getActiveObject(Foo.class);
messageLog += foo.foo("foo ");
foo.bar("bar ");
messageLog += "before_bar ";
Thread.sleep(500);
assertEquals("foo return_foo before_bar ", messageLog);
}
public void testActiveObjectInvocationsInvocation() throws InterruptedException {
messageLog = "";
Foo foo = conf.getActiveObject(Foo.class);
Bar bar = conf.getActiveObject(Bar.class);
messageLog += foo.foo("foo ");
foo.bar("bar ");
messageLog += "before_bar ";
Thread.sleep(500);
assertEquals("foo return_foo before_bar ", messageLog);
}
public void testForcedTimeout() {
messageLog = "";
Foo foo = conf.getActiveObject(Foo.class);
try {
foo.longRunning();
fail("exception should have been thrown");
} catch (com.scalablesolutions.akka.kernel.ActiveObjectInvocationTimeoutException e) {
}
}
public void testForcedException() {
messageLog = "";
Foo foo = conf.getActiveObject(Foo.class);
try {
foo.throwsException();
fail("exception should have been thrown");
} catch (RuntimeException e) {
}
}
}
// ============== TEST SERVICES ===============
interface Foo {
public String foo(String msg);
@oneway
public void bar(String msg);
public void longRunning();
public void throwsException();
public Bar getBar();
}
class FooImpl implements Foo {
@Inject
private Bar bar;
public Bar getBar() {
return bar;
}
public String foo(String msg) {
return msg + "return_foo ";
}
public void bar(String msg) {
bar.bar(msg);
}
public void longRunning() {
try {
Thread.sleep(10000);
} catch (InterruptedException e) {
}
}
public void throwsException() {
throw new RuntimeException("expected");
}
}
interface Bar {
@oneway
void bar(String msg);
Ext getExt();
}
class BarImpl implements Bar {
@Inject
private Ext ext;
public Ext getExt() {
return ext;
}
public void bar(String msg) {
}
}
interface Ext {
void ext();
}
class ExtImpl implements Ext {
public void ext() {
}
}

6
buildfile
View file

@ -12,7 +12,7 @@ repositories.remote << 'http://scala-tools.org/repo-snapshots'
repositories.remote << 'http://www.lag.net/repo' repositories.remote << 'http://www.lag.net/repo'
AKKA_KERNEL = 'se.scalablesolutions.akka:akka-kernel:jar:0.1' AKKA_KERNEL = 'se.scalablesolutions.akka:akka-kernel:jar:0.1'
AKKA_SUPERVISOR = 'se.scalablesolutions.akka:akka-supervisor:jar:0.1' #AKKA_SUPERVISOR = 'se.scalablesolutions.akka:akka-supervisor:jar:0.1'
AKKA_UTIL_JAVA = 'se.scalablesolutions.akka:akka-util-java:jar:0.1' AKKA_UTIL_JAVA = 'se.scalablesolutions.akka:akka-util-java:jar:0.1'
AKKA_API_JAVA = 'se.scalablesolutions.akka:akka-api-java:jar:0.1' AKKA_API_JAVA = 'se.scalablesolutions.akka:akka-api-java:jar:0.1'
@ -60,7 +60,7 @@ define 'akka' do
desc 'Akka Actor kernel core implementation' desc 'Akka Actor kernel core implementation'
define 'kernel' do define 'kernel' do
compile.with(AKKA_SUPERVISOR, AKKA_UTIL_JAVA, GUICEYFRUIT, MINA_CORE, MINA_SCALA, JERSEY, VOLDEMORT, ZOOKEEPER, SLF4J, GRIZZLY, CONFIGGY, JUNIT4) compile.with(AKKA_UTIL_JAVA, GUICEYFRUIT, MINA_CORE, MINA_SCALA, JERSEY, VOLDEMORT, ZOOKEEPER, SLF4J, GRIZZLY, CONFIGGY, JUNIT4)
test.using :specs test.using :specs
package :jar package :jar
end end
@ -74,7 +74,7 @@ define 'akka' do
#desc 'Akka Java API' #desc 'Akka Java API'
#define 'api-java' do #define 'api-java' do
# compile.with(AKKA_KERNEL, AKKA_SUPERVISOR, AKKA_UTIL_JAVA, GUICEYFRUIT, JUNIT4) # compile.with(AKKA_KERNEL, AKKA_UTIL_JAVA, GUICEYFRUIT, JUNIT4)
# package :jar # package :jar
#end #end

71
kernel/src/main/scala/ActiveObject.scala
View file

@ -2,7 +2,7 @@
* Copyright (C) 2009 Scalable Solutions. * Copyright (C) 2009 Scalable Solutions.
*/ */
package com.scalablesolutions.akka.kernel package se.scalablesolutions.akka.kernel
import java.util.{List => JList, ArrayList} import java.util.{List => JList, ArrayList}
@ -29,6 +29,12 @@ class ActiveObjectFactory {
* @author <a href="http://jonasboner.com">Jonas Bon&#233;r</a> * @author <a href="http://jonasboner.com">Jonas Bon&#233;r</a>
*/ */
object ActiveObject { object ActiveObject {
private[kernel] val threadBoundTx: ThreadLocal[Option[Transaction]] = {
val tl = new ThreadLocal[Option[Transaction]]
tl.set(None)
tl
}
def newInstance[T](intf: Class[_], proxy: ActiveObjectProxy): T = { def newInstance[T](intf: Class[_], proxy: ActiveObjectProxy): T = {
Proxy.newProxyInstance( Proxy.newProxyInstance(
intf.getClassLoader, intf.getClassLoader,
@ -48,7 +54,7 @@ object ActiveObject {
override def getSupervisorConfig = SupervisorConfig(restartStrategy, components) override def getSupervisorConfig = SupervisorConfig(restartStrategy, components)
} }
val supervisor = factory.newSupervisor val supervisor = factory.newSupervisor
supervisor ! com.scalablesolutions.akka.kernel.Start supervisor ! se.scalablesolutions.akka.kernel.Start
supervisor supervisor
} }
@ -65,46 +71,72 @@ object ActiveObject {
* @author <a href="http://jonasboner.com">Jonas Bon&#233;r</a> * @author <a href="http://jonasboner.com">Jonas Bon&#233;r</a>
*/ */
class ActiveObjectProxy(val intf: Class[_], val target: Class[_], val timeout: Int) extends InvocationHandler { class ActiveObjectProxy(val intf: Class[_], val target: Class[_], val timeout: Int) extends InvocationHandler {
private val oneway = classOf[com.scalablesolutions.akka.annotation.oneway] val oneway = classOf[se.scalablesolutions.akka.annotation.oneway]
private var targetInstance: AnyRef = _
private[akka] def setTargetInstance(instance: AnyRef) = targetInstance = instance
private[ActiveObjectProxy] object dispatcher extends GenericServer { private[this] var activeTx: Option[Transaction] = None
private var targetInstance: AnyRef = _
private[kernel] def setTargetInstance(instance: AnyRef) = targetInstance = instance
private[this] val dispatcher = new GenericServer {
override def body: PartialFunction[Any, Unit] = { override def body: PartialFunction[Any, Unit] = {
case invocation: Invocation => case invocation: Invocation =>
val tx = invocation.tx
try { try {
reply(ErrRef(invocation.invoke)) reply(ErrRef(invocation.invoke, tx))
} catch { } catch {
case e: InvocationTargetException => case e: InvocationTargetException =>
val te = e.getTargetException val te = e.getTargetException
te.printStackTrace te.printStackTrace
reply(ErrRef({ throw te })) reply(ErrRef({ throw te }, tx))
case e => case e =>
e.printStackTrace e.printStackTrace
reply(ErrRef({ throw e })) reply(ErrRef({ throw e }, tx))
} }
case 'exit => exit; reply() case 'exit => exit; reply()
case unexpected => throw new ActiveObjectException("Unexpected message to actor proxy: " + unexpected) case unexpected => throw new ActiveObjectException("Unexpected message to actor proxy: " + unexpected)
} }
} }
private[akka] val server = new GenericServerContainer(target.getName, () => dispatcher) private[kernel] val server = new GenericServerContainer(target.getName, () => dispatcher)
server.setTimeout(timeout) server.setTimeout(timeout)
def invoke(proxy: AnyRef, m: Method, args: Array[AnyRef]): AnyRef = def invoke(proxy: AnyRef, m: Method, args: Array[AnyRef]): AnyRef = {
invoke(Invocation(m, args, targetInstance)) val cflowTx = ActiveObject.threadBoundTx.get
activeTx.get.asInstanceOf[Option[Transaction]] match {
case Some(tx) =>
if (cflowTx.isDefined && cflowTx.get != tx) {
// new tx in scope; try to commit
tx.commit(server)
activeTx = None
}
case None =>
if (cflowTx.isDefined) activeTx = Some(cflowTx.get)
}
invoke(Invocation(m, args, targetInstance, activeTx))
}
def invoke(invocation: Invocation): AnyRef = { private def invoke(invocation: Invocation): AnyRef = {
val result: AnyRef = val result: AnyRef =
if (invocation.method.isAnnotationPresent(oneway)) server ! invocation if (invocation.method.isAnnotationPresent(oneway)) server ! invocation
else { else {
val transaction = _
val result: ErrRef[AnyRef] = server !!! (invocation, ErrRef({ val result: ErrRef[AnyRef] = server !!! (invocation, ErrRef({
throw new ActiveObjectInvocationTimeoutException( throw new ActiveObjectInvocationTimeoutException("Invocation to active object [" + targetInstance.getClass.getName + "] timed out after " + timeout + " milliseconds")
"proxy invocation timed out after " + timeout + " milliseconds") }, activeTx))
})) try {
result() result()
} catch {
case e =>
result.tx match {
case None => // no tx; nothing to do
case Some(tx) =>
tx.rollback(server)
ActiveObject.threadBoundTx.set(Some(tx))
} }
throw e
}
}
if (activeTx.isDefined) activeTx.get.precommit(server)
result result
} }
} }
@ -114,7 +146,10 @@ class ActiveObjectProxy(val intf: Class[_], val target: Class[_], val timeout: I
* *
* @author <a href="http://jonasboner.com">Jonas Bon&#233;r</a> * @author <a href="http://jonasboner.com">Jonas Bon&#233;r</a>
*/ */
case class Invocation(val method: Method, val args: Array[Object], val target: AnyRef) { case class Invocation(val method: Method,
val args: Array[Object],
val target: AnyRef,
val tx: Option[Transaction]) {
method.setAccessible(true) method.setAccessible(true)
def invoke: AnyRef = method.invoke(target, args:_*) def invoke: AnyRef = method.invoke(target, args:_*)

2
kernel/src/main/scala/Boot.scala
View file

@ -2,7 +2,7 @@
* Copyright (C) 2009 Scalable Solutions. * Copyright (C) 2009 Scalable Solutions.
*/ */
package com.scalablesolutions.akka package se.scalablesolutions.akka
import kernel.Logging import kernel.Logging
import kernel.configuration.ConfigurationException import kernel.configuration.ConfigurationException

26
kernel/src/main/scala/Configuration.scala
View file

@ -2,9 +2,9 @@
* Copyright (C) 2009 Scalable Solutions. * Copyright (C) 2009 Scalable Solutions.
*/ */
package com.scalablesolutions.akka.kernel.configuration package se.scalablesolutions.akka.kernel.configuration
import com.scalablesolutions.akka.kernel.{ActiveObject, ActiveObjectProxy} import se.scalablesolutions.akka.kernel.{ActiveObject, ActiveObjectProxy}
import com.google.inject.{AbstractModule} import com.google.inject.{AbstractModule}
import java.util.{List => JList, ArrayList} import java.util.{List => JList, ArrayList}
import scala.reflect.BeanProperty import scala.reflect.BeanProperty
@ -17,42 +17,42 @@ sealed class ConfigurationException(msg: String) extends RuntimeException(msg)
sealed abstract class Configuration sealed abstract class Configuration
class RestartStrategy(@BeanProperty val scheme: FailOverScheme, @BeanProperty val maxNrOfRetries: Int, @BeanProperty val withinTimeRange: Int) extends Configuration { class RestartStrategy(@BeanProperty val scheme: FailOverScheme, @BeanProperty val maxNrOfRetries: Int, @BeanProperty val withinTimeRange: Int) extends Configuration {
def transform = com.scalablesolutions.akka.kernel.RestartStrategy(scheme.transform, maxNrOfRetries, withinTimeRange) def transform = se.scalablesolutions.akka.kernel.RestartStrategy(scheme.transform, maxNrOfRetries, withinTimeRange)
} }
class LifeCycle(@BeanProperty val scope: Scope, @BeanProperty val shutdownTime: Int) extends Configuration { class LifeCycle(@BeanProperty val scope: Scope, @BeanProperty val shutdownTime: Int) extends Configuration {
def transform = com.scalablesolutions.akka.kernel.LifeCycle(scope.transform, shutdownTime) def transform = se.scalablesolutions.akka.kernel.LifeCycle(scope.transform, shutdownTime)
} }
abstract class Scope extends Configuration { abstract class Scope extends Configuration {
def transform: com.scalablesolutions.akka.kernel.Scope def transform: se.scalablesolutions.akka.kernel.Scope
} }
class Permanent extends Scope { class Permanent extends Scope {
override def transform = com.scalablesolutions.akka.kernel.Permanent override def transform = se.scalablesolutions.akka.kernel.Permanent
} }
class Transient extends Scope { class Transient extends Scope {
override def transform = com.scalablesolutions.akka.kernel.Transient override def transform = se.scalablesolutions.akka.kernel.Transient
} }
class Temporary extends Scope { class Temporary extends Scope {
override def transform = com.scalablesolutions.akka.kernel.Temporary override def transform = se.scalablesolutions.akka.kernel.Temporary
} }
abstract class FailOverScheme extends Configuration { abstract class FailOverScheme extends Configuration {
def transform: com.scalablesolutions.akka.kernel.FailOverScheme def transform: se.scalablesolutions.akka.kernel.FailOverScheme
} }
class AllForOne extends FailOverScheme { class AllForOne extends FailOverScheme {
override def transform = com.scalablesolutions.akka.kernel.AllForOne override def transform = se.scalablesolutions.akka.kernel.AllForOne
} }
class OneForOne extends FailOverScheme { class OneForOne extends FailOverScheme {
override def transform = com.scalablesolutions.akka.kernel.OneForOne override def transform = se.scalablesolutions.akka.kernel.OneForOne
} }
abstract class Server extends Configuration abstract class Server extends Configuration
//class kernelConfig(@BeanProperty val restartStrategy: RestartStrategy, @BeanProperty val servers: JList[Server]) extends Server { //class kernelConfig(@BeanProperty val restartStrategy: RestartStrategy, @BeanProperty val servers: JList[Server]) extends Server {
// def transform = com.scalablesolutions.akka.kernel.kernelConfig(restartStrategy.transform, servers.toArray.toList.asInstanceOf[List[Server]].map(_.transform)) // def transform = se.scalablesolutions.akka.kernel.kernelConfig(restartStrategy.transform, servers.toArray.toList.asInstanceOf[List[Server]].map(_.transform))
//} //}
class Component(@BeanProperty val intf: Class[_], class Component(@BeanProperty val intf: Class[_],
@BeanProperty val target: Class[_], @BeanProperty val target: Class[_],
@BeanProperty val lifeCycle: LifeCycle, @BeanProperty val lifeCycle: LifeCycle,
@BeanProperty val timeout: Int) extends Server { @BeanProperty val timeout: Int) extends Server {
def newWorker(proxy: ActiveObjectProxy) = com.scalablesolutions.akka.kernel.Worker(proxy.server, lifeCycle.transform) def newWorker(proxy: ActiveObjectProxy) = se.scalablesolutions.akka.kernel.Worker(proxy.server, lifeCycle.transform)
} }

2
kernel/src/main/scala/DataFlowVariable.scala
View file

@ -2,7 +2,7 @@
* Copyright (C) 2009 Scalable Solutions. * Copyright (C) 2009 Scalable Solutions.
*/ */
package com.scalablesolutions.akka.kernel package se.scalablesolutions.akka.kernel
import scala.actors.Actor import scala.actors.Actor
import scala.actors.OutputChannel import scala.actors.OutputChannel

19
kernel/src/main/scala/ErrRef.scala
View file

@ -2,7 +2,7 @@
* Copyright (C) 2009 Scalable Solutions. * Copyright (C) 2009 Scalable Solutions.
*/ */
package com.scalablesolutions.akka.kernel package se.scalablesolutions.akka.kernel
/** /**
* Reference that can hold either a typed value or an exception. * Reference that can hold either a typed value or an exception.
@ -35,16 +35,23 @@ package com.scalablesolutions.akka.kernel
* at .<clinit>(<console>) * at .<clinit>(<console>)
* at Re... * at Re...
* </pre> * </pre>
*
* @author <a href="http://jonasboner.com">Jonas Bon&#233;r</a>
*/ */
class ErrRef[S](s: S){ class ErrRef[Payload](payload: Payload, val tx: Option[Transaction]){
private[this] var contents: Either[Throwable, S] = Right(s) private[this] var contents: Either[Throwable, Payload] = Right(payload)
def update(value: => S) = contents = try { Right(value) } catch { case (e : Throwable) => Left(e) }
def update(value: => Payload) = {
contents = try { Right(value) } catch { case (e : Throwable) => Left(e) }
}
def apply() = contents match { def apply() = contents match {
case Right(s) => s case Right(payload) => payload
case Left(e) => throw e.fillInStackTrace case Left(e) => throw e.fillInStackTrace
} }
override def toString(): String = "ErrRef[" + contents + "]" override def toString(): String = "ErrRef[" + contents + "]"
} }
object ErrRef { object ErrRef {
def apply[S](s: S) = new ErrRef(s) def apply[Payload](payload: Payload, tx: Option[Transaction]) = new ErrRef(payload, tx)
} }

16
kernel/src/main/scala/GenericServer.scala
View file

@ -2,12 +2,12 @@
* Copyright (C) 2009 Scalable Solutions. * Copyright (C) 2009 Scalable Solutions.
*/ */
package com.scalablesolutions.akka.kernel package se.scalablesolutions.akka.kernel
import scala.actors._ import scala.actors._
import scala.actors.Actor._ import scala.actors.Actor._
import com.scalablesolutions.akka.kernel.Helpers._ import se.scalablesolutions.akka.kernel.Helpers._
sealed abstract class GenericServerMessage sealed abstract class GenericServerMessage
case class Init(config: AnyRef) extends GenericServerMessage case class Init(config: AnyRef) extends GenericServerMessage
@ -91,7 +91,7 @@ class GenericServerContainer(val id: String, var serverFactory: () => GenericSer
var lifeCycle: Option[LifeCycle] = None var lifeCycle: Option[LifeCycle] = None
val lock = new ReadWriteLock val lock = new ReadWriteLock
private var server: GenericServer = null private var server: GenericServer = _
private var currentConfig: Option[AnyRef] = None private var currentConfig: Option[AnyRef] = None
private var timeout = 5000 private var timeout = 5000
@ -278,5 +278,15 @@ class GenericServerContainer(val id: String, var serverFactory: () => GenericSer
} }
private[kernel] def getServer: GenericServer = server private[kernel] def getServer: GenericServer = server
private[kernel] def cloneServerAndReturnOldVersion: GenericServer = lock.withWriteLock {
val oldServer = server
server = Serializer.deepClone(server)
oldServer
}
private[kernel] def swapServer(newServer: GenericServer) = lock.withWriteLock {
server = newServer
}
} }

2
kernel/src/main/scala/HashCode.scala
View file

@ -2,7 +2,7 @@
* Copyright (C) 2009 Scalable Solutions. * Copyright (C) 2009 Scalable Solutions.
*/ */
package com.scalablesolutions.akka.kernel package se.scalablesolutions.akka.kernel
import java.lang.reflect.{Array => JArray} import java.lang.reflect.{Array => JArray}
import java.lang.{Float => JFloat, Double => JDouble} import java.lang.{Float => JFloat, Double => JDouble}

2
kernel/src/main/scala/Helpers.scala
View file

@ -2,7 +2,7 @@
* Copyright (C) 2009 Scalable Solutions. * Copyright (C) 2009 Scalable Solutions.
*/ */
package com.scalablesolutions.akka.kernel package se.scalablesolutions.akka.kernel
import java.util.concurrent.locks.ReentrantReadWriteLock import java.util.concurrent.locks.ReentrantReadWriteLock

4
kernel/src/main/scala/Kernel.scala
View file

@ -2,7 +2,7 @@
* Copyright (C) 2009 Scalable Solutions. * Copyright (C) 2009 Scalable Solutions.
*/ */
package com.scalablesolutions.akka.kernel package se.scalablesolutions.akka.kernel
import org.apache.zookeeper.jmx.ManagedUtil import org.apache.zookeeper.jmx.ManagedUtil
import org.apache.zookeeper.server.persistence.FileTxnSnapLog import org.apache.zookeeper.server.persistence.FileTxnSnapLog
@ -33,7 +33,7 @@ object Kernel extends Logging {
val JERSEY_SERVER_URL = "http://" + SERVER_URL + "/" val JERSEY_SERVER_URL = "http://" + SERVER_URL + "/"
val JERSEY_SERVER_PORT = 9998 val JERSEY_SERVER_PORT = 9998
val JERSEY_REST_CLASSES_ROOT_PACKAGE = "com.scalablesolutions.akka.kernel" val JERSEY_REST_CLASSES_ROOT_PACKAGE = "se.scalablesolutions.akka.kernel"
val JERSEY_BASE_URI = UriBuilder.fromUri(JERSEY_SERVER_URL).port(getPort(JERSEY_SERVER_PORT)).build() val JERSEY_BASE_URI = UriBuilder.fromUri(JERSEY_SERVER_URL).port(getPort(JERSEY_SERVER_PORT)).build()
val VOLDEMORT_SERVER_URL = "tcp://" + SERVER_URL val VOLDEMORT_SERVER_URL = "tcp://" + SERVER_URL

2
kernel/src/main/scala/Logging.scala
View file

@ -2,7 +2,7 @@
* Copyright (C) 2009 Scalable Solutions. * Copyright (C) 2009 Scalable Solutions.
*/ */
package com.scalablesolutions.akka.kernel package se.scalablesolutions.akka.kernel
import net.lag.configgy.Config import net.lag.configgy.Config
import net.lag.logging.Logger import net.lag.logging.Logger

6
kernel/src/main/scala/NetCat.scala
View file

@ -37,8 +37,7 @@ object NetCat {
// Set reader idle time to 10 seconds. // Set reader idle time to 10 seconds.
// sessionIdle(...) method will be invoked when no data is read // sessionIdle(...) method will be invoked when no data is read
// for 10 seconds. // for 10 seconds.
val config = immutable.Map.empty[Any, Any] + val config = immutable.Map.empty[Any, Any] + Tuple2(IdleTime(IdleStatus.READER_IDLE), 10)
Tuple2(IdleTime(IdleStatus.READER_IDLE), 10)
session.callReact(SetConfig(config)) { session.callReact(SetConfig(config)) {
case OK(_) => () case OK(_) => ()
case Error(cause) => exit(('setConfigFailed, cause)) case Error(cause) => exit(('setConfigFailed, cause))
@ -98,8 +97,7 @@ Tuple2(IdleTime(IdleStatus.READER_IDLE), 10)
connector.setConnectTimeout(30) connector.setConnectTimeout(30)
// Hook up our code, and start service. // Hook up our code, and start service.
val handlingReference = IoSessionActor.installHandling(connector, val handlingReference = IoSessionActor.installHandling(connector, handleSession(_))
handleSession(_))
val cf = connector.connect(new InetSocketAddress(host, port)) val cf = connector.connect(new InetSocketAddress(host, port))
cf.awaitUninterruptibly() cf.awaitUninterruptibly()
cf.getSession().getCloseFuture().awaitUninterruptibly() cf.getSession().getCloseFuture().awaitUninterruptibly()

4
kernel/src/main/scala/Supervisor.scala
View file

@ -2,13 +2,13 @@
* Copyright (C) 2009 Scalable Solutions. * Copyright (C) 2009 Scalable Solutions.
*/ */
package com.scalablesolutions.akka.kernel package se.scalablesolutions.akka.kernel
import scala.actors._ import scala.actors._
import scala.actors.Actor._ import scala.actors.Actor._
import scala.collection.mutable.HashMap import scala.collection.mutable.HashMap
import com.scalablesolutions.akka.kernel.Helpers._ import se.scalablesolutions.akka.kernel.Helpers._
//==================================================== //====================================================

6
kernel/src/test/scala/activeObjectSpecs.scala
View file

@ -2,12 +2,12 @@
* Copyright (C) 2009 Scalable Solutions. * Copyright (C) 2009 Scalable Solutions.
*/ */
package com.scalablesolutions.akka.kernel package se.scalablesolutions.akka.kernel
import org.specs.runner.JUnit4 import org.specs.runner.JUnit4
import org.specs.Specification import org.specs.Specification
import com.scalablesolutions.akka.supervisor._
import com.scalablesolutions.akka.annotation.oneway import se.scalablesolutions.akka.annotation.oneway
/** /**
* @author <a href="http://jonasboner.com">Jonas Bon&#233;r</a> * @author <a href="http://jonasboner.com">Jonas Bon&#233;r</a>

16
kernel/src/test/scala/restManagerSpecs.scala
View file

@ -2,12 +2,18 @@
* Copyright (C) 2009 Scalable Solutions. * Copyright (C) 2009 Scalable Solutions.
*/ */
package com.scalablesolutions.akka.kernel package se.scalablesolutions.akka.kernel
import org.specs.runner.JUnit4 import org.specs.runner.JUnit4
import org.specs.Specification import org.specs.Specification
import javax.ws.rs.{Produces, Path, GET} import javax.ws.rs.{Produces, Path, GET}
//import com.sun.net.httpserver.HttpServer;
//import com.sun.ws.rest.api.client.Client;
//import com.sun.ws.rest.api.client.ClientResponse;
//import com.sun.ws.rest.api.client.ResourceProxy;
/** /**
* @author <a href="http://jonasboner.com">Jonas Bon&#233;r</a> * @author <a href="http://jonasboner.com">Jonas Bon&#233;r</a>
*/ */
@ -16,7 +22,13 @@ object restManagerSpec extends Specification {
"jersey server should be able to start and stop" in { "jersey server should be able to start and stop" in {
val threadSelector = Kernel.startJersey val threadSelector = Kernel.startJersey
threadSelector.stopEndpoint /* val cc = new DefaultClientConfig
val c = Client.create(cc)
val resource = c.proxy("http://localhost:9998/")
val hello = resource.get(classOf[HelloWorldResource])
val msg = hello.getMessage
println("=============: " + msg)
*/ threadSelector.stopEndpoint
} }
} }

11
util-java/src/main/java/com/scalablesolutions/akka/annotation/oneway.java
View file

@ -1,11 +0,0 @@
/**
* Copyright (C) 2009 Scalable Solutions.
*/
package com.scalablesolutions.akka.annotation;
import java.lang.annotation.*;
@Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.METHOD)
public @interface oneway {}