Fixed versioning release versions, brought test web.xml up-to-date.

This commit is contained in:
Jonathan Bernard 2015-03-23 04:09:28 -05:00
parent a83d8e4dd8
commit bc02b45712
2 changed files with 45 additions and 0 deletions

View File

@ -46,6 +46,7 @@ war {
rename '(.+)(\\..*(css|js))', '$1-' + version + '$2'
version = project.version.releaseVersion
webInf { from 'resources/main/WEB-INF' }
exclude "**/.*.swp", "**/.sass-cache"
}
test { testLogging { events 'failed' } }
@ -142,6 +143,8 @@ class ProjectVersion {
public String getReleaseVersion() { "$major.$minor" }
public void setRelease(boolean release) { this.release = release; save() }
public void setMajor(int major) {
this.major = major; minor = build = 0; release = false; save() }

View File

@ -40,11 +40,53 @@
<servlet-class>groovy.servlet.TemplateServlet</servlet-class>
</servlet>
<servlet>
<servlet-name>SongViewServlet</servlet-name>
<servlet-class>groovy.servlet.TemplateServlet</servlet-class>
<init-param>
<param-name>resource.name.regex</param-name>
<param-value>/song/?.*</param-value>
</init-param>
<init-param>
<param-name>resource.name.replacement</param-name>
<param-value>/song/index.gsp</param-value>
</init-param>
</servlet>
<servlet>
<servlet-name>ServiceViewServlet</servlet-name>
<servlet-class>groovy.servlet.TemplateServlet</servlet-class>
<init-param>
<param-name>resource.name.regex</param-name>
<param-value>/service/?.*</param-value>
</init-param>
<init-param>
<param-name>resource.name.replacement</param-name>
<param-value>/service/index.gsp</param-value>
</init-param>
</servlet>
<servlet-mapping>
<servlet-name>New Life Songs REST API</servlet-name>
<url-pattern>/api/*</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>SongViewServlet</servlet-name>
<url-pattern>/song/*</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>ServiceViewServlet</servlet-name>
<url-pattern>/service/*</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>GroovyTemplate</servlet-name>
<url-pattern>*.gsp</url-pattern>