Author: ekoneil
Date: Thu Aug 19 11:06:15 2004
New Revision: 36620
Removed:
incubator/beehive/trunk/netui/src/webapp-template/dd/tomcat/
Modified:
incubator/beehive/trunk/netui/src/webapp-template/dd/generic/web.xml
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/web.xml
Log:
Updates to get the web.xml files for the webapp template and DRTs consistent.
All should now have:
<dispatcher>FORWARD</dispatcher>
<dispatcher>REQUEST</dispatcher>
<dispatcher>INCLUDE</dispatcher>
and the webapp template now references the Beehive tag libraries by the
http://... URI.
BB: self
DRT: NetUI pass
BVT: NetUI pass
Modified: incubator/beehive/trunk/netui/src/webapp-template/dd/generic/web.xml
==============================================================================
--- incubator/beehive/trunk/netui/src/webapp-template/dd/generic/web.xml
(original)
+++ incubator/beehive/trunk/netui/src/webapp-template/dd/generic/web.xml
Thu Aug 19 11:06:15 2004
@@ -16,6 +16,8 @@
<filter-name>PageFlowJspFilter</filter-name>
<url-pattern>*.jsp</url-pattern>
<dispatcher>FORWARD</dispatcher>
+ <dispatcher>REQUEST</dispatcher>
+ <dispatcher>INCLUDE</dispatcher>
</filter-mapping>
<!-- Action Servlet Configuration (with debugging) -->
@@ -64,17 +66,17 @@
</error-page>
<jsp-config>
- <!-- Define the NetUI tag library TLDs -->
+ <!-- Define the Beehive / NetUI tag libraries -->
<taglib>
- <taglib-uri>beehive-netui-tags-html.tld</taglib-uri>
-
<taglib-location>/WEB-INF/beehive-netui-tags-html.tld</taglib-location>
+
<taglib-uri>http://beehive.apache.org/netui/tags-databinding-1.0</taglib-uri>
+
<taglib-location>/WEB-INF/beehive-netui-tags-databinding.tld</taglib-location>
</taglib>
<taglib>
- <taglib-uri>beehive-netui-tags-databinding.tld</taglib-uri>
-
<taglib-location>/WEB-INF/beehive-netui-tags-databinding.tld</taglib-location>
+
<taglib-uri>http://beehive.apache.org/netui/tags-html-1.0</taglib-uri>
+
<taglib-location>/WEB-INF/beehive-netui-tags-html.tld</taglib-location>
</taglib>
<taglib>
- <taglib-uri>beehive-netui-tags-template.tld</taglib-uri>
+
<taglib-uri>http://beehive.apache.org/netui/tags-template-1.0</taglib-uri>
<taglib-location>/WEB-INF/beehive-netui-tags-template.tld</taglib-location>
</taglib>
</jsp-config>
Modified: incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/web.xml
==============================================================================
--- incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/web.xml
(original)
+++ incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/web.xml
Thu Aug 19 11:06:15 2004
@@ -66,6 +66,7 @@
<url-pattern>*.jsp</url-pattern>
<dispatcher>FORWARD</dispatcher>
<dispatcher>REQUEST</dispatcher>
+ <dispatcher>INCLUDE</dispatcher>
</filter-mapping>
<!--