From 164aa94fd74e41d48b255110de24151b5da72e03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20Bon=C3=A9r?= Date: Wed, 18 Aug 2010 15:15:22 +0200 Subject: [PATCH] removed codefellow plugin --- .gitignore | 1 + akka-core/.ensime | 4 +-- .../src/main/scala/actor/TypedActor.scala | 22 +++++++------ project/build/AkkaProject.scala | 31 +++++++++---------- project/plugins/Plugins.scala | 18 +++++------ 5 files changed, 38 insertions(+), 38 deletions(-) diff --git a/.gitignore b/.gitignore index 91a3be7969..fd8f3cbd39 100755 --- a/.gitignore +++ b/.gitignore @@ -21,6 +21,7 @@ logs .codefellow storage .codefellow +.ensime _dump .manager manifest.mf diff --git a/akka-core/.ensime b/akka-core/.ensime index 15e1ae85be..0b21e8eb5c 100644 --- a/akka-core/.ensime +++ b/akka-core/.ensime @@ -1,11 +1,11 @@ ( ;; Where you unpacked the ENSIME distribution. - :server-root "/home/jboner/emacs-config/lib/ensime" + :server-root "/Users/jboner/config/emacs-config/lib/ensime" ;; The command with which to invoke the ENSIME server. Change this to ;; "bin/server.bat" if your're on Windows. - :server-cmd "bin/server.bat" + :server-cmd "bin/server.sh" ;; The host to connect to. Connecting to remote ENSIME servers is not diff --git a/akka-core/src/main/scala/actor/TypedActor.scala b/akka-core/src/main/scala/actor/TypedActor.scala index 4178c0366f..adb794741c 100644 --- a/akka-core/src/main/scala/actor/TypedActor.scala +++ b/akka-core/src/main/scala/actor/TypedActor.scala @@ -561,16 +561,7 @@ private[akka] sealed class TypedActorAspect { @Around("execution(* *.*(..))") def invoke(joinPoint: JoinPoint): AnyRef = { - if (!isInitialized) { - val init = AspectInitRegistry.initFor(joinPoint.getThis) - interfaceClass = init.interfaceClass - typedActor = init.targetInstance - actorRef = init.actorRef - uuid = actorRef.uuid - remoteAddress = init.remoteAddress - timeout = init.timeout - isInitialized = true - } + if (!isInitialized) initialize(joinPoint) dispatch(joinPoint) } @@ -661,6 +652,17 @@ private[akka] sealed class TypedActorAspect { } (escapedArgs, isEscaped) } + + private def initialize(joinPoint: JoinPoint): Unit = { + val init = AspectInitRegistry.initFor(joinPoint.getThis) + interfaceClass = init.interfaceClass + typedActor = init.targetInstance + actorRef = init.actorRef + uuid = actorRef.uuid + remoteAddress = init.remoteAddress + timeout = init.timeout + isInitialized = true + } } /** diff --git a/project/build/AkkaProject.scala b/project/build/AkkaProject.scala index b67d3e9019..b013347fcc 100644 --- a/project/build/AkkaProject.scala +++ b/project/build/AkkaProject.scala @@ -3,7 +3,6 @@ \---------------------------------------------------------------------------*/ import com.weiglewilczek.bnd4sbt.BNDPlugin -import de.tuxed.codefellow.plugin.CodeFellowPlugin import java.io.File import java.util.jar.Attributes import java.util.jar.Attributes.Name._ @@ -330,7 +329,7 @@ class AkkaParentProject(info: ProjectInfo) extends DefaultProject(info) { // akka-core subproject // ------------------------------------------------------------------------------------------------------------------- - class AkkaCoreProject(info: ProjectInfo) extends AkkaDefaultProject(info, distPath) with CodeFellowPlugin { + class AkkaCoreProject(info: ProjectInfo) extends AkkaDefaultProject(info, distPath) { val aopalliance = Dependencies.aopalliance val commons_codec = Dependencies.commons_codec val commons_io = Dependencies.commons_io @@ -367,7 +366,7 @@ class AkkaParentProject(info: ProjectInfo) extends DefaultProject(info) { // akka-amqp subproject // ------------------------------------------------------------------------------------------------------------------- - class AkkaAMQPProject(info: ProjectInfo) extends AkkaDefaultProject(info, distPath) with CodeFellowPlugin { + class AkkaAMQPProject(info: ProjectInfo) extends AkkaDefaultProject(info, distPath) { val commons_io = Dependencies.commons_io val rabbit = Dependencies.rabbit val protobuf = Dependencies.protobuf @@ -382,7 +381,7 @@ class AkkaParentProject(info: ProjectInfo) extends DefaultProject(info) { // akka-http subproject // ------------------------------------------------------------------------------------------------------------------- - class AkkaHttpProject(info: ProjectInfo) extends AkkaDefaultProject(info, distPath) with CodeFellowPlugin { + class AkkaHttpProject(info: ProjectInfo) extends AkkaDefaultProject(info, distPath) { val annotation = Dependencies.annotation val atmo = Dependencies.atmo val atmo_jbossweb = Dependencies.atmo_jbossweb @@ -410,7 +409,7 @@ class AkkaParentProject(info: ProjectInfo) extends DefaultProject(info) { // akka-camel subproject // ------------------------------------------------------------------------------------------------------------------- - class AkkaCamelProject(info: ProjectInfo) extends AkkaDefaultProject(info, distPath) with CodeFellowPlugin { + class AkkaCamelProject(info: ProjectInfo) extends AkkaDefaultProject(info, distPath) { val camel_core = Dependencies.camel_core } @@ -485,7 +484,7 @@ class AkkaParentProject(info: ProjectInfo) extends DefaultProject(info) { // akka-spring subproject // ------------------------------------------------------------------------------------------------------------------- - class AkkaSpringProject(info: ProjectInfo) extends AkkaDefaultProject(info, distPath) with CodeFellowPlugin { + class AkkaSpringProject(info: ProjectInfo) extends AkkaDefaultProject(info, distPath) { val spring_beans = Dependencies.spring_beans val spring_context = Dependencies.spring_context @@ -499,7 +498,7 @@ class AkkaParentProject(info: ProjectInfo) extends DefaultProject(info) { // akka-jta subproject // ------------------------------------------------------------------------------------------------------------------- - class AkkaJTAProject(info: ProjectInfo) extends AkkaDefaultProject(info, distPath) with CodeFellowPlugin { + class AkkaJTAProject(info: ProjectInfo) extends AkkaDefaultProject(info, distPath) { val atomikos_transactions = Dependencies.atomikos_transactions val atomikos_transactions_api = Dependencies.atomikos_transactions_api val atomikos_transactions_jta = Dependencies.atomikos_transactions_jta @@ -613,15 +612,15 @@ class AkkaParentProject(info: ProjectInfo) extends DefaultProject(info) { // Examples // ------------------------------------------------------------------------------------------------------------------- - class AkkaSampleAntsProject(info: ProjectInfo) extends DefaultSpdeProject(info) with CodeFellowPlugin { + class AkkaSampleAntsProject(info: ProjectInfo) extends DefaultSpdeProject(info) { // val scalaToolsSnapshots = ScalaToolsSnapshots override def spdeSourcePath = mainSourcePath / "spde" } - class AkkaSampleChatProject(info: ProjectInfo) extends AkkaDefaultProject(info, deployPath) with CodeFellowPlugin - class AkkaSamplePubSubProject(info: ProjectInfo) extends AkkaDefaultProject(info, deployPath) with CodeFellowPlugin + class AkkaSampleChatProject(info: ProjectInfo) extends AkkaDefaultProject(info, deployPath) + class AkkaSamplePubSubProject(info: ProjectInfo) extends AkkaDefaultProject(info, deployPath) - class AkkaSampleLiftProject(info: ProjectInfo) extends DefaultWebProject(info) with DeployProject with CodeFellowPlugin { + class AkkaSampleLiftProject(info: ProjectInfo) extends DefaultWebProject(info) with DeployProject { //val commons_logging = Dependencies.commons_logging val lift_util = Dependencies.lift_util val lift_webkit = Dependencies.lift_webkit @@ -635,15 +634,15 @@ class AkkaParentProject(info: ProjectInfo) extends DefaultProject(info) { override def jarPath = warPath } - class AkkaSampleRestJavaProject(info: ProjectInfo) extends AkkaDefaultProject(info, deployPath) with CodeFellowPlugin + class AkkaSampleRestJavaProject(info: ProjectInfo) extends AkkaDefaultProject(info, deployPath) - class AkkaSampleRemoteProject(info: ProjectInfo) extends AkkaDefaultProject(info, deployPath) with CodeFellowPlugin + class AkkaSampleRemoteProject(info: ProjectInfo) extends AkkaDefaultProject(info, deployPath) - class AkkaSampleRestScalaProject(info: ProjectInfo) extends AkkaDefaultProject(info, deployPath) with CodeFellowPlugin { + class AkkaSampleRestScalaProject(info: ProjectInfo) extends AkkaDefaultProject(info, deployPath) { val jsr311 = Dependencies.jsr311 } - class AkkaSampleCamelProject(info: ProjectInfo) extends AkkaDefaultProject(info, deployPath) with CodeFellowPlugin { + class AkkaSampleCamelProject(info: ProjectInfo) extends AkkaDefaultProject(info, deployPath) { //Must be like this to be able to exclude the geronimo-servlet_2.4_spec which is a too old Servlet spec override def ivyXML = @@ -661,7 +660,7 @@ class AkkaParentProject(info: ProjectInfo) extends DefaultProject(info) { } - class AkkaSampleSecurityProject(info: ProjectInfo) extends AkkaDefaultProject(info, deployPath) with CodeFellowPlugin { + class AkkaSampleSecurityProject(info: ProjectInfo) extends AkkaDefaultProject(info, deployPath) { val commons_codec = Dependencies.commons_codec val jsr250 = Dependencies.jsr250 val jsr311 = Dependencies.jsr311 diff --git a/project/plugins/Plugins.scala b/project/plugins/Plugins.scala index ce3319b885..4f4ec09479 100644 --- a/project/plugins/Plugins.scala +++ b/project/plugins/Plugins.scala @@ -3,13 +3,13 @@ import sbt._ class Plugins(info: ProjectInfo) extends PluginDefinition(info) { // ------------------------------------------------------------------------------------------------------------------- - // All repositories *must* go here! See ModuleConigurations below. + // All repositories *must* go here! See ModuleConigurations below. // ------------------------------------------------------------------------------------------------------------------- - object Repositories { - lazy val AquteRepo = "aQute Maven Repository" at "http://www.aqute.biz/repo" - lazy val DatabinderRepo = "Databinder Repository" at "http://databinder.net/repo" - lazy val EmbeddedRepo = "Embedded Repo" at (info.projectPath / "embedded-repo").asURL.toString - } + object Repositories { + lazy val AquteRepo = "aQute Maven Repository" at "http://www.aqute.biz/repo" + lazy val DatabinderRepo = "Databinder Repository" at "http://databinder.net/repo" + lazy val EmbeddedRepo = "Embedded Repo" at (info.projectPath / "embedded-repo").asURL.toString + } // ------------------------------------------------------------------------------------------------------------------- // ModuleConfigurations @@ -17,15 +17,13 @@ class Plugins(info: ProjectInfo) extends PluginDefinition(info) { // must be resolved from a ModuleConfiguration. This will result in a significant acceleration of the update action. // Therefore, if repositories are defined, this must happen as def, not as val. // ------------------------------------------------------------------------------------------------------------------- - import Repositories._ - lazy val aquteModuleConfig = ModuleConfiguration("biz.aQute", AquteRepo) - lazy val codeFellowModuleConfig = ModuleConfiguration("de.tuxed", EmbeddedRepo) + import Repositories._ + lazy val aquteModuleConfig = ModuleConfiguration("biz.aQute", AquteRepo) lazy val spdeModuleConfig = ModuleConfiguration("us.technically.spde", DatabinderRepo) // ------------------------------------------------------------------------------------------------------------------- // Dependencies // ------------------------------------------------------------------------------------------------------------------- lazy val bnd4sbt = "com.weiglewilczek.bnd4sbt" % "bnd4sbt" % "1.0.0.RC4" - lazy val codeFellow = "de.tuxed" % "codefellow-plugin" % "0.3" // for code completion and more in VIM lazy val spdeSbt = "us.technically.spde" % "spde-sbt-plugin" % "0.4.1" }