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

Updated pom.xml files to new dedicated Atmosphere and Jersey JARs

Browse source
This commit is contained in:
Jonas Bonér 2010-01-05 08:57:12 +01:00
parent 37470b7fab
commit f98d61811e
3 changed files with 8 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
akka-comet/pom.xml
View file

@ -48,7 +48,7 @@
<dependency> <dependency>
<groupId>org.atmosphere</groupId> <groupId>org.atmosphere</groupId>
<artifactId>atmosphere-runtime</artifactId> <artifactId>atmosphere-runtime</artifactId>
<version>${atmosphere.version}</version> <version>0.5.v20100104</version>
</dependency> </dependency>
</dependencies> </dependencies>
</project> </project>

11
akka-core/src/main/scala/remote/RemoteServer.scala
View file

@ -46,7 +46,8 @@ import org.jboss.netty.handler.codec.compression.{ZlibEncoder, ZlibDecoder}
object RemoteNode extends RemoteServer object RemoteNode extends RemoteServer
/** /**
* This object holds configuration variables. * For internal use only.
* Holds configuration variables, remote actors, remote active objects and remote servers.
* *
* @author <a href="http://jonasboner.com">Jonas Bon&#233;r</a> * @author <a href="http://jonasboner.com">Jonas Bon&#233;r</a>
*/ */
@ -90,7 +91,7 @@ object RemoteServer {
private val remoteActorSets = new ConcurrentHashMap[Address, RemoteActorSet] private val remoteActorSets = new ConcurrentHashMap[Address, RemoteActorSet]
private val remoteServers = new ConcurrentHashMap[Address, RemoteServer] private val remoteServers = new ConcurrentHashMap[Address, RemoteServer]
def actorsFor(remoteServerAddress: RemoteServer.Address): RemoteActorSet = { private[akka] def actorsFor(remoteServerAddress: RemoteServer.Address): RemoteActorSet = {
val set = remoteActorSets.get(remoteServerAddress) val set = remoteActorSets.get(remoteServerAddress)
if (set ne null) set if (set ne null) set
else { else {
@ -100,7 +101,7 @@ object RemoteServer {
} }
} }
def serverFor(hostname: String, port: Int): Option[RemoteServer] = { private[remote] def serverFor(hostname: String, port: Int): Option[RemoteServer] = {
val server = remoteServers.get(Address(hostname, port)) val server = remoteServers.get(Address(hostname, port))
if (server eq null) None if (server eq null) None
else Some(server) else Some(server)
@ -189,7 +190,7 @@ class RemoteServer extends Logging {
} }
} }
case class Codec(encoder : ChannelHandler,decoder : ChannelHandler) case class Codec(encoder : ChannelHandler, decoder : ChannelHandler)
/** /**
* @author <a href="http://jonasboner.com">Jonas Bon&#233;r</a> * @author <a href="http://jonasboner.com">Jonas Bon&#233;r</a>
@ -437,7 +438,7 @@ class RemoteServerHandler(
newInstance newInstance
} catch { } catch {
case e => case e =>
log.error(e, "Could not create remote actor object instance") log.error(e, "Could not create remote actor instance")
throw e throw e
} }
} else actorOrNull } else actorOrNull

7
akka-rest/pom.xml
View file

@ -31,12 +31,7 @@
<dependency> <dependency>
<groupId>com.sun.jersey</groupId> <groupId>com.sun.jersey</groupId>
<artifactId>jersey-core</artifactId> <artifactId>jersey-core</artifactId>
<version>${jersey.version}</version> <version>1.1.5-ea-20100104</version>
</dependency>
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-core</artifactId>
<version>${jersey.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.sun.jersey</groupId> <groupId>com.sun.jersey</groupId>