Skip to content

Commit

Permalink
Merge pull request #5 from jlarmstrong/master
Browse files Browse the repository at this point in the history
Added package namespace handling for g8
  • Loading branch information
jlarmstrong committed Feb 3, 2012
2 parents e108243 + b14c7ed commit e1e16dd
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 2 deletions.
3 changes: 2 additions & 1 deletion src/main/g8/default.properties
@@ -1,6 +1,7 @@
organization=com.example
name=scalatra-sbt-prototype
version=0.1.0-SNAPSHOT
scala_version=2.9.1
servlet_name=MyScalatraServlet
package=com.example.app
scala_version=2.9.1

@@ -1,3 +1,5 @@
package $package$

import org.scalatra._
import scalate.ScalateSupport

Expand Down
12 changes: 11 additions & 1 deletion src/main/g8/src/main/webapp/WEB-INF/web.xml
Expand Up @@ -5,12 +5,22 @@ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns
<servlet>
<servlet-name>scalatra</servlet-name>
<servlet-class>
$servlet_name$
$package$.$servlet_name$
</servlet-class>
</servlet>

<servlet-mapping>
<servlet-name>scalatra</servlet-name>
<url-pattern>/*</url-pattern>
</servlet-mapping>

<!-- Static Asset Serving Example -->
<!--
<servlet-mapping>
<servlet-name>default</servlet-name>
<url-pattern>/img/*</url-pattern>
<url-pattern>/css/*</url-pattern>
<url-pattern>/js/*</url-pattern>
</servlet-mapping>
-->
</web-app>
Empty file.
2 changes: 2 additions & 0 deletions src/test/scala/MyScalatraFilterSuite.scala
@@ -1,7 +1,9 @@

import org.scalatra._
import org.scalatra.test.scalatest._
import org.scalatest.matchers._


class MyScalatraFilterSuite extends ScalatraFunSuite with ShouldMatchers {
addFilter(classOf[$servlet_name$], "/*")

Expand Down

0 comments on commit e1e16dd

Please sign in to comment.