Author: husted
Date: Fri Jul 14 13:43:26 2006
New Revision: 422033
URL: http://svn.apache.org/viewvc?rev=422033&view=rev
Log:
STR-2910 Update DTD; try to add a home page for Apps, describing each example,
but when I try to build it, the old starter page keeps coming up.
Modified:
struts/struts1/trunk/apps/cookbook/src/main/webapp/WEB-INF/struts-config.xml
struts/struts1/trunk/apps/faces-example1/src/main/webapp/WEB-INF/struts-config.xml
struts/struts1/trunk/apps/strutsel-exercise-taglib/src/main/webapp/WEB-INF/struts-config.xml
Modified:
struts/struts1/trunk/apps/cookbook/src/main/webapp/WEB-INF/struts-config.xml
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/apps/cookbook/src/main/webapp/WEB-INF/struts-config.xml?rev=422033&r1=422032&r2=422033&view=diff
==============================================================================
---
struts/struts1/trunk/apps/cookbook/src/main/webapp/WEB-INF/struts-config.xml
(original)
+++
struts/struts1/trunk/apps/cookbook/src/main/webapp/WEB-INF/struts-config.xml
Fri Jul 14 13:43:26 2006
@@ -5,91 +5,91 @@
<struts-config>
- <!-- ========== Form Bean Definitions
================================== -->
- <form-beans>
- <!-- Simple ActionForm Bean -->
- <form-bean name="simpleForm"
type="examples.simple.SimpleActionForm"/>
-
- <!-- DynaActionForm Bean for Dyna -->
- <form-bean name="dynaForm"
type="org.apache.struts.action.DynaActionForm">
- <form-property name="name" type="java.lang.String" />
- <form-property name="secret" type="java.lang.String" />
- <form-property name="color" type="java.lang.String" />
- <form-property name="confirm" type="java.lang.Boolean"
/>
- <form-property name="rating" type="java.lang.String" />
- <form-property name="message" type="java.lang.String" />
- <form-property name="hidden" type="java.lang.String" />
- </form-bean>
-
- <!-- DynaActionForm Bean for Options -->
- <form-bean name="optionsForm"
type="org.apache.struts.action.DynaActionForm">
- <form-property name="fruit1" type="java.lang.String"
initial="Pear" />
- <form-property name="fruit2" type="java.lang.String"
initial="Apple" />
- <form-property name="fruit3" type="java.lang.String[]"
initial="Banana Orange" />
- <form-property name="color1" type="java.lang.String" />
- <form-property name="color2" type="java.lang.String" />
- <form-property name="color3" type="java.lang.String" />
- <form-property name="day1" type="java.lang.String" />
- <form-property name="day2" type="java.lang.String" />
- <form-property name="book1" type="java.lang.String" />
- <form-property name="book2" type="java.lang.String" />
- <form-property name="animal1" type="java.lang.String" />
- <form-property name="animal2" type="java.lang.String" />
- </form-bean>
-
- <!-- ActionForm Bean for Multibox -->
- <form-bean name="multiboxForm"
type="examples.multibox.MultiboxActionForm"/>
-
- <!-- DynaActionForm Bean for Bean -->
- <form-bean name="beanForm"
type="org.apache.struts.action.DynaActionForm">
- </form-bean>
-
- <!-- General Test Form -->
- <form-bean name="testForm"
type="org.apache.struts.action.DynaActionForm">
- <form-property name="name" type="java.lang.String" />
- <form-property name="secret" type="java.lang.String" />
- <form-property name="color" type="java.lang.String" />
- <form-property name="confirm" type="java.lang.Boolean"
/>
- <form-property name="rating" type="java.lang.String" />
- <form-property name="message" type="java.lang.String" />
- <form-property name="hidden" type="java.lang.String" />
- </form-bean>
-
- <!-- DynaActionForm Bean for Validator -->
- <form-bean name="validatorForm"
type="org.apache.struts.validator.DynaValidatorForm">
- <form-property name="byteValue" type="java.lang.String"
/>
- <form-property name="creditCard"
type="java.lang.String" />
- <form-property name="date" type="java.lang.String" />
- <form-property name="doubleValue"
type="java.lang.String" />
- <form-property name="email" type="java.lang.String" />
- <form-property name="floatValue"
type="java.lang.String" />
- <form-property name="integerValue"
type="java.lang.String" />
- <form-property name="longValue" type="java.lang.String"
/>
- <form-property name="mask" type="java.lang.String" />
- <form-property name="min" type="java.lang.String" />
- <form-property name="max" type="java.lang.String" />
- <form-property name="range" type="java.lang.String" />
- <form-property name="required" type="java.lang.String"
/>
- <form-property name="shortValue"
type="java.lang.String" />
- <form-property name="password" type="java.lang.String"
/>
- <form-property name="password2" type="java.lang.String"
/>
-
- </form-bean>
-
- </form-beans>
-
- <!-- ========= Global Exception Definitions
============================ -->
- <global-exceptions>
- </global-exceptions>
-
- <!-- ========== Global Forward Definitions
============================= -->
-
- <global-forwards>
- <forward name="home" path="/Home.do"/>
- </global-forwards>
+ <!-- ========== Form Bean Definitions ==================================
-->
+ <form-beans>
+ <!-- Simple ActionForm Bean -->
+ <form-bean name="simpleForm" type="examples.simple.SimpleActionForm"/>
+
+ <!-- DynaActionForm Bean for Dyna -->
+ <form-bean name="dynaForm"
type="org.apache.struts.action.DynaActionForm">
+ <form-property name="name" type="java.lang.String" />
+ <form-property name="secret" type="java.lang.String" />
+ <form-property name="color" type="java.lang.String" />
+ <form-property name="confirm" type="java.lang.Boolean" />
+ <form-property name="rating" type="java.lang.String" />
+ <form-property name="message" type="java.lang.String" />
+ <form-property name="hidden" type="java.lang.String" />
+ </form-bean>
+
+ <!-- DynaActionForm Bean for Options -->
+ <form-bean name="optionsForm"
type="org.apache.struts.action.DynaActionForm">
+ <form-property name="fruit1" type="java.lang.String"
initial="Pear" />
+ <form-property name="fruit2" type="java.lang.String"
initial="Apple" />
+ <form-property name="fruit3" type="java.lang.String[]"
initial="Banana Orange" />
+ <form-property name="color1" type="java.lang.String" />
+ <form-property name="color2" type="java.lang.String" />
+ <form-property name="color3" type="java.lang.String" />
+ <form-property name="day1" type="java.lang.String" />
+ <form-property name="day2" type="java.lang.String" />
+ <form-property name="book1" type="java.lang.String" />
+ <form-property name="book2" type="java.lang.String" />
+ <form-property name="animal1" type="java.lang.String" />
+ <form-property name="animal2" type="java.lang.String" />
+ </form-bean>
+
+ <!-- ActionForm Bean for Multibox -->
+ <form-bean name="multiboxForm"
type="examples.multibox.MultiboxActionForm"/>
+
+ <!-- DynaActionForm Bean for Bean -->
+ <form-bean name="beanForm"
type="org.apache.struts.action.DynaActionForm">
+ </form-bean>
+
+ <!-- General Test Form -->
+ <form-bean name="testForm"
type="org.apache.struts.action.DynaActionForm">
+ <form-property name="name" type="java.lang.String" />
+ <form-property name="secret" type="java.lang.String" />
+ <form-property name="color" type="java.lang.String" />
+ <form-property name="confirm" type="java.lang.Boolean" />
+ <form-property name="rating" type="java.lang.String" />
+ <form-property name="message" type="java.lang.String" />
+ <form-property name="hidden" type="java.lang.String" />
+ </form-bean>
+
+ <!-- DynaActionForm Bean for Validator -->
+ <form-bean name="validatorForm"
type="org.apache.struts.validator.DynaValidatorForm">
+ <form-property name="byteValue" type="java.lang.String" />
+ <form-property name="creditCard" type="java.lang.String" />
+ <form-property name="date" type="java.lang.String" />
+ <form-property name="doubleValue" type="java.lang.String" />
+ <form-property name="email" type="java.lang.String" />
+ <form-property name="floatValue" type="java.lang.String" />
+ <form-property name="integerValue" type="java.lang.String" />
+ <form-property name="longValue" type="java.lang.String" />
+ <form-property name="mask" type="java.lang.String" />
+ <form-property name="min" type="java.lang.String" />
+ <form-property name="max" type="java.lang.String" />
+ <form-property name="range" type="java.lang.String" />
+ <form-property name="required" type="java.lang.String" />
+ <form-property name="shortValue" type="java.lang.String" />
+ <form-property name="password" type="java.lang.String" />
+ <form-property name="password2" type="java.lang.String" />
+
+ </form-bean>
+
+ </form-beans>
+
+ <!-- ========= Global Exception Definitions ============================
-->
+ <global-exceptions>
+ </global-exceptions>
+
+ <!-- ========== Global Forward Definitions =============================
-->
+
+ <global-forwards>
+ <forward name="home" path="/Home.do"/>
+ </global-forwards>
- <!-- ========== Action Mapping Definitions
============================= -->
- <action-mappings>
+ <!-- ========== Action Mapping Definitions =============================
-->
+ <action-mappings>
<action path="/Home" type="examples.SuccessAction">
<forward name="success" path="/index.jsp" redirect="true"/>
@@ -97,169 +97,169 @@
<!-- Simple ActionForm Example =====================================
-->
- <action path="/prepareSimple"
- type="examples.SuccessAction">
- <forward name="success" path="/jsp/simple/Simple.jsp"/>
- </action>
-
- <action path="/processSimple"
- type="examples.simple.ProcessSimpleAction"
- name="simpleForm"
- scope="request"
- input="/jsp/simple/Simple.jsp"
+ <action path="/prepareSimple"
+ type="examples.SuccessAction">
+ <forward name="success" path="/jsp/simple/Simple.jsp"/>
+ </action>
+
+ <action path="/processSimple"
+ type="examples.simple.ProcessSimpleAction"
+ name="simpleForm"
+ scope="request"
+ input="/jsp/simple/Simple.jsp"
cancellable="true"
validate="true">
- <forward name="success"
path="/jsp/simple/SimpleResults.jsp"/>
- </action>
+ <forward name="success" path="/jsp/simple/SimpleResults.jsp"/>
+ </action>
- <!-- DynaActionForm Example
======================================== -->
+ <!-- DynaActionForm Example ========================================
-->
- <action path="/prepareDyna"
- type="examples.SuccessAction">
- <forward name="success" path="/jsp/dyna/Dyna.jsp"/>
- </action>
-
- <action path="/processDyna"
- type="examples.dyna.ProcessDynaAction"
- name="dynaForm"
- scope="request"
- input="/jsp/dyna/Dyna.jsp"
- validate="false">
- <forward name="success"
path="/jsp/dyna/DynaResults.jsp"/>
- </action>
-
- <!-- Options Example
=============================================== -->
-
- <action path="/prepareOptions"
- type="examples.options.PrepareOptionsAction">
- <forward name="success"
path="/jsp/options/Options.jsp"/>
- </action>
-
- <action path="/processOptions"
- type="examples.options.ProcessOptionsAction"
- name="optionsForm"
- scope="request"
- input="/jsp/options/Options.jsp"
- validate="false">
- <forward name="success"
path="/jsp/options/OptionsResults.jsp"/>
- </action>
-
- <!-- Mutibox Example
=============================================== -->
-
- <action path="/prepareMultibox"
- type="examples.multibox.PrepareMultiboxAction"
- name="multiboxForm"
- scope="request"
- validate="false">
- <forward name="success"
path="/jsp/multibox/Multibox.jsp"/>
- </action>
-
- <action path="/processMultibox"
- type="examples.multibox.ProcessMultiboxAction"
- name="multiboxForm"
- scope="request"
- input="/jsp/multibox/Multibox.jsp"
- validate="false">
- <forward name="success"
path="/jsp/multibox/MultiboxResults.jsp"/>
- </action>
-
- <!-- Bean Tags Example
============================================= -->
-
- <action path="/prepareBean"
- type="examples.bean.PrepareBeanAction">
- <forward name="success" path="/jsp/bean/Bean.jsp"/>
- </action>
-
- <!-- Links Tags Example
============================================ -->
-
- <action path="/prepareLinks"
- type="examples.links.PrepareLinksAction">
- <forward name="success" path="/jsp/links/Links.jsp"/>
- </action>
-
- <action path="/processLinks"
- type="examples.links.ProcessLinksAction"
- name="testForm"
- scope="request"
- input="/jsp/links/Links.jsp"
- validate="false">
- <forward name="success"
path="/jsp/links/LinksResults.jsp"/>
- </action>
-
- <!-- Logic Tags Example
============================================ -->
-
- <action path="/prepareLogic"
- type="examples.logic.PrepareLogicAction">
- <forward name="success" path="/jsp/logic/Logic.jsp"/>
- </action>
-
- <!-- Validator Example
============================================= -->
-
- <action path="/prepareValidator"
- type="examples.SuccessAction">
- <forward name="success"
path="/jsp/validator/Validator.jsp"/>
- </action>
-
- <action path="/processValidator"
- type="examples.validator.ProcessValidatorAction"
- name="validatorForm"
- scope="request"
- input="/jsp/validator/Validator.jsp"
+ <action path="/prepareDyna"
+ type="examples.SuccessAction">
+ <forward name="success" path="/jsp/dyna/Dyna.jsp"/>
+ </action>
+
+ <action path="/processDyna"
+ type="examples.dyna.ProcessDynaAction"
+ name="dynaForm"
+ scope="request"
+ input="/jsp/dyna/Dyna.jsp"
+ validate="false">
+ <forward name="success" path="/jsp/dyna/DynaResults.jsp"/>
+ </action>
+
+ <!-- Options Example ===============================================
-->
+
+ <action path="/prepareOptions"
+ type="examples.options.PrepareOptionsAction">
+ <forward name="success" path="/jsp/options/Options.jsp"/>
+ </action>
+
+ <action path="/processOptions"
+ type="examples.options.ProcessOptionsAction"
+ name="optionsForm"
+ scope="request"
+ input="/jsp/options/Options.jsp"
+ validate="false">
+ <forward name="success" path="/jsp/options/OptionsResults.jsp"/>
+ </action>
+
+ <!-- Mutibox Example ===============================================
-->
+
+ <action path="/prepareMultibox"
+ type="examples.multibox.PrepareMultiboxAction"
+ name="multiboxForm"
+ scope="request"
+ validate="false">
+ <forward name="success" path="/jsp/multibox/Multibox.jsp"/>
+ </action>
+
+ <action path="/processMultibox"
+ type="examples.multibox.ProcessMultiboxAction"
+ name="multiboxForm"
+ scope="request"
+ input="/jsp/multibox/Multibox.jsp"
+ validate="false">
+ <forward name="success" path="/jsp/multibox/MultiboxResults.jsp"/>
+ </action>
+
+ <!-- Bean Tags Example =============================================
-->
+
+ <action path="/prepareBean"
+ type="examples.bean.PrepareBeanAction">
+ <forward name="success" path="/jsp/bean/Bean.jsp"/>
+ </action>
+
+ <!-- Links Tags Example ============================================
-->
+
+ <action path="/prepareLinks"
+ type="examples.links.PrepareLinksAction">
+ <forward name="success" path="/jsp/links/Links.jsp"/>
+ </action>
+
+ <action path="/processLinks"
+ type="examples.links.ProcessLinksAction"
+ name="testForm"
+ scope="request"
+ input="/jsp/links/Links.jsp"
+ validate="false">
+ <forward name="success" path="/jsp/links/LinksResults.jsp"/>
+ </action>
+
+ <!-- Logic Tags Example ============================================
-->
+
+ <action path="/prepareLogic"
+ type="examples.logic.PrepareLogicAction">
+ <forward name="success" path="/jsp/logic/Logic.jsp"/>
+ </action>
+
+ <!-- Validator Example =============================================
-->
+
+ <action path="/prepareValidator"
+ type="examples.SuccessAction">
+ <forward name="success" path="/jsp/validator/Validator.jsp"/>
+ </action>
+
+ <action path="/processValidator"
+ type="examples.validator.ProcessValidatorAction"
+ name="validatorForm"
+ scope="request"
+ input="/jsp/validator/Validator.jsp"
cancellable="true"
validate="true">
- <forward name="success"
path="/jsp/validator/ValidatorResults.jsp"/>
- </action>
+ <forward name="success"
path="/jsp/validator/ValidatorResults.jsp"/>
+ </action>
- <!-- Messages Tags Example
========================================= -->
+ <!-- Messages Tags Example =========================================
-->
- <action path="/prepareMessages"
- type="examples.SuccessAction">
- <forward name="success"
path="/jsp/messages/Messages.jsp"/>
- </action>
-
- <!-- Localization Tags Example
===================================== -->
-
- <action path="/prepareLocalization"
- type="examples.SuccessAction">
- <forward name="success"
path="/jsp/localization/Localization.jsp"/>
- </action>
-
- <action path="/processLocalization"
-
type="examples.localization.ProcessLocalizationAction"
- name="testForm"
- scope="request"
- input="/jsp/localization/Localization.jsp"
- validate="false">
- <forward name="success"
path="/jsp/localization/Localization.jsp"/>
- </action>
-
- <!-- Token Tags Example
============================================ -->
-
- <action path="/prepareToken"
- type="examples.token.PrepareTokenAction">
- <forward name="success" path="/jsp/token/Token.jsp"/>
- </action>
-
- <action path="/processToken"
- type="examples.token.ProcessTokenAction"
- name="testForm"
- scope="request"
- input="/jsp/token/Token.jsp"
- validate="false">
- <forward name="success"
path="/jsp/token/TokenResults.jsp"/>
- </action>
-
- </action-mappings>
-
- <!-- ========== Message Resources Definitions
=========================== -->
-
- <message-resources parameter="examples.MessageResources" />
-
- <!-- ========== Plug Ins Configuration
================================== -->
- <plug-in className="org.apache.struts.validator.ValidatorPlugIn">
- <set-property property="pathnames"
-
value="/org/apache/struts/validator/validator-rules.xml,
- /WEB-INF/validation.xml" />
+ <action path="/prepareMessages"
+ type="examples.SuccessAction">
+ <forward name="success" path="/jsp/messages/Messages.jsp"/>
+ </action>
+
+ <!-- Localization Tags Example =====================================
-->
+
+ <action path="/prepareLocalization"
+ type="examples.SuccessAction">
+ <forward name="success" path="/jsp/localization/Localization.jsp"/>
+ </action>
+
+ <action path="/processLocalization"
+ type="examples.localization.ProcessLocalizationAction"
+ name="testForm"
+ scope="request"
+ input="/jsp/localization/Localization.jsp"
+ validate="false">
+ <forward name="success" path="/jsp/localization/Localization.jsp"/>
+ </action>
+
+ <!-- Token Tags Example ============================================
-->
+
+ <action path="/prepareToken"
+ type="examples.token.PrepareTokenAction">
+ <forward name="success" path="/jsp/token/Token.jsp"/>
+ </action>
+
+ <action path="/processToken"
+ type="examples.token.ProcessTokenAction"
+ name="testForm"
+ scope="request"
+ input="/jsp/token/Token.jsp"
+ validate="false">
+ <forward name="success" path="/jsp/token/TokenResults.jsp"/>
+ </action>
+
+ </action-mappings>
+
+ <!-- ========== Message Resources Definitions ===========================
-->
+
+ <message-resources parameter="examples.MessageResources" />
+
+ <!-- ========== Plug Ins Configuration ==================================
-->
+ <plug-in className="org.apache.struts.validator.ValidatorPlugIn">
+ <set-property property="pathnames"
+ value="/org/apache/struts/validator/validator-rules.xml,
+ /WEB-INF/validation.xml" />
</plug-in>
</struts-config>
Modified:
struts/struts1/trunk/apps/faces-example1/src/main/webapp/WEB-INF/struts-config.xml
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/apps/faces-example1/src/main/webapp/WEB-INF/struts-config.xml?rev=422033&r1=422032&r2=422033&view=diff
==============================================================================
---
struts/struts1/trunk/apps/faces-example1/src/main/webapp/WEB-INF/struts-config.xml
(original)
+++
struts/struts1/trunk/apps/faces-example1/src/main/webapp/WEB-INF/struts-config.xml
Fri Jul 14 13:43:26 2006
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="ISO-8859-1" ?>
<!DOCTYPE struts-config PUBLIC
- "-//Apache Software Foundation//DTD Struts Configuration 1.1//EN"
- "http://jakarta.apache.org/struts/dtds/struts-config_1_1.dtd";>
+ "-//Apache Software Foundation//DTD Struts Configuration 1.3//EN"
+ "http://struts.apache.org/dtds/struts-config_1_3.dtd";>
<!--
Modified:
struts/struts1/trunk/apps/strutsel-exercise-taglib/src/main/webapp/WEB-INF/struts-config.xml
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/apps/strutsel-exercise-taglib/src/main/webapp/WEB-INF/struts-config.xml?rev=422033&r1=422032&r2=422033&view=diff
==============================================================================
---
struts/struts1/trunk/apps/strutsel-exercise-taglib/src/main/webapp/WEB-INF/struts-config.xml
(original)
+++
struts/struts1/trunk/apps/strutsel-exercise-taglib/src/main/webapp/WEB-INF/struts-config.xml
Fri Jul 14 13:43:26 2006
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="ISO-8859-1" ?>
<!DOCTYPE struts-config PUBLIC
- "-//Apache Software Foundation//DTD Struts Configuration 1.1//EN"
- "http://jakarta.apache.org/struts/dtds/struts-config_1_1.dtd";>
+ "-//Apache Software Foundation//DTD Struts Configuration 1.3//EN"
+ "http://struts.apache.org/dtds/struts-config_1_3.dtd";>
<struts-config>
