Skip to content

Commit

Permalink
update to 0.8.3: fix issue #34
Browse files Browse the repository at this point in the history
  • Loading branch information
Ken Siprell committed Apr 2, 2014
1 parent 880b232 commit cba6baf
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 18 deletions.
2 changes: 1 addition & 1 deletion AtmosphereMeteorGrailsPlugin.groovy
Expand Up @@ -11,7 +11,7 @@ import org.grails.plugins.atmosphere_meteor.MeteorHandlerArtefactHandler
import org.grails.plugins.atmosphere_meteor.MeteorServletArtefactHandler

class AtmosphereMeteorGrailsPlugin {
def version = "0.8.2"
def version = "0.8.3"
def grailsVersion = "2.1 > *"
def pluginExcludes = [
"web-app/css/**",
Expand Down
8 changes: 4 additions & 4 deletions README.md
Expand Up @@ -6,15 +6,15 @@

The plugin has been tested in the following environment, using the [grails-atmosphere-meteor-sample](https://github.com/kensiprell/grails-atmosphere-meteor-sample) application and [grails-plugin-test-script](https://github.com/kensiprell/grails-plugin-test-script):

* atmosphere-runtime 2.1.1
* atmosphere-runtime 2.1.2

* OSX 10.9.2

* JDK 1.7.0_51

* Grails versions 2.1.5, 2.2.4, and 2.3.7

* Tomcat (version depends on Grails version). Does not work with Tomcat 7.0.52 or 8.x. See [issue #34](https://github.com/kensiprell/grails-atmosphere-meteor/issues/34).
* Tomcat 7.0.27 through 7.0.52 (version depends on Grails version).

* Jetty 8.1.13.v20130916

Expand Down Expand Up @@ -71,7 +71,7 @@ Edit your BuildConfig.groovy:
```
plugins {
// other plugins
compile ":atmosphere-meteor:0.8.2"
compile ":atmosphere-meteor:0.8.3"
// other plugins
}
```
Expand All @@ -90,7 +90,7 @@ grails.tomcat.nio = true

### Tomcat 8

Not yet supported. See [issue #34](https://github.com/kensiprell/grails-atmosphere-meteor/issues/34).
Search the [BuildConfig.groovy](https://github.com/kensiprell/grails-atmosphere-meteor-sample/blob/master/grails-app/conf/BuildConfig.groovy) for the sample app for "tomcat8" for configuring Tomcat 8.

### MeteorServlet

Expand Down
4 changes: 2 additions & 2 deletions grails-app/conf/BuildConfig.groovy
Expand Up @@ -19,7 +19,7 @@ grails.project.dependency.resolution = {
}

dependencies {
compile "org.atmosphere:atmosphere-runtime:2.1.1", {
compile "org.atmosphere:atmosphere-runtime:2.1.2", {
excludes "slf4j-api"
}
compile "org.codehaus.jackson:jackson-core-asl:1.9.13"
Expand All @@ -29,7 +29,7 @@ grails.project.dependency.resolution = {
build ":release:3.0.1", ":rest-client-builder:2.0.1", {
export = false
}
compile ":asset-pipeline:1.7.2", {
compile ":asset-pipeline:1.7.4", {
export = false
}
runtime ":resources:1.2.7", {
Expand Down
21 changes: 10 additions & 11 deletions src/templates/artifacts/MeteorServlet.groovy
Expand Up @@ -15,16 +15,15 @@ class @artifact.name@ extends MeteorServlet {
public void init(ServletConfig sc) throws ServletException {
super.init(sc)

def servletName = sc.servletName
def config = AtmosphereConfigurationHolder.atmosphereMeteorConfig
def servlet = config.servlets.get(servletName)
def mapping = servlet.mapping
def handler = servlet.handler.newInstance() as HttpServlet
def servletClass = handler.class.getName()

ReflectorServletProcessor r = new ReflectorServletProcessor(handler)
r.setServletClassName(servletClass)
framework.addAtmosphereHandler(mapping, r)
logger.info "Added AtmosphereHandler: $servletClass mapped to $mapping"
def servletConfig = AtmosphereConfigurationHolder.atmosphereMeteorConfig.servlets.get(sc.servletName)
def mapping = servletConfig.mapping
def handler = servletConfig.handler.newInstance()
def handlerClass = handler.class.getName()

ReflectorServletProcessor rsp = new ReflectorServletProcessor()
rsp.setServletClassName(handlerClass)
framework.addAtmosphereHandler(mapping, rsp)
logger.info "Added AtmosphereHandler: $handlerClass mapped to $mapping"

}
}

0 comments on commit cba6baf

Please sign in to comment.