Author: brianm
Date: Mon Feb 4 12:03:26 2008
New Revision: 618409
URL: http://svn.apache.org/viewvc?rev=618409&view=rev
Log:
Re-order elements in the web.xml to comply with the DTD.
Servlet mappings need to come after all servlet declarations.
Modified:
incubator/shindig/trunk/java/gadgets/src/main/webapp/WEB-INF/web.xml
Modified: incubator/shindig/trunk/java/gadgets/src/main/webapp/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/webapp/WEB-INF/web.xml?rev=618409&r1=618408&r2=618409&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/main/webapp/WEB-INF/web.xml
(original)
+++ incubator/shindig/trunk/java/gadgets/src/main/webapp/WEB-INF/web.xml Mon
Feb 4 12:03:26 2008
@@ -15,51 +15,52 @@
-->
<!DOCTYPE web-app
- PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
- "http://java.sun.com/dtd/web-app_2_3.dtd";>
+ PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+ "http://java.sun.com/dtd/web-app_2_3.dtd";>
<web-app>
- <!-- configuration -->
- <context-param>
- <param-name>features</param-name>
- <param-value>res://features/features.txt</param-value>
- </context-param>
- <!-- Render a Gadget -->
-
- <servlet>
- <servlet-name>xml-to-html</servlet-name>
- <servlet-class>
- org.apache.shindig.gadgets.http.GadgetRenderingServlet
- </servlet-class>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>xml-to-html</servlet-name>
- <url-pattern>/ifr</url-pattern>
- </servlet-mapping>
-
- <!-- Proxy -->
-
- <servlet>
- <servlet-name>proxy</servlet-name>
- <servlet-class>
- org.apache.shindig.gadgets.http.ProxyServlet
- </servlet-class>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>proxy</servlet-name>
- <url-pattern>/proxy</url-pattern>
- </servlet-mapping>
-
- <!-- javascript serving -->
- <servlet>
- <servlet-name>js</servlet-name>
- <servlet-class>org.apache.shindig.gadgets.http.JsServlet</servlet-class>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>js</servlet-name>
- <url-pattern>/js/*</url-pattern>
- </servlet-mapping>
+ <!-- configuration -->
+ <context-param>
+ <param-name>features</param-name>
+ <param-value>res://features/features.txt</param-value>
+ </context-param>
+
+ <!-- Render a Gadget -->
+ <servlet>
+ <servlet-name>xml-to-html</servlet-name>
+ <servlet-class>
+ org.apache.shindig.gadgets.http.GadgetRenderingServlet
+ </servlet-class>
+ </servlet>
+
+ <!-- Proxy -->
+ <servlet>
+ <servlet-name>proxy</servlet-name>
+ <servlet-class>
+ org.apache.shindig.gadgets.http.ProxyServlet
+ </servlet-class>
+ </servlet>
+
+
+ <!-- javascript serving -->
+ <servlet>
+ <servlet-name>js</servlet-name>
+
<servlet-class>org.apache.shindig.gadgets.http.JsServlet</servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>js</servlet-name>
+ <url-pattern>/js/*</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>proxy</servlet-name>
+ <url-pattern>/proxy</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>xml-to-html</servlet-name>
+ <url-pattern>/ifr</url-pattern>
+ </servlet-mapping>
+
</web-app>
