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

Removed the 'jmxclient' JAR. Instead changed AkkaBuild to get it from the Typesafe Maven Repo and tweaked 'akka-cluster' script to use it.

Browse source 
Signed-off-by: Jonas Bonér <jonas@jonasboner.com>
This commit is contained in:
Jonas Bonér 2012-04-24 10:19:36 +02:00
parent 5d575a18d7
commit b7002b3f8e
3 changed files with 66 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

24
akka-kernel/src/main/dist/bin/akka-cluster vendored
View file

@ -1,15 +1,23 @@
#!/bin/bash #!/bin/bash
# Add these options to the sbt or startup script: # ============== Akka Cluster Administration Tool ==============
# java \ #
# -Dcom.sun.management.jmxremote.port=9999 \ # This script is meant to be used from within the Akka distribution.
# -Dcom.sun.management.jmxremote.ssl=false \ # Requires setting $AKKA_HOME to the root of the distribution.
# -Dcom.sun.management.jmxremote.authenticate=false \ #
# ... # Add these options to the sbt or startup script:
# java \
# -Dcom.sun.management.jmxremote.port=9999 \
# -Dcom.sun.management.jmxremote.ssl=false \
# -Dcom.sun.management.jmxremote.authenticate=false \
# ...
# ==============================================================
# FIXME support authentication? if so add: -Dcom.sun.management.jmxremote.password.file=<path to file> # FIXME support authentication? if so add: -Dcom.sun.management.jmxremote.password.file=<path to file> AND tweak this script to support it (arg need 'user:passwd' instead of '-')
JMX_CLIENT="java -jar $AKKA_HOME/lib/cmdline-jmxclient-0.10.3.jar -" # NOTE: The 'cmdline-jmxclient' JAR is available as part of the Akka distribution.
# Provided by Typesafe Maven Repository: http://repo.typesafe.com/typesafe/releases/cmdline-jmxclient.
JMX_CLIENT="java -jar $AKKA_HOME/lib/akka/cmdline-jmxclient-0.10.3.jar -"
SELF=`basename $0` # script name SELF=`basename $0` # script name
HOST=$1 # cluster node:port to talk to through JMX HOST=$1 # cluster node:port to talk to through JMX

BIN
akka-kernel/src/main/dist/lib/cmdline-jmxclient-0.10.3.jar vendored
View file

Binary file not shown.

14
project/AkkaBuild.scala
View file

@ -316,13 +316,6 @@ object AkkaBuild extends Build {
) )
) )
// lazy val secondTutorial = Project(
// id = "akka-tutorial-second",
// base = file("akka-tutorials/akka-tutorial-second"),
// dependencies = Seq(actor),
// settings = defaultSettings
// )
lazy val docs = Project( lazy val docs = Project(
id = "akka-docs", id = "akka-docs",
base = file("akka-docs"), base = file("akka-docs"),
@ -473,9 +466,9 @@ object Dependencies {
val spring = Seq(springBeans, springContext, Test.junit, Test.scalatest) val spring = Seq(springBeans, springContext, Test.junit, Test.scalatest)
val kernel = Seq(Test.scalatest, Test.junit) val kernel = Seq(jmxClient, Test.scalatest, Test.junit)
val camel = Seq(Test.scalatest, Test.junit, Test.mockito, camelCore) val camel = Seq(camelCore, Test.scalatest, Test.junit, Test.mockito)
// TODO: resolve Jetty version conflict // TODO: resolve Jetty version conflict
// val sampleCamel = Seq(camelCore, camelSpring, commonsCodec, Runtime.camelJms, Runtime.activemq, Runtime.springJms, // val sampleCamel = Seq(camelCore, camelSpring, commonsCodec, Runtime.camelJms, Runtime.activemq, Runtime.springJms,
@ -485,7 +478,7 @@ object Dependencies {
val docs = Seq(Test.scalatest, Test.junit) val docs = Seq(Test.scalatest, Test.junit)
val zeroMQ = Seq(Test.scalatest, Test.junit, protobuf, Dependency.zeroMQ) val zeroMQ = Seq(protobuf, Dependency.zeroMQ, Test.scalatest, Test.junit)
} }
object Dependency { object Dependency {
@ -522,6 +515,7 @@ object Dependency {
val jettyUtil = "org.eclipse.jetty" % "jetty-util" % V.Jetty // Eclipse license val jettyUtil = "org.eclipse.jetty" % "jetty-util" % V.Jetty // Eclipse license
val jettyXml = "org.eclipse.jetty" % "jetty-xml" % V.Jetty // Eclipse license val jettyXml = "org.eclipse.jetty" % "jetty-xml" % V.Jetty // Eclipse license
val jettyServlet = "org.eclipse.jetty" % "jetty-servlet" % V.Jetty // Eclipse license val jettyServlet = "org.eclipse.jetty" % "jetty-servlet" % V.Jetty // Eclipse license
val jmxClient = "cmdline-jmxclient" % "cmdline-jmxclient" % "0.10.3" // LGPL
val log4j = "log4j" % "log4j" % "1.2.14" // ApacheV2 val log4j = "log4j" % "log4j" % "1.2.14" // ApacheV2
val mongoAsync = "com.mongodb.async" % "mongo-driver_2.9.0-1" % "0.2.9-1" // ApacheV2 val mongoAsync = "com.mongodb.async" % "mongo-driver_2.9.0-1" % "0.2.9-1" // ApacheV2
val netty = "io.netty" % "netty" % V.Netty // ApacheV2 val netty = "io.netty" % "netty" % V.Netty // ApacheV2