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

changed package imports for supervisor

Browse source
This commit is contained in:
Jonas Boner 2009-03-10 00:56:42 +01:00
parent 7133c42c00
commit 23c104003b
11 changed files with 182 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,3 +1,7 @@
/**
* Copyright (C) 2009 Scalable Solutions.
*/
package com.scalablesolutions.akka.api;
import com.scalablesolutions.akka.kernel.configuration.*;
@ -13,8 +17,8 @@ import java.util.ArrayList;
import java.util.Map;
import java.util.HashMap;
import scala.actors.behavior.Supervisor;
import scala.actors.behavior.Worker;
import com.scalablesolutions.akka.supervisor.Supervisor;
import com.scalablesolutions.akka.supervisor.Worker;
/**
* @author <a href="http://jonasboner.com">Jonas Bon&#233;r</a>

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

@ -4,12 +4,13 @@
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 scala.actors.annotation.oneway;
import junit.framework.TestCase;
public class ActiveObjectGuiceConfiguratorTest extends TestCase {
@ -99,9 +100,8 @@ public class ActiveObjectGuiceConfiguratorTest extends TestCase {
interface Foo {
public String foo(String msg);
public
@oneway
void bar(String msg);
public void bar(String msg);
public void longRunning();

0
config/akka-default.conf Executable file → Normal file
View file

0
config/akka.conf.template Executable file → Normal file
View file

0
config/scheduler.properties Executable file → Normal file
View file

50
kernel/pom.xml
View file

@ -15,26 +15,16 @@
</parent>
<dependencies>
<dependency>
<groupId>${akka.groupId}</groupId>
<artifactId>akka-supervisor</artifactId>
<version>${akka.version}</version>
</dependency>
<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scala-library</artifactId>
<version>${scala.version}</version>
</dependency>
<dependency>
<groupId>org.scala-libs</groupId>
<artifactId>scala-otp-behavior</artifactId>
<version>0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.scala-libs</groupId>
<artifactId>scala-otp-component</artifactId>
<version>0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.scala-libs</groupId>
<artifactId>scala-otp-util-java</artifactId>
<version>0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.lag</groupId>
<artifactId>configgy</artifactId>
@ -70,6 +60,36 @@
<artifactId>jersey-atom</artifactId>
<version>1.0.1</version>
</dependency>
<dependency>
<groupId>voldemort</groupId>
<artifactId>voldemort</artifactId>
<version>0.4a</version>
</dependency>
<dependency>
<groupId>voldemort</groupId>
<artifactId>voldemort-contrib</artifactId>
<version>0.4a</version>
</dependency>
<dependency>
<groupId>org.apache</groupId>
<artifactId>zookeeper</artifactId>
<version>3.1.0</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>1.4.3</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.4.3</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.13</version>
</dependency>
<dependency>
<groupId>org.specs</groupId>
<artifactId>specs</artifactId>

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

@ -4,7 +4,7 @@
package com.scalablesolutions.akka.kernel
import scala.actors.behavior._
import com.scalablesolutions.akka.supervisor._
import java.util.{List => JList, ArrayList}
@ -24,7 +24,6 @@ class ActiveObjectFactory {
ActiveObject.supervise(restartStrategy, components.toArray.toList.asInstanceOf[List[Worker]])
}
/**
* @author <a href="http://jonasboner.com">Jonas Bon&#233;r</a>
*/
@ -48,7 +47,7 @@ object ActiveObject {
override def getSupervisorConfig = SupervisorConfig(restartStrategy, components)
}
val supervisor = factory.newSupervisor
supervisor ! scala.actors.behavior.Start
supervisor ! com.scalablesolutions.akka.supervisor.Start
supervisor
}
@ -65,7 +64,7 @@ object ActiveObject {
* @author <a href="http://jonasboner.com">Jonas Bon&#233;r</a>
*/
class ActiveObjectProxy(val intf: Class[_], val target: Class[_], val timeout: Int) extends InvocationHandler {
private val oneway = classOf[scala.actors.annotation.oneway]
private val oneway = classOf[com.scalablesolutions.akka.annotation.oneway]
private var targetInstance: AnyRef = _
private[akka] def setTargetInstance(instance: AnyRef) = targetInstance = instance
@ -73,7 +72,6 @@ class ActiveObjectProxy(val intf: Class[_], val target: Class[_], val timeout: I
override def body: PartialFunction[Any, Unit] = {
case invocation: Invocation =>
try {
println("==========> " + invocation)
reply(ErrRef(invocation.invoke))
} catch {
case e: InvocationTargetException =>
@ -133,7 +131,10 @@ case class Invocation(val method: Method, val args: Array[Object], val target: A
private def isEqual(a1: Array[Object], a2: Array[Object]): Boolean =
(a1 == null && a2 == null) ||
(a1 != null && a2 != null && a1.size == a2.size && a1.zip(a2).find(t => t._1 == t._2).isDefined)
(a1 != null &&
a2 != null &&
a1.size == a2.size &&
a1.zip(a2).find(t => t._1 == t._2).isDefined)
private def argsToString(array: Array[Object]): String = array.foldLeft("(")(_ + " " + _) + ")"
private def argsToString(array: Array[Object]): String = synchronized { array.foldLeft("(")(_ + " " + _) + ")" }
}

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

@ -6,10 +6,7 @@ package com.scalablesolutions.akka.kernel.configuration
import com.scalablesolutions.akka.kernel.{ActiveObject, ActiveObjectProxy}
import google.inject.{AbstractModule}
import java.util.{List => JList, ArrayList}
import scala.actors.behavior._
import scala.reflect.BeanProperty
// ============================================
@ -18,42 +15,42 @@ import scala.reflect.BeanProperty
sealed abstract class Configuration
class RestartStrategy(@BeanProperty val scheme: FailOverScheme, @BeanProperty val maxNrOfRetries: Int, @BeanProperty val withinTimeRange: Int) extends Configuration {
def transform = scala.actors.behavior.RestartStrategy(scheme.transform, maxNrOfRetries, withinTimeRange)
def transform = com.scalablesolutions.akka.supervisor.RestartStrategy(scheme.transform, maxNrOfRetries, withinTimeRange)
}
class LifeCycle(@BeanProperty val scope: Scope, @BeanProperty val shutdownTime: Int) extends Configuration {
def transform = scala.actors.behavior.LifeCycle(scope.transform, shutdownTime)
def transform = com.scalablesolutions.akka.supervisor.LifeCycle(scope.transform, shutdownTime)
}
abstract class Scope extends Configuration {
def transform: scala.actors.behavior.Scope
def transform: com.scalablesolutions.akka.supervisor.Scope
}
class Permanent extends Scope {
override def transform = scala.actors.behavior.Permanent
override def transform = com.scalablesolutions.akka.supervisor.Permanent
}
class Transient extends Scope {
override def transform = scala.actors.behavior.Transient
override def transform = com.scalablesolutions.akka.supervisor.Transient
}
class Temporary extends Scope {
override def transform = scala.actors.behavior.Temporary
override def transform = com.scalablesolutions.akka.supervisor.Temporary
}
abstract class FailOverScheme extends Configuration {
def transform: scala.actors.behavior.FailOverScheme
def transform: com.scalablesolutions.akka.supervisor.FailOverScheme
}
class AllForOne extends FailOverScheme {
override def transform = scala.actors.behavior.AllForOne
override def transform = com.scalablesolutions.akka.supervisor.AllForOne
}
class OneForOne extends FailOverScheme {
override def transform = scala.actors.behavior.OneForOne
override def transform = com.scalablesolutions.akka.supervisor.OneForOne
}
abstract class Server extends Configuration
//class SupervisorConfig(@BeanProperty val restartStrategy: RestartStrategy, @BeanProperty val servers: JList[Server]) extends Server {
// def transform = scala.actors.behavior.SupervisorConfig(restartStrategy.transform, servers.toArray.toList.asInstanceOf[List[Server]].map(_.transform))
// def transform = com.scalablesolutions.akka.supervisor.SupervisorConfig(restartStrategy.transform, servers.toArray.toList.asInstanceOf[List[Server]].map(_.transform))
//}
class Component(@BeanProperty val intf: Class[_],
@BeanProperty val target: Class[_],
@BeanProperty val lifeCycle: LifeCycle,
@BeanProperty val timeout: Int) extends Server {
def newWorker(proxy: ActiveObjectProxy) = scala.actors.behavior.Worker(proxy.server, lifeCycle.transform)
def newWorker(proxy: ActiveObjectProxy) = com.scalablesolutions.akka.supervisor.Worker(proxy.server, lifeCycle.transform)
}

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

@ -4,25 +4,128 @@
package com.scalablesolutions.akka.kernel
import org.apache.zookeeper.jmx.ManagedUtil
import org.apache.zookeeper.server.persistence.FileTxnSnapLog
import org.apache.zookeeper.server.ServerConfig
import org.apache.zookeeper.server.NIOServerCnxn
import voldemort.client.{SocketStoreClientFactory, StoreClient, StoreClientFactory}
import voldemort.server.{VoldemortConfig, VoldemortServer}
import voldemort.versioning.Versioned
import com.sun.grizzly.http.SelectorThread
import com.sun.jersey.api.container.grizzly.GrizzlyWebContainerFactory
import java.io.IOException
import java.net.URI
import java.util.{Map, HashMap}
import java.io.{File, IOException}
import javax.ws.rs.core.UriBuilder
import javax.ws.rs.{Produces, Path, GET}
import javax.management.JMException
/**
* @author <a href="http://jonasboner.com">Jonas Bon&#233;r</a>
*/
object Kernel extends Logging {
val SERVER_URL = "http://localhost/"
val SERVER_PORT = 9998
val BASE_URI = UriBuilder.fromUri(SERVER_URL).port(getPort(SERVER_PORT)).build()
val SERVER_URL = "localhost"
val HOME = System.getProperty("AKKA_HOME", "..")
def getPort(defaultPort: Int) = {
val JERSEY_SERVER_URL = "http://" + SERVER_URL + "/"
val JERSEY_SERVER_PORT = 9998
val JERSEY_REST_CLASSES_ROOT_PACKAGE = "com.scalablesolutions.akka.kernel"
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_PORT = 6666
val ZOO_KEEPER_SERVER_URL = SERVER_URL
val ZOO_KEEPER_SERVER_PORT = 9898
def main(args: Array[String]) = {
//startZooKeeper
startVoldemort
//val threadSelector = startJersey
// TODO: handle shutdown of Jersey in separate thread
// TODO: spawn main in new thread an communicate using socket
//System.in.read
//threadSelector.stopEndpoint
}
private[akka] def startJersey: SelectorThread = {
val initParams = new java.util.HashMap[String, String]
initParams.put(
"com.sun.jersey.config.property.packages",
JERSEY_REST_CLASSES_ROOT_PACKAGE)
GrizzlyWebContainerFactory.create(JERSEY_BASE_URI, initParams)
}
private[akka] def startVoldemort = {
val config = VoldemortConfig.loadFromVoldemortHome(HOME)
val server = new VoldemortServer(config)
server.start
log.info("Replicated persistent storage server started at s%", VOLDEMORT_SERVER_URL + ":" + VOLDEMORT_SERVER_PORT)
}
// private[akka] def startZooKeeper = {
// try {
// ManagedUtil.registerLog4jMBeans
// ServerConfig.parse(args)
// } catch {
// case e: JMException => log.warning("Unable to register log4j JMX control: s%", e)
// case e => log.fatal("Error in ZooKeeper config: s%", e)
// }
// val factory = new ZooKeeperServer.Factory() {
// override def createConnectionFactory = new NIOServerCnxn.Factory(ServerConfig.getClientPort)
// override def createServer = {
// val server = new ZooKeeperServer
// val txLog = new FileTxnSnapLog(
// new File(ServerConfig.getDataLogDir),
// new File(ServerConfig.getDataDir))
// server.setTxnLogFactory(txLog)
// server
// }
// }
// try {
// val zooKeeper = factory.createServer
// zooKeeper.startup
// log.info("ZooKeeper started")
// // TODO: handle clean shutdown as below in separate thread
// // val cnxnFactory = serverFactory.createConnectionFactory
// // cnxnFactory.setZooKeeperServer(zooKeeper)
// // cnxnFactory.join
// // if (zooKeeper.isRunning) zooKeeper.shutdown
// } catch { case e => log.fatal("Unexpected exception: s%",e) }
// }
private[akka] def getStorage(storageName: String): StoreClient[String, String] = {
//Versioned value = client.get("some_key");
//value.setObject("some_value");
//client.put("some_key", value);
val numThreads = 10
val maxQueuedRequests = 10
val maxConnectionsPerNode = 10
val maxTotalConnections = 100
val bootstrapUrl = VOLDEMORT_SERVER_URL + VOLDEMORT_SERVER_PORT
val factory = new SocketStoreClientFactory(
numThreads,
numThreads,
maxQueuedRequests,
maxConnectionsPerNode,
maxTotalConnections,
bootstrapUrl)
factory.getStoreClient(storageName)
}
private def getPort(defaultPort: Int) = {
val port = System.getenv("JERSEY_HTTP_PORT")
if (null != port) Integer.parseInt(port)
else defaultPort;
}
}
// @GET
// @Produces("application/json")
@ -34,19 +137,3 @@ object Kernel extends Logging {
// q.getSingleResult.asInstanceOf[User]
// }
def startServer: SelectorThread = {
val initParams = new java.util.HashMap[String, String]
initParams.put(
"com.sun.jersey.config.property.packages",
"com.scalablesolutions.akka.kernel")
log.info("Starting grizzly...")
GrizzlyWebContainerFactory.create(BASE_URI, initParams)
}
def main(args: Array[String]) {
val threadSelector = startServer
log.info("Akka kernel started at s%", BASE_URI)
System.in.read
threadSelector.stopEndpoint
}
}

21
kernel/src/test/scala/restManagerSpec.scala
View file

@ -11,21 +11,18 @@ import javax.ws.rs.{Produces, Path, GET}
/**
* @author <a href="http://jonasboner.com">Jonas Bon&#233;r</a>
*/
class restManagerSpecTest extends JUnit4(restManagerSpec) // for JUnit4 and Maven
object restManagerSpec extends Specification {
"jersey server should be able to start and stop" in {
val threadSelector = Kernel.startJersey
threadSelector.stopEndpoint
}
}
@Path("/helloworld")
class HelloWorldResource {
@GET
@Produces(Array("text/plain"))
def getClichedMessage = "Hello World"
def getMessage = "Hello World"
}
class restManagerSpecTest extends JUnit4(restManagerSpec) // for JUnit4 and Maven
object restManagerSpec extends Specification {
"test" in {
val threadSelector = Kernel.startServer
val reply = System.in.read
println("==============> " + reply)
threadSelector.stopEndpoint
}
}

2
pom.xml
View file

@ -18,6 +18,8 @@
</properties>
<modules>
<module>util-java</module>
<module>supervisor</module>
<module>kernel</module>
<module>api-java</module>
</modules>