Repository: incubator-gearpump Updated Branches: refs/heads/master f7457504e -> 6a65dcbd7
[GEARPUMP-279] Fix akka-streams test examples Author: Kam Kasravi <[email protected]> Closes #163 from kkasravi/GEARPUMP-279. Project: http://git-wip-us.apache.org/repos/asf/incubator-gearpump/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-gearpump/commit/6a65dcbd Tree: http://git-wip-us.apache.org/repos/asf/incubator-gearpump/tree/6a65dcbd Diff: http://git-wip-us.apache.org/repos/asf/incubator-gearpump/diff/6a65dcbd Branch: refs/heads/master Commit: 6a65dcbd7d661f26570c4a33842d0242d55e321e Parents: f745750 Author: Kam Kasravi <[email protected]> Authored: Thu Mar 2 13:46:23 2017 +0800 Committer: manuzhang <[email protected]> Committed: Thu Mar 2 13:46:33 2017 +0800 ---------------------------------------------------------------------- project/BuildExperiments.scala | 10 ++++++---- project/Pack.scala | 23 ++++++++++++++++++----- 2 files changed, 24 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/6a65dcbd/project/BuildExperiments.scala ---------------------------------------------------------------------- diff --git a/project/BuildExperiments.scala b/project/BuildExperiments.scala index eb5f9e1..2f491d3 100644 --- a/project/BuildExperiments.scala +++ b/project/BuildExperiments.scala @@ -53,14 +53,16 @@ object BuildExperiments extends sbt.Build { lazy val akkastream = Project( id = "gearpump-experiments-akkastream", base = file("experiments/akkastream"), - settings = commonSettings ++ noPublish ++ myAssemblySettings ++ + settings = commonSettings ++ noPublish ++ Seq( libraryDependencies ++= Seq( - "org.json4s" %% "json4s-jackson" % "3.2.11" + "org.json4s" %% "json4s-jackson" % "3.2.11", + "com.typesafe.akka" %% "akka-stream" % akkaVersion ), mainClass in(Compile, packageBin) := Some("akka.stream.gearpump.example.Test") )) - .dependsOn(core % "provided", streaming % "test->test; provided") + .dependsOn (core % "provided", streaming % "test->test; provided") + .disablePlugins(sbtassembly.AssemblyPlugin) lazy val redis = Project( id = "gearpump-experiments-redis", @@ -116,4 +118,4 @@ object BuildExperiments extends sbt.Build { settings = commonSettings ++ noPublish) .dependsOn (core % "provided") .disablePlugins(sbtassembly.AssemblyPlugin) -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/6a65dcbd/project/Pack.scala ---------------------------------------------------------------------- diff --git a/project/Pack.scala b/project/Pack.scala index e47c53f..5e546b2 100644 --- a/project/Pack.scala +++ b/project/Pack.scala @@ -20,7 +20,7 @@ import sbt.Keys._ import sbt._ import BuildGearpump._ import BuildDashboard.services -import BuildExperiments.{cgroup, storm, yarn} +import BuildExperiments.{cgroup, storm, yarn, akkastream} import xerial.sbt.Pack._ object Pack extends sbt.Build { @@ -55,6 +55,10 @@ object Pack extends sbt.Build { "${PROG_HOME}/lib/storm/*" ) + val akkaStreamsClassPath = daemonClassPath ++ Seq( + "${PROG_HOME}/lib/akkastream/*" + ) + lazy val packProject = Project( id = "gearpump-pack", base = file(s"$distDirectory"), @@ -68,7 +72,8 @@ object Pack extends sbt.Build { "worker" -> "org.apache.gearpump.cluster.main.Worker", "services" -> "org.apache.gearpump.services.main.Services", "yarnclient" -> "org.apache.gearpump.experiments.yarn.client.Client", - "storm" -> "org.apache.gearpump.experiments.storm.StormRunner" + "storm" -> "org.apache.gearpump.experiments.storm.StormRunner", + "akkastream" -> "org.apache.gearpump.akkastream.example.Test" ), packJvmOpts := Map( "gear" -> Seq( @@ -111,13 +116,20 @@ object Pack extends sbt.Build { "storm" -> Seq( "-server", "-Djava.net.preferIPv4Stack=true", + "-Dgearpump.home=${PROG_HOME}"), + + "akkastream" -> Seq( + "-server", + "-noverify", + "-Djava.net.preferIPv4Stack=true", "-Dgearpump.home=${PROG_HOME}") ), packLibDir := Map( "lib/yarn" -> new ProjectsToPack(gearpumpHadoop.id, yarn.id). exclude(services.id, core.id), "lib/services" -> new ProjectsToPack(services.id).exclude(core.id), - "lib/storm" -> new ProjectsToPack(storm.id).exclude(streaming.id) + "lib/storm" -> new ProjectsToPack(storm.id).exclude(streaming.id), + "lib/akkastream" -> new ProjectsToPack(akkastream.id) ), packExclude := Seq(thisProjectRef.value.project), @@ -144,13 +156,14 @@ object Pack extends sbt.Build { "worker" -> applicationClassPath, "services" -> serviceClassPath, "yarnclient" -> yarnClassPath, - "storm" -> stormClassPath + "storm" -> stormClassPath, + "akkastream" -> akkaStreamsClassPath ), packArchivePrefix := projectName + "-" + scalaBinaryVersion.value, packArchiveExcludes := Seq("integrationtest") ) - ).dependsOn(core, streaming, services, yarn, storm, cgroup). + ).dependsOn(core, streaming, services, yarn, storm, akkastream, cgroup). disablePlugins(sbtassembly.AssemblyPlugin) }
