Commit 05782899 authored by Derek DeMoro's avatar Derek DeMoro Committed by derek

Added DWR to Wildfire.

git-svn-id: http://svn.igniterealtime.org/svn/repos/wildfire/trunk@4110 b35dd754-fafc-0310-a699-88a17e54d16e
parent 4907c91f
...@@ -491,6 +491,10 @@ ...@@ -491,6 +491,10 @@
toFile="${webapp.dest.dir}/WEB-INF/sitemesh.xml" toFile="${webapp.dest.dir}/WEB-INF/sitemesh.xml"
overwrite="true"> overwrite="true">
</copy> </copy>
<copy file="${web.dir}/WEB-INF/dwr.xml"
toFile="${webapp.dest.dir}/WEB-INF/dwr.xml"
overwrite="true">
</copy>
<!-- Create a jar of compiled servlets --> <!-- Create a jar of compiled servlets -->
<jar jarfile="${jspc.dest.dir}/${jspc.jar.name}"> <jar jarfile="${jspc.dest.dir}/${jspc.jar.name}">
......
<?xml version="1.0" encoding="ISO-8859-1"?> <?xml version="1.0" encoding="ISO-8859-1"?>
<web-app <web-app
xmlns="http://java.sun.com/xml/ns/j2ee" xmlns="http://java.sun.com/xml/ns/j2ee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
version="2.4"> version="2.4">
<display-name>Wildfire</display-name> <display-name>Wildfire</display-name>
...@@ -23,7 +23,8 @@ ...@@ -23,7 +23,8 @@
<filter-class>org.jivesoftware.admin.AuthCheckFilter</filter-class> <filter-class>org.jivesoftware.admin.AuthCheckFilter</filter-class>
<init-param> <init-param>
<param-name>excludes</param-name> <param-name>excludes</param-name>
<param-value>login.jsp,index.jsp?logout=true,setup/index.jsp,setup/setup-,.gif,.png,error-serverdown.jsp</param-value> <param-value>
login.jsp,index.jsp?logout=true,setup/index.jsp,setup/setup-,.gif,.png,error-serverdown.jsp</param-value>
</init-param> </init-param>
</filter> </filter>
...@@ -37,11 +38,11 @@ ...@@ -37,11 +38,11 @@
<filter-class>org.jivesoftware.util.SetCharacterEncodingFilter</filter-class> <filter-class>org.jivesoftware.util.SetCharacterEncodingFilter</filter-class>
</filter> </filter>
<filter> <filter>
<filter-name>LocaleFilter</filter-name> <filter-name>LocaleFilter</filter-name>
<filter-class>org.jivesoftware.util.LocaleFilter</filter-class> <filter-class>org.jivesoftware.util.LocaleFilter</filter-class>
</filter> </filter>
<filter> <filter>
<filter-name>sitemesh</filter-name> <filter-name>sitemesh</filter-name>
<filter-class>com.opensymphony.module.sitemesh.filter.PageFilter</filter-class> <filter-class>com.opensymphony.module.sitemesh.filter.PageFilter</filter-class>
...@@ -76,14 +77,14 @@ ...@@ -76,14 +77,14 @@
<filter-name>PluginFilter</filter-name> <filter-name>PluginFilter</filter-name>
<servlet-name>PluginServlet</servlet-name> <servlet-name>PluginServlet</servlet-name>
</filter-mapping> </filter-mapping>
<filter-mapping> <filter-mapping>
<filter-name>sitemesh</filter-name> <filter-name>sitemesh</filter-name>
<url-pattern>/*</url-pattern> <url-pattern>/*</url-pattern>
</filter-mapping> </filter-mapping>
<listener> <listener>
<listener-class>org.jivesoftware.wildfire.XMPPContextListener</listener-class> <listener-class>org.jivesoftware.wildfire.XMPPContextListener</listener-class>
</listener> </listener>
<servlet> <servlet>
...@@ -98,6 +99,16 @@ ...@@ -98,6 +99,16 @@
<load-on-startup>1</load-on-startup> <load-on-startup>1</load-on-startup>
</servlet> </servlet>
<servlet>
<servlet-name>dwr-invoker</servlet-name>
<servlet-class>uk.ltd.getahead.dwr.DWRServlet</servlet-class>
<init-param>
<param-name>debug</param-name>
<param-value>true</param-value>
</init-param>
</servlet>
<!--@@JSPC-SERVLETS@@--> <!--@@JSPC-SERVLETS@@-->
<servlet-mapping> <servlet-mapping>
...@@ -110,6 +121,12 @@ ...@@ -110,6 +121,12 @@
<url-pattern>/getFavicon</url-pattern> <url-pattern>/getFavicon</url-pattern>
</servlet-mapping> </servlet-mapping>
<servlet-mapping>
<servlet-name>dwr-invoker</servlet-name>
<url-pattern>/dwr/*</url-pattern>
</servlet-mapping>
<jsp-config> <jsp-config>
<taglib> <taglib>
<taglib-uri>admin</taglib-uri> <taglib-uri>admin</taglib-uri>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment