renamed jersey package to rest
This commit is contained in:
parent
5a6ea7639b
commit
0afbdb44af
8 changed files with 506 additions and 815 deletions
|
|
@ -2,7 +2,7 @@
|
||||||
<!-- Associate a context-root (servlet-mapping) to an AtmosphereHandler.
|
<!-- Associate a context-root (servlet-mapping) to an AtmosphereHandler.
|
||||||
Request sent using that context-root will be mapped to its associated AtmosphereHandler
|
Request sent using that context-root will be mapped to its associated AtmosphereHandler
|
||||||
-->
|
-->
|
||||||
<atmosphere-handler context-root="" class-name="se.scalablesolutions.akka.kernel.jersey.AkkaServlet" broadcaster="org.atmosphere.core.JerseyBroadcaster">
|
<atmosphere-handler context-root="" class-name="se.scalablesolutions.akka.kernel.rest.AkkaServlet" broadcaster="org.atmosphere.core.JerseyBroadcaster">
|
||||||
<!-- Define some AtmosphereHandler properties -->
|
<!-- Define some AtmosphereHandler properties -->
|
||||||
<property name="com.sun.jersey.spi.container.ResourceFilters" value="org.atmosphere.core.AtmosphereFilter"/>
|
<property name="com.sun.jersey.spi.container.ResourceFilters" value="org.atmosphere.core.AtmosphereFilter"/>
|
||||||
</atmosphere-handler>
|
</atmosphere-handler>
|
||||||
|
|
|
||||||
6
kernel/src/main/scala/Kernel.scala
Normal file → Executable file
6
kernel/src/main/scala/Kernel.scala
Normal file → Executable file
|
|
@ -14,7 +14,7 @@ import java.net.URLClassLoader
|
||||||
|
|
||||||
import net.lag.configgy.{Config, Configgy, RuntimeEnvironment, ParseException}
|
import net.lag.configgy.{Config, Configgy, RuntimeEnvironment, ParseException}
|
||||||
|
|
||||||
import kernel.jersey.AkkaCometServlet
|
import kernel.rest.AkkaCometServlet
|
||||||
import kernel.nio.RemoteServer
|
import kernel.nio.RemoteServer
|
||||||
import kernel.state.CassandraStorage
|
import kernel.state.CassandraStorage
|
||||||
import kernel.util.Logging
|
import kernel.util.Logging
|
||||||
|
|
@ -74,7 +74,7 @@ object Kernel extends Logging {
|
||||||
case _ => throw new UnsupportedOperationException("Unknown storage system [" + STORAGE_SYSTEM + "]")
|
case _ => throw new UnsupportedOperationException("Unknown storage system [" + STORAGE_SYSTEM + "]")
|
||||||
}
|
}
|
||||||
|
|
||||||
if (RUN_REST_SERVICE) startJersey
|
if (RUN_REST_SERVICE) startREST
|
||||||
|
|
||||||
Thread.currentThread.setContextClassLoader(getClass.getClassLoader)
|
Thread.currentThread.setContextClassLoader(getClass.getClassLoader)
|
||||||
log.info("Akka started successfully")
|
log.info("Akka started successfully")
|
||||||
|
|
@ -150,7 +150,7 @@ object Kernel extends Logging {
|
||||||
CassandraStorage.start
|
CassandraStorage.start
|
||||||
}
|
}
|
||||||
|
|
||||||
private[akka] def startJersey = {
|
private[akka] def startREST = {
|
||||||
val uri = UriBuilder.fromUri(REST_URL).port(REST_PORT).build()
|
val uri = UriBuilder.fromUri(REST_URL).port(REST_PORT).build()
|
||||||
|
|
||||||
val scheme = uri.getScheme
|
val scheme = uri.getScheme
|
||||||
|
|
|
||||||
2
kernel/src/main/scala/jersey/ActorComponentProvider.scala → kernel/src/main/scala/rest/ActorComponentProvider.scala
Normal file → Executable file
2
kernel/src/main/scala/jersey/ActorComponentProvider.scala → kernel/src/main/scala/rest/ActorComponentProvider.scala
Normal file → Executable file
|
|
@ -2,7 +2,7 @@
|
||||||
* Copyright (C) 2009 Scalable Solutions.
|
* Copyright (C) 2009 Scalable Solutions.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package se.scalablesolutions.akka.kernel.jersey
|
package se.scalablesolutions.akka.kernel.rest
|
||||||
|
|
||||||
import com.sun.jersey.core.spi.component.ioc.IoCFullyManagedComponentProvider
|
import com.sun.jersey.core.spi.component.ioc.IoCFullyManagedComponentProvider
|
||||||
|
|
||||||
|
|
@ -2,7 +2,7 @@
|
||||||
* Copyright (C) 2009 Scalable Solutions.
|
* Copyright (C) 2009 Scalable Solutions.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package se.scalablesolutions.akka.kernel.jersey
|
package se.scalablesolutions.akka.kernel.rest
|
||||||
|
|
||||||
import kernel.Kernel
|
import kernel.Kernel
|
||||||
import util.Logging
|
import util.Logging
|
||||||
2
kernel/src/main/scala/jersey/AkkaServlet.scala → kernel/src/main/scala/rest/AkkaServlet.scala
Normal file → Executable file
2
kernel/src/main/scala/jersey/AkkaServlet.scala → kernel/src/main/scala/rest/AkkaServlet.scala
Normal file → Executable file
|
|
@ -2,7 +2,7 @@
|
||||||
* Copyright (C) 2009 Scalable Solutions.
|
* Copyright (C) 2009 Scalable Solutions.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package se.scalablesolutions.akka.kernel.jersey
|
package se.scalablesolutions.akka.kernel.rest
|
||||||
|
|
||||||
import kernel.Kernel
|
import kernel.Kernel
|
||||||
import config.ConfiguratorRepository
|
import config.ConfiguratorRepository
|
||||||
2
kernel/src/main/scala/jersey/NodeWriter.scala → kernel/src/main/scala/rest/NodeWriter.scala
Normal file → Executable file
2
kernel/src/main/scala/jersey/NodeWriter.scala → kernel/src/main/scala/rest/NodeWriter.scala
Normal file → Executable file
|
|
@ -2,7 +2,7 @@
|
||||||
* Copyright (C) 2009 Scalable Solutions.
|
* Copyright (C) 2009 Scalable Solutions.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package se.scalablesolutions.akka.kernel.jersey
|
package se.scalablesolutions.akka.kernel.rest
|
||||||
|
|
||||||
import java.io.OutputStream
|
import java.io.OutputStream
|
||||||
import java.lang.annotation.Annotation
|
import java.lang.annotation.Annotation
|
||||||
2
samples-lift/src/main/webapp/WEB-INF/web.xml
Normal file → Executable file
2
samples-lift/src/main/webapp/WEB-INF/web.xml
Normal file → Executable file
|
|
@ -13,7 +13,7 @@
|
||||||
</filter-mapping>
|
</filter-mapping>
|
||||||
<servlet>
|
<servlet>
|
||||||
<servlet-name>AkkaServlet</servlet-name>
|
<servlet-name>AkkaServlet</servlet-name>
|
||||||
<servlet-class>se.scalablesolutions.akka.kernel.jersey.AkkaServlet</servlet-class>
|
<servlet-class>se.scalablesolutions.akka.kernel.rest.AkkaServlet</servlet-class>
|
||||||
</servlet>
|
</servlet>
|
||||||
<servlet-mapping>
|
<servlet-mapping>
|
||||||
<servlet-name>AkkaServlet</servlet-name>
|
<servlet-name>AkkaServlet</servlet-name>
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue