Re-enable akka-kernel and add small sample
Created a new simple version of the microkernel for inclusion in the akka download and to be able to start working on sample applications
This commit is contained in:
parent
66e7155ef1
commit
ba9ed982ca
19 changed files with 247 additions and 531 deletions
|
|
@ -30,7 +30,7 @@ object AkkaBuild extends Build {
|
|||
Unidoc.unidocExclude := Seq(samples.id, tutorials.id),
|
||||
Dist.distExclude := Seq(actorTests.id, akkaSbtPlugin.id, docs.id)
|
||||
),
|
||||
aggregate = Seq(actor, testkit, actorTests, stm, remote, slf4j, amqp, mailboxes, akkaSbtPlugin, samples, tutorials, docs)
|
||||
aggregate = Seq(actor, testkit, actorTests, stm, remote, slf4j, amqp, mailboxes, kernel, akkaSbtPlugin, samples, tutorials, docs)
|
||||
)
|
||||
|
||||
lazy val actor = Project(
|
||||
|
|
@ -192,14 +192,14 @@ object AkkaBuild extends Build {
|
|||
// )
|
||||
// )
|
||||
|
||||
// lazy val kernel = Project(
|
||||
// id = "akka-kernel",
|
||||
// base = file("akka-kernel"),
|
||||
// dependencies = Seq(cluster, slf4j, spring),
|
||||
// settings = defaultSettings ++ Seq(
|
||||
// libraryDependencies ++= Dependencies.kernel
|
||||
// )
|
||||
// )
|
||||
lazy val kernel = Project(
|
||||
id = "akka-kernel",
|
||||
base = file("akka-kernel"),
|
||||
dependencies = Seq(actor),
|
||||
settings = defaultSettings ++ Seq(
|
||||
libraryDependencies ++= Dependencies.kernel
|
||||
)
|
||||
)
|
||||
|
||||
lazy val akkaSbtPlugin = Project(
|
||||
id = "akka-sbt-plugin",
|
||||
|
|
@ -213,7 +213,7 @@ object AkkaBuild extends Build {
|
|||
id = "akka-samples",
|
||||
base = file("akka-samples"),
|
||||
settings = parentSettings,
|
||||
aggregate = Seq(fsmSample, helloSample)
|
||||
aggregate = Seq(fsmSample, helloSample, helloKernelSample)
|
||||
)
|
||||
|
||||
lazy val fsmSample = Project(
|
||||
|
|
@ -230,6 +230,13 @@ object AkkaBuild extends Build {
|
|||
settings = defaultSettings
|
||||
)
|
||||
|
||||
lazy val helloKernelSample = Project(
|
||||
id = "akka-sample-hello-kernel",
|
||||
base = file("akka-samples/akka-sample-hello-kernel"),
|
||||
dependencies = Seq(kernel),
|
||||
settings = defaultSettings
|
||||
)
|
||||
|
||||
lazy val tutorials = Project(
|
||||
id = "akka-tutorials",
|
||||
base = file("akka-tutorials"),
|
||||
|
|
@ -388,9 +395,7 @@ object Dependencies {
|
|||
|
||||
val spring = Seq(springBeans, springContext, Test.junit, Test.scalatest)
|
||||
|
||||
val kernel = Seq(
|
||||
jettyUtil, jettyXml, jettyServlet, jacksonCore, staxApi
|
||||
)
|
||||
val kernel = Seq()
|
||||
|
||||
// TODO: resolve Jetty version conflict
|
||||
// val sampleCamel = Seq(camelCore, camelSpring, commonsCodec, Runtime.camelJms, Runtime.activemq, Runtime.springJms,
|
||||
|
|
|
|||
|
|
@ -66,9 +66,8 @@ object Dist {
|
|||
val libAkka = lib / "akka"
|
||||
val src = base / "src" / "akka"
|
||||
IO.delete(unzipped)
|
||||
// TODO: re-enable bin and config dirs, and add deploy dir, when akka-kernel is enabled
|
||||
//copyFilesTo(scripts, bin, setExecutable = true)
|
||||
//IO.copyDirectory(configSources, config)
|
||||
copyFilesTo(scripts, bin, setExecutable = true)
|
||||
IO.copyDirectory(configSources, config)
|
||||
IO.copyDirectory(allSources.api, api)
|
||||
IO.copyDirectory(allSources.docs, docs)
|
||||
copyFilesTo(allSources.docJars, docJars)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue