husted 2004/03/08 20:40:53
Modified: web/example/WEB-INF web.xml struts-config.xml
struts-config-registration.xml
Log:
Add generic Error page, license references.
Revision Changes Path
1.20 +6 -0 jakarta-struts/web/example/WEB-INF/web.xml
Index: web.xml
===================================================================
RCS file: /home/cvs/jakarta-struts/web/example/WEB-INF/web.xml,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- web.xml 7 Mar 2004 20:29:31 -0000 1.19
+++ web.xml 9 Mar 2004 04:40:53 -0000 1.20
@@ -31,6 +31,12 @@
<welcome-file>index.jsp</welcome-file>
</welcome-file-list>
+ <!-- The default error page -->
+ <error-page>
+ <exception-type>java.lang.Exception</exception-type>
+ <location>\Error.jsp</location>
+ </error-page>
+
<!-- Application Tag Library Descriptor -->
<taglib>
<taglib-uri>/tags/app</taglib-uri>
1.39 +25 -7 jakarta-struts/web/example/WEB-INF/struts-config.xml
Index: struts-config.xml
===================================================================
RCS file: /home/cvs/jakarta-struts/web/example/WEB-INF/struts-config.xml,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- struts-config.xml 7 Mar 2004 20:22:52 -0000 1.38
+++ struts-config.xml 9 Mar 2004 04:40:53 -0000 1.39
@@ -1,10 +1,26 @@
<?xml version="1.0" encoding="ISO-8859-1" ?>
-
<!DOCTYPE struts-config PUBLIC
"-//Apache Software Foundation//DTD Struts Configuration 1.2//EN"
"http://jakarta.apache.org/struts/dtds/struts-config_1_2.dtd";>
-
-
+<!--
+ $Header$
+ $Revision$
+ $Date$
+
+ Copyright 2000-2004 Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
<struts-config>
<display-name><![CDATA[
account maintenance
@@ -45,11 +61,14 @@
<!-- Display welcome page -->
<action path="/welcome"
- forward="/welcome.jsp"/>
+ type="org.apache.struts.webapp.example.WelcomeAction">
+ <forward name="failure" path="/Error.jsp" />
+ <forward name="success" path="/welcome.jsp" />
+ </action>
<!-- Display registration page -->
<action path="/registration"
- forward="/registration.jsp"/>
+ forward="/Registration.jsp"/>
<!-- Display logon page -->
<action path="/mainMenu"
@@ -120,8 +139,7 @@
<message-resources
parameter="org.apache.struts.webapp.example.AlternateApplicationResources"
- key="alternate">
- </message-resources>
+ key="alternate"/>
<!-- ========== Plug Ins Configuration ================================== -->
1.6 +20 -3
jakarta-struts/web/example/WEB-INF/struts-config-registration.xml
Index: struts-config-registration.xml
===================================================================
RCS file:
/home/cvs/jakarta-struts/web/example/WEB-INF/struts-config-registration.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- struts-config-registration.xml 21 Dec 2003 22:43:52 -0000 1.5
+++ struts-config-registration.xml 9 Mar 2004 04:40:53 -0000 1.6
@@ -1,9 +1,26 @@
<?xml version="1.0" encoding="ISO-8859-1" ?>
-
<!DOCTYPE struts-config PUBLIC
"-//Apache Software Foundation//DTD Struts Configuration 1.2//EN"
"http://jakarta.apache.org/struts/dtds/struts-config_1_2.dtd";>
-
+<!--
+ $Header$
+ $Revision$
+ $Date$
+
+ Copyright 2000-2004 Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
<struts-config>
<display-name><![CDATA[
registration
@@ -26,7 +43,7 @@
<!-- ========== Global Forward Definitions ============================== -->
<global-forwards>
- <forward name="Registration" path="/registration.jsp"/>
+ <forward name="Registration" path="/Registration.jsp"/>
</global-forwards>
<!-- ========== Action Mapping Definitions ============================== -->
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
