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

scalacount should work now.

Browse source
This commit is contained in:
Viktor Klang 2009-08-01 16:56:39 +02:00
parent 352d4b6c2a
commit b8fe12c215
21 changed files with 155 additions and 91 deletions
Download patch file Download diff file Expand all files Collapse all files

10
kernel/pom.xml
View file

@ -119,12 +119,12 @@
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-server</artifactId>
<version>1.0.3</version>
<version>1.1.1-ea</version>
</dependency>
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-json</artifactId>
<version>1.0.3</version>
<version>1.1.1-ea</version>
</dependency>
<dependency>
<groupId>javax.ws.rs</groupId>
@ -145,17 +145,17 @@
<dependency>
<groupId>org.atmosphere</groupId>
<artifactId>atmosphere-core</artifactId>
<version>0.3-SNAPSHOT</version>
<version>0.3</version>
</dependency>
<dependency>
<groupId>org.atmosphere</groupId>
<artifactId>atmosphere-portable-runtime</artifactId>
<version>0.3-SNAPSHOT</version>
<version>0.3</version>
</dependency>
<dependency>
<groupId>org.atmosphere</groupId>
<artifactId>atmosphere-compat</artifactId>
<version>0.3-SNAPSHOT</version>
<version>0.3</version>
</dependency>
<!--<dependency>
<groupId>org.atmosphere</groupId>

40
kernel/src/main/scala/jersey/AkkaServlet.scala
View file

@ -38,6 +38,7 @@ class AkkaServlet extends ServletContainer with AtmosphereServletProcessor with
val configurators = ConfiguratorRepository.getConfiguratorsFor(getServletContext)
rc.getClasses.addAll(configurators.flatMap(_.getComponentInterfaces))
log.info("ResourceFilters: " + rc.getProperty("com.sun.jersey.spi.container.ResourceFilters"));
rc.getProperties.put("com.sun.jersey.spi.container.ResourceFilters","org.atmosphere.core.AtmosphereFilter")
//rc.getFeatures.put("com.sun.jersey.config.feature.Redirect", true)
//rc.getFeatures.put("com.sun.jersey.config.feature.ImplicitViewables",true)
@ -48,30 +49,23 @@ class AkkaServlet extends ServletContainer with AtmosphereServletProcessor with
//Borrowed from AbstractReflectorAtmosphereHandler
override def onMessage(event : AtmosphereEvent[HttpServletRequest,HttpServletResponse]) : AtmosphereEvent[_,_] =
{
//log.info("onMessage: " + event.getMessage.toString)
if(event.getMessage ne null)
{
var isUsingStream = false
try {
event.getResponse.getWriter
} catch {
case e: IllegalStateException => isUsingStream = true
}
val data = event.getMessage.toString
if (isUsingStream){
if(data != null)
event.getResponse.getOutputStream.write(data.getBytes)
event.getResponse.getOutputStream.flush
} else {
event.getResponse.getWriter.write(data)
event.getResponse.getWriter.flush
}
var isUsingStream = false
try {
event.getResponse.getWriter
} catch {
case e: IllegalStateException => isUsingStream = true
}
val data = if(event.getMessage ne null) event.getMessage.toString else null
if (isUsingStream){
if(data != null)
event.getResponse.getOutputStream.write(data.getBytes)
event.getResponse.getOutputStream.flush
} else {
event.getResponse.getWriter.write(data)
event.getResponse.getWriter.flush
}
else
log.info("Null event message :/ req[ " + event.getRequest + "] res[" +event.getResponse + "]")
event
}