summaryrefslogtreecommitdiff
path: root/web/WEB-INF
diff options
context:
space:
mode:
authorJesse Morgan <jesse@jesterpm.net>2013-08-31 23:45:48 -0700
committerJesse Morgan <jesse@jesterpm.net>2013-08-31 23:46:11 -0700
commit4525beb985f8e874f11c0e95df2b1544c8b0b1ba (patch)
tree18685bdace563c6bbb3bfaac5b77d450f6246054 /web/WEB-INF
parent68fb7d58b69f73e69f9b114792bd576897f41122 (diff)
Cleaning up content macro. Adding favicon. Fixing static content.
Diffstat (limited to 'web/WEB-INF')
-rw-r--r--web/WEB-INF/restlet.xml4
-rw-r--r--web/WEB-INF/web.xml4
2 files changed, 7 insertions, 1 deletions
diff --git a/web/WEB-INF/restlet.xml b/web/WEB-INF/restlet.xml
index d77fb2e..67ee36d 100644
--- a/web/WEB-INF/restlet.xml
+++ b/web/WEB-INF/restlet.xml
@@ -1,13 +1,15 @@
<?xml version="1.0"?>
<component xmlns="http://www.restlet.org/schemas/2.0/Component">
<client protocol="FILE" />
- <client protocols="HTTP HTTPS" />
+ <client protocol="HTTP" />
+ <client protocol="HTTPS" />
<server protocols="HTTP HTTPS" />
<defaultHost>
<attach uripattern="/images" targetDescriptor="war:///images" />
<attach uripattern="/scripts" targetDescriptor="war:///scripts" />
<attach uripattern="/style.css" targetDescriptor="war:///style.css" />
+ <attach uripattern="/favicon.ico" targetDescriptor="war:///favicon.ico" />
<attach uriPattern="" targetClass="com.p4square.grow.frontend.GrowFrontend" />
</defaultHost>
diff --git a/web/WEB-INF/web.xml b/web/WEB-INF/web.xml
index be1e4cf..758b004 100644
--- a/web/WEB-INF/web.xml
+++ b/web/WEB-INF/web.xml
@@ -23,6 +23,10 @@
</servlet-mapping>
<servlet-mapping>
<servlet-name>default</servlet-name>
+ <url-pattern>/favicon.ico</url-pattern>
+ </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>default</servlet-name>
<url-pattern>/images/*</url-pattern>
</servlet-mapping>
<servlet-mapping>