Removed redundant servlet spec API jar from dist manifest
This commit is contained in:
parent
a8b2253325
commit
ba61e3647c
3 changed files with 16 additions and 13 deletions
|
|
@ -88,7 +88,8 @@ class AgentException private[akka](message: String) extends RuntimeException(mes
|
||||||
* </pre>
|
* </pre>
|
||||||
* <p/>
|
* <p/>
|
||||||
*
|
*
|
||||||
* IMPORTANT:
|
* <b>IMPORTANT</b>:
|
||||||
|
* <p/>
|
||||||
* You can *not* call 'agent.get', 'agent()' or use the monadic 'foreach',
|
* You can *not* call 'agent.get', 'agent()' or use the monadic 'foreach',
|
||||||
* 'map' and 'flatMap' within an enclosing transaction since that would block
|
* 'map' and 'flatMap' within an enclosing transaction since that would block
|
||||||
* the transaction indefinitely. But all other operations are fine. The system
|
* the transaction indefinitely. But all other operations are fine. The system
|
||||||
|
|
@ -101,7 +102,6 @@ class AgentException private[akka](message: String) extends RuntimeException(mes
|
||||||
sealed class Agent[T] private (initialValue: T) {
|
sealed class Agent[T] private (initialValue: T) {
|
||||||
import Agent._
|
import Agent._
|
||||||
import Actor._
|
import Actor._
|
||||||
if (initialValue eq null) throw new AgentException("Initial value to Agent can't be NULL")
|
|
||||||
|
|
||||||
private val dispatcher = actorOf(new AgentDispatcher[T](initialValue)).start
|
private val dispatcher = actorOf(new AgentDispatcher[T](initialValue)).start
|
||||||
|
|
||||||
|
|
@ -233,6 +233,5 @@ final class AgentDispatcher[T] private[akka] (initialValue: T) extends Transacto
|
||||||
* Performs a CAS operation, atomically swapping the internal state with the value
|
* Performs a CAS operation, atomically swapping the internal state with the value
|
||||||
* provided as a by-name parameter.
|
* provided as a by-name parameter.
|
||||||
*/
|
*/
|
||||||
private final def swap(newData: => T): Unit = value.swap(newData)
|
private def swap(newData: => T): Unit = value.swap(newData)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -13,13 +13,15 @@ import java.util.concurrent.ConcurrentHashMap
|
||||||
|
|
||||||
import org.multiverse.commitbarriers.CountDownCommitBarrier
|
import org.multiverse.commitbarriers.CountDownCommitBarrier
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @author <a href="http://jonasboner.com">Jonas Bonér</a>
|
||||||
|
*/
|
||||||
final class MessageInvocation(val receiver: ActorRef,
|
final class MessageInvocation(val receiver: ActorRef,
|
||||||
val message: Any,
|
val message: Any,
|
||||||
val sender: Option[ActorRef],
|
val sender: Option[ActorRef],
|
||||||
val senderFuture: Option[CompletableFuture[Any]],
|
val senderFuture: Option[CompletableFuture[Any]],
|
||||||
val transactionSet: Option[CountDownCommitBarrier]) {
|
val transactionSet: Option[CountDownCommitBarrier]) {
|
||||||
if (receiver eq null) throw new IllegalArgumentException("receiver is null")
|
if (receiver eq null) throw new IllegalArgumentException("receiver is null")
|
||||||
if (message eq null) throw new IllegalArgumentException("message is null")
|
|
||||||
|
|
||||||
def invoke = receiver.invoke(this)
|
def invoke = receiver.invoke(this)
|
||||||
|
|
||||||
|
|
@ -50,10 +52,16 @@ final class MessageInvocation(val receiver: ActorRef,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @author <a href="http://jonasboner.com">Jonas Bonér</a>
|
||||||
|
*/
|
||||||
trait MessageQueue {
|
trait MessageQueue {
|
||||||
def append(handle: MessageInvocation)
|
def append(handle: MessageInvocation)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @author <a href="http://jonasboner.com">Jonas Bonér</a>
|
||||||
|
*/
|
||||||
trait MessageDispatcher extends Logging {
|
trait MessageDispatcher extends Logging {
|
||||||
protected val references = new ConcurrentHashMap[String, ActorRef]
|
protected val references = new ConcurrentHashMap[String, ActorRef]
|
||||||
def dispatch(invocation: MessageInvocation)
|
def dispatch(invocation: MessageInvocation)
|
||||||
|
|
@ -69,6 +77,9 @@ trait MessageDispatcher extends Logging {
|
||||||
def usesActorMailbox : Boolean
|
def usesActorMailbox : Boolean
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @author <a href="http://jonasboner.com">Jonas Bonér</a>
|
||||||
|
*/
|
||||||
trait MessageDemultiplexer {
|
trait MessageDemultiplexer {
|
||||||
def select
|
def select
|
||||||
def wakeUp
|
def wakeUp
|
||||||
|
|
|
||||||
|
|
@ -66,14 +66,6 @@ class AkkaParent(info: ProjectInfo) extends DefaultProject(info) {
|
||||||
val atmosphereModuleConfig = ModuleConfiguration("org.atmosphere", sonatypeSnapshotRepo)
|
val atmosphereModuleConfig = ModuleConfiguration("org.atmosphere", sonatypeSnapshotRepo)
|
||||||
val liftModuleConfig = ModuleConfiguration("net.liftweb", ScalaToolsSnapshots)
|
val liftModuleConfig = ModuleConfiguration("net.liftweb", ScalaToolsSnapshots)
|
||||||
|
|
||||||
/* These are not needed and can possibly be deleted.
|
|
||||||
val databinder = "DataBinder" at "http://databinder.net/repo"
|
|
||||||
// val configgy = "Configgy" at "http://www.lag.net/repo"
|
|
||||||
val codehaus = "Codehaus" at "http://repository.codehaus.org"
|
|
||||||
val codehaus_snapshots = "Codehaus Snapshots" at "http://snapshots.repository.codehaus.org"
|
|
||||||
val google = "Google" at "http://google-maven-repository.googlecode.com/svn/repository"
|
|
||||||
*/
|
|
||||||
|
|
||||||
// ------------------------------------------------------------
|
// ------------------------------------------------------------
|
||||||
// project defintions
|
// project defintions
|
||||||
lazy val akka_core = project("akka-core", "akka-core", new AkkaCoreProject(_))
|
lazy val akka_core = project("akka-core", "akka-core", new AkkaCoreProject(_))
|
||||||
|
|
@ -108,6 +100,7 @@ class AkkaParent(info: ProjectInfo) extends DefaultProject(info) {
|
||||||
// create a manifest with all akka jars and dependency jars on classpath
|
// create a manifest with all akka jars and dependency jars on classpath
|
||||||
override def manifestClassPath = Some(allArtifacts.getFiles
|
override def manifestClassPath = Some(allArtifacts.getFiles
|
||||||
.filter(_.getName.endsWith(".jar"))
|
.filter(_.getName.endsWith(".jar"))
|
||||||
|
.filter(!_.getName.contains("servlet_2.4"))
|
||||||
.filter(!_.getName.contains("scala-library"))
|
.filter(!_.getName.contains("scala-library"))
|
||||||
.map("lib_managed/scala_%s/compile/".format(buildScalaVersion) + _.getName)
|
.map("lib_managed/scala_%s/compile/".format(buildScalaVersion) + _.getName)
|
||||||
.mkString(" ") +
|
.mkString(" ") +
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue