diff options
| author | Jesse Morgan <jesse@jesterpm.net> | 2013-06-09 17:35:48 -0700 |
|---|---|---|
| committer | Jesse Morgan <jesse@jesterpm.net> | 2013-06-09 17:35:48 -0700 |
| commit | 69e2512750dd75fce43a21226979996c3cd7da1d (patch) | |
| tree | 691dca375161583393ce32bb0869cb7449255118 /web | |
| parent | f4c2eb2dafbca580319a9f50ef4f5dd68d658702 (diff) | |
Configuration Changes
Fixing a bug in the config class and updating all templates and pages to
use the dynamicRoot and staticRoot config values to prefix URLs.
Diffstat (limited to 'web')
| -rw-r--r-- | web/META-INF/context.xml | 4 | ||||
| -rw-r--r-- | web/WEB-INF/restlet.xml | 18 | ||||
| -rw-r--r-- | web/WEB-INF/web.xml | 21 |
3 files changed, 35 insertions, 8 deletions
diff --git a/web/META-INF/context.xml b/web/META-INF/context.xml new file mode 100644 index 0000000..24744f5 --- /dev/null +++ b/web/META-INF/context.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="UTF-8"?> +<Context> + <Parameter name="configFile" value="grow.properties" override="false"/> +</Context> diff --git a/web/WEB-INF/restlet.xml b/web/WEB-INF/restlet.xml new file mode 100644 index 0000000..d77fb2e --- /dev/null +++ b/web/WEB-INF/restlet.xml @@ -0,0 +1,18 @@ +<?xml version="1.0"?> +<component xmlns="http://www.restlet.org/schemas/2.0/Component"> + <client protocol="FILE" /> + <client protocols="HTTP 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="" targetClass="com.p4square.grow.frontend.GrowFrontend" /> + </defaultHost> + + <internalRouter> + <attach uriPattern="/backend" + targetClass="com.p4square.grow.backend.GrowBackend" /> + </internalRouter> +</component> diff --git a/web/WEB-INF/web.xml b/web/WEB-INF/web.xml index 235f33d..be1e4cf 100644 --- a/web/WEB-INF/web.xml +++ b/web/WEB-INF/web.xml @@ -7,13 +7,6 @@ <display-name>grow-frontend</display-name> - <!-- Application class name --> - <context-param> - <param-name>org.restlet.application</param-name> - <param-value> - net.jesterpm.fmfacade.FMFacade - </param-value> - </context-param> <!-- Restlet adapter --> <servlet> @@ -25,7 +18,19 @@ <!-- Catch all requests --> <servlet-mapping> + <servlet-name>default</servlet-name> + <url-pattern>/style.css</url-pattern> + </servlet-mapping> + <servlet-mapping> + <servlet-name>default</servlet-name> + <url-pattern>/images/*</url-pattern> + </servlet-mapping> + <servlet-mapping> + <servlet-name>default</servlet-name> + <url-pattern>/scripts/*</url-pattern> + </servlet-mapping> + <servlet-mapping> <servlet-name>RestletServlet</servlet-name> - <url-pattern>/p/*</url-pattern> + <url-pattern>/*</url-pattern> </servlet-mapping> </web-app> |