You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beehive.apache.org by ek...@apache.org on 2006/01/23 17:35:29 UTC
svn commit: r371580 - in /beehive/trunk:
netui/src/webapp-template/default/WEB-INF/
netui/test/webapps/drt/web/WEB-INF/ samples/netui-jsf/web/WEB-INF/
samples/netui-samples/web/WEB-INF/ samples/petstoreWeb/web/WEB-INF/
Author: ekoneil
Date: Mon Jan 23 08:35:20 2006
New Revision: 371580
URL: http://svn.apache.org/viewcvs?rev=371580&view=rev
Log:
Remove Struts debug / detail logging config which was deprecated after Struts 1.0.
BB: self
Test: clean / deploy / drt / build.dist pass
Modified:
beehive/trunk/netui/src/webapp-template/default/WEB-INF/web.xml
beehive/trunk/netui/test/webapps/drt/web/WEB-INF/web.xml
beehive/trunk/samples/netui-jsf/web/WEB-INF/web.xml.jsf-ri
beehive/trunk/samples/netui-jsf/web/WEB-INF/web.xml.myfaces
beehive/trunk/samples/netui-samples/web/WEB-INF/web.xml
beehive/trunk/samples/petstoreWeb/web/WEB-INF/web.xml
Modified: beehive/trunk/netui/src/webapp-template/default/WEB-INF/web.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/webapp-template/default/WEB-INF/web.xml?rev=371580&r1=371579&r2=371580&view=diff
==============================================================================
--- beehive/trunk/netui/src/webapp-template/default/WEB-INF/web.xml (original)
+++ beehive/trunk/netui/src/webapp-template/default/WEB-INF/web.xml Mon Jan 23 08:35:20 2006
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8" ?>
<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
- 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"
- version="2.4">
+ 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"
+ version="2.4">
- <display-name>Beehive Web Application</display-name>
+ <display-name>Beehive NetUI Web Application</display-name>
<!-- Filter to perform Page Flow operations when JSPs are hit directly. -->
<filter>
@@ -88,21 +88,13 @@
<dispatcher>REQUEST</dispatcher>
</filter-mapping>
- <!-- Action Servlet Configuration (with debugging) -->
+ <!-- NetUI Servlet Configuration -->
<servlet>
<servlet-name>action</servlet-name>
<servlet-class>org.apache.beehive.netui.pageflow.PageFlowActionServlet</servlet-class>
<init-param>
<param-name>config</param-name>
<param-value>/_pageflow/struts-config.xml</param-value>
- </init-param>
- <init-param>
- <param-name>debug</param-name>
- <param-value>2</param-value>
- </init-param>
- <init-param>
- <param-name>detail</param-name>
- <param-value>2</param-value>
</init-param>
<load-on-startup>2</load-on-startup>
</servlet>
Modified: beehive/trunk/netui/test/webapps/drt/web/WEB-INF/web.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/web/WEB-INF/web.xml?rev=371580&r1=371579&r2=371580&view=diff
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/web/WEB-INF/web.xml (original)
+++ beehive/trunk/netui/test/webapps/drt/web/WEB-INF/web.xml Mon Jan 23 08:35:20 2006
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
- 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"
- version="2.4">
+ 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"
+ version="2.4">
<!-- Make sure the secure forwards are turned on -->
<context-param>
@@ -11,36 +11,6 @@
<param-value>true</param-value>
</context-param>
- <!--
- <context-param>
- <param-name>javax.faces.STATE_SAVING_METHOD</param-name>
- <param-value>client</param-value>
- </context-param>
-
- <context-param>
- <description>
- Set this flag to true if you want the JavaServer Faces
- Reference Implementation to validate the XML in your
- faces-config.xml resources against the DTD. Default
- value is false.
- </description>
- <param-name>com.sun.faces.validateXml</param-name>
- <param-value>true</param-value>
- </context-param>
-
- <context-param>
- <description>
- Set this flag to true if you want the JavaServer Faces
- Reference Implementation to verify that all of the application
- objects you have configured (components, converters,
- renderers, and validators) can be successfully created.
- Default value is false.
- </description>
- <param-name>com.sun.faces.verifyObjects</param-name>
- <param-value>true</param-value>
- </context-param>
- -->
-
<!-- Test Recorder Filter -->
<filter>
<filter-name>TestRecorderFilter</filter-name>
@@ -98,12 +68,6 @@
<dispatcher>INCLUDE</dispatcher>
</filter-mapping>
- <!--
- <listener>
- <listener-class>com.sun.faces.config.ConfigureListener</listener-class>
- </listener>
- -->
-
<!-- Test Recorder Servlet (control channel) -->
<servlet>
<servlet-name>TestRecorderServlet</servlet-name>
@@ -147,15 +111,6 @@
<param-name>config/miscJpf/test13</param-name>
<param-value>/miscJpf/test13/struts-config-test13.xml</param-value>
</init-param>
-
- <init-param>
- <param-name>debug</param-name>
- <param-value>2</param-value>
- </init-param>
- <init-param>
- <param-name>detail</param-name>
- <param-value>2</param-value>
- </init-param>
<load-on-startup>2</load-on-startup>
</servlet>
@@ -205,32 +160,12 @@
<url-pattern>*.xhr</url-pattern>
</servlet-mapping>
- <!-- Faces Servlet -->
- <!--
- <servlet>
- <servlet-name>Faces Servlet</servlet-name>
- <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
- <load-on-startup> 1 </load-on-startup>
- </servlet>
- -->
-
<!-- TestRecorder Control Servlet -->
<servlet-mapping>
<servlet-name>TestRecorderServlet</servlet-name>
<url-pattern>/testRecorder</url-pattern>
</servlet-mapping>
- <!--
- This mapping identifies a jsp page as having JSF content. If a
- request comes to the server for foo.faces, the container will
- send the request to the FacesServlet, which will expect a
- corresponding foo.jsp page to exist containing the content.
- <servlet-mapping>
- <servlet-name>Faces Servlet</servlet-name>
- <url-pattern>*.faces</url-pattern>
- </servlet-mapping>
- -->
-
<welcome-file-list>
<welcome-file>WelcomeFileController.jpf</welcome-file>
<welcome-file>index.jsp</welcome-file>
@@ -242,21 +177,7 @@
</error-page>
<jsp-config>
-<!--
- <taglib>
- <taglib-uri>beehive-netui-tags-html.tld</taglib-uri>
- <taglib-location>/WEB-INF/beehive-netui-tags-html.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>
- <taglib>
- <taglib-uri>beehive-netui-tags-template.tld</taglib-uri>
- <taglib-location>/WEB-INF/beehive-netui-tags-template.tld</taglib-location>
- </taglib>
--->
- <!-- Mock Portal -->
+ <!-- coreWeb: Mock Portal TLD -->
<taglib>
<taglib-uri>mockportal.tld</taglib-uri>
<taglib-location>/WEB-INF/mockportal.tld</taglib-location>
Modified: beehive/trunk/samples/netui-jsf/web/WEB-INF/web.xml.jsf-ri
URL: http://svn.apache.org/viewcvs/beehive/trunk/samples/netui-jsf/web/WEB-INF/web.xml.jsf-ri?rev=371580&r1=371579&r2=371580&view=diff
==============================================================================
--- beehive/trunk/samples/netui-jsf/web/WEB-INF/web.xml.jsf-ri (original)
+++ beehive/trunk/samples/netui-jsf/web/WEB-INF/web.xml.jsf-ri Mon Jan 23 08:35:20 2006
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8" ?>
<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
- 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"
- version="2.4">
+ 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"
+ version="2.4">
- <display-name>Beehive NetUI Samples Web Application</display-name>
+ <display-name>Beehive NetUI JSF Samples Web Application</display-name>
<context-param>
<param-name>com.sun.faces.validateXml</param-name>
@@ -116,21 +116,13 @@
<listener-class>com.sun.faces.config.ConfigureListener</listener-class>
</listener>
- <!-- Action Servlet Configuration (with debugging) -->
+ <!-- NetUI Servlet Configuration -->
<servlet>
<servlet-name>action</servlet-name>
<servlet-class>org.apache.beehive.netui.pageflow.PageFlowActionServlet</servlet-class>
<init-param>
<param-name>config</param-name>
<param-value>/WEB-INF/classes/_pageflow/struts-config.xml</param-value>
- </init-param>
- <init-param>
- <param-name>debug</param-name>
- <param-value>2</param-value>
- </init-param>
- <init-param>
- <param-name>detail</param-name>
- <param-value>2</param-value>
</init-param>
<load-on-startup>2</load-on-startup>
</servlet>
Modified: beehive/trunk/samples/netui-jsf/web/WEB-INF/web.xml.myfaces
URL: http://svn.apache.org/viewcvs/beehive/trunk/samples/netui-jsf/web/WEB-INF/web.xml.myfaces?rev=371580&r1=371579&r2=371580&view=diff
==============================================================================
--- beehive/trunk/samples/netui-jsf/web/WEB-INF/web.xml.myfaces (original)
+++ beehive/trunk/samples/netui-jsf/web/WEB-INF/web.xml.myfaces Mon Jan 23 08:35:20 2006
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8" ?>
<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
- 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"
- version="2.4">
+ 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"
+ version="2.4">
- <display-name>Beehive NetUI Samples Web Application</display-name>
+ <display-name>Beehive NetUI JSF Samples Web Application</display-name>
<!-- Filter to perform Page Flow operations when JSPs are hit directly. -->
<filter>
@@ -93,21 +93,13 @@
<listener-class>org.apache.myfaces.webapp.StartupServletContextListener</listener-class>
</listener>
- <!-- Action Servlet Configuration (with debugging) -->
+ <!-- NetUI Servlet Configuration -->
<servlet>
<servlet-name>action</servlet-name>
<servlet-class>org.apache.beehive.netui.pageflow.PageFlowActionServlet</servlet-class>
<init-param>
<param-name>config</param-name>
<param-value>/WEB-INF/classes/_pageflow/struts-config.xml</param-value>
- </init-param>
- <init-param>
- <param-name>debug</param-name>
- <param-value>2</param-value>
- </init-param>
- <init-param>
- <param-name>detail</param-name>
- <param-value>2</param-value>
</init-param>
<load-on-startup>2</load-on-startup>
</servlet>
Modified: beehive/trunk/samples/netui-samples/web/WEB-INF/web.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/samples/netui-samples/web/WEB-INF/web.xml?rev=371580&r1=371579&r2=371580&view=diff
==============================================================================
--- beehive/trunk/samples/netui-samples/web/WEB-INF/web.xml (original)
+++ beehive/trunk/samples/netui-samples/web/WEB-INF/web.xml Mon Jan 23 08:35:20 2006
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>
<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
- 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"
- version="2.4">
+ 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"
+ version="2.4">
<display-name>Beehive NetUI Samples Web Application</display-name>
@@ -88,21 +88,13 @@
<dispatcher>REQUEST</dispatcher>
</filter-mapping>
- <!-- Action Servlet Configuration (with debugging) -->
+ <!-- NetUI Servlet Configuration -->
<servlet>
<servlet-name>action</servlet-name>
<servlet-class>org.apache.beehive.netui.pageflow.PageFlowActionServlet</servlet-class>
<init-param>
<param-name>config</param-name>
<param-value>/WEB-INF/classes/_pageflow/struts-config.xml</param-value>
- </init-param>
- <init-param>
- <param-name>debug</param-name>
- <param-value>2</param-value>
- </init-param>
- <init-param>
- <param-name>detail</param-name>
- <param-value>2</param-value>
</init-param>
<load-on-startup>2</load-on-startup>
</servlet>
Modified: beehive/trunk/samples/petstoreWeb/web/WEB-INF/web.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/samples/petstoreWeb/web/WEB-INF/web.xml?rev=371580&r1=371579&r2=371580&view=diff
==============================================================================
--- beehive/trunk/samples/petstoreWeb/web/WEB-INF/web.xml (original)
+++ beehive/trunk/samples/petstoreWeb/web/WEB-INF/web.xml Mon Jan 23 08:35:20 2006
@@ -25,21 +25,17 @@
<dispatcher>INCLUDE</dispatcher>
</filter-mapping>
- <!-- Standard Action Servlet Configuration (with debugging) -->
+ <listener>
+ <listener-class>org.apache.beehive.samples.petstore.servlet.Listener</listener-class>
+ </listener>
+
+ <!-- NetUI Servlet Configuration -->
<servlet>
<servlet-name>action</servlet-name>
<servlet-class>org.apache.beehive.netui.pageflow.PageFlowActionServlet</servlet-class>
<init-param>
<param-name>config</param-name>
<param-value>/WEB-INF/classes/_pageflow/struts-config.xml</param-value>
- </init-param>
- <init-param>
- <param-name>debug</param-name>
- <param-value>2</param-value>
- </init-param>
- <init-param>
- <param-name>detail</param-name>
- <param-value>2</param-value>
</init-param>
<load-on-startup>2</load-on-startup>
</servlet>