Author: marino
Date: Tue Feb 22 18:00:04 2005
New Revision: 154927
URL: http://svn.apache.org/viewcvs?view=rev&rev=154927
Log:
step 3 towards improving the structure for struts modularization - also a small
fix in app5 for the new ValidatorTool
Added:
jakarta/velocity-tools/trunk/examples/struts/examples.vm
- copied, changed from r154914,
jakarta/velocity-tools/trunk/examples/struts/doc/examples.vm
jakarta/velocity-tools/trunk/examples/struts/styles.css
- copied, changed from r154914,
jakarta/velocity-tools/trunk/examples/struts/doc/styles.css
Removed:
jakarta/velocity-tools/trunk/examples/struts/doc/
jakarta/velocity-tools/trunk/examples/struts/examples/
Modified:
jakarta/velocity-tools/trunk/examples/struts/WEB-INF/struts-app1-config.xml
jakarta/velocity-tools/trunk/examples/struts/WEB-INF/struts-app2-config.xml
jakarta/velocity-tools/trunk/examples/struts/WEB-INF/struts-app3-config.xml
jakarta/velocity-tools/trunk/examples/struts/WEB-INF/struts-app5-config.xml
jakarta/velocity-tools/trunk/examples/struts/WEB-INF/struts-app6-config.xml
jakarta/velocity-tools/trunk/examples/struts/WEB-INF/struts-config.xml
jakarta/velocity-tools/trunk/examples/struts/WEB-INF/tiles-app4-defs.xml
jakarta/velocity-tools/trunk/examples/struts/WEB-INF/tiles-app7-defs.xml
jakarta/velocity-tools/trunk/examples/struts/app5/validator-demo.jsp
jakarta/velocity-tools/trunk/examples/struts/app5/validator-demo.vm
jakarta/velocity-tools/trunk/examples/struts/app6/any.jsp
jakarta/velocity-tools/trunk/examples/struts/app6/any.vm
jakarta/velocity-tools/trunk/examples/struts/app6/false.jsp
jakarta/velocity-tools/trunk/examples/struts/app6/false.vm
jakarta/velocity-tools/trunk/examples/struts/app6/form.vm
jakarta/velocity-tools/trunk/examples/struts/app6/submitted.vm
jakarta/velocity-tools/trunk/examples/struts/app6/true.jsp
jakarta/velocity-tools/trunk/examples/struts/app6/true.vm
jakarta/velocity-tools/trunk/examples/struts/app7/any.jsp
jakarta/velocity-tools/trunk/examples/struts/app7/any.vm
jakarta/velocity-tools/trunk/examples/struts/app7/false.jsp
jakarta/velocity-tools/trunk/examples/struts/app7/false.vm
jakarta/velocity-tools/trunk/examples/struts/app7/form.vm
jakarta/velocity-tools/trunk/examples/struts/app7/submitted.vm
jakarta/velocity-tools/trunk/examples/struts/app7/true.jsp
jakarta/velocity-tools/trunk/examples/struts/app7/true.vm
jakarta/velocity-tools/trunk/examples/struts/index.vm
Modified:
jakarta/velocity-tools/trunk/examples/struts/WEB-INF/struts-app1-config.xml
URL:
http://svn.apache.org/viewcvs/jakarta/velocity-tools/trunk/examples/struts/WEB-INF/struts-app1-config.xml?view=diff&r1=154926&r2=154927
==============================================================================
--- jakarta/velocity-tools/trunk/examples/struts/WEB-INF/struts-app1-config.xml
(original)
+++ jakarta/velocity-tools/trunk/examples/struts/WEB-INF/struts-app1-config.xml
Tue Feb 22 18:00:04 2005
@@ -5,19 +5,19 @@
<form-bean name="addressForm" type="examples.app1.AddressForm" />
</form-beans>
<global-forwards>
- <forward contextRelative="true" name="editAddressSrcJsp"
path="/examples/struts_app1/edit-addressjsp.txt" />
- <forward contextRelative="true" name="showAddressSrcJsp"
path="/examples/struts_app1/show-addressjsp.txt" />
- <forward contextRelative="true" name="editAddressSrc"
path="/examples/struts_app1/edit-address.txt" />
- <forward contextRelative="true" name="showAddressSrc"
path="/examples/struts_app1/show-address.txt" />
+ <forward name="editAddressSrcJsp" path="/edit-addressjsp.txt" />
+ <forward name="showAddressSrcJsp" path="/show-addressjsp.txt" />
+ <forward name="editAddressSrc" path="/edit-address.txt" />
+ <forward name="showAddressSrc" path="/show-address.txt" />
</global-forwards>
<action-mappings>
<action name="addressForm" path="/address1" scope="request"
type="examples.app1.AddressAction">
- <forward contextRelative="true" name="showAddress"
path="/examples/struts_app1/show-address.jsp" />
- <forward contextRelative="true" name="editAddress"
path="/examples/struts_app1/edit-address.jsp" />
+ <forward name="showAddress" path="/show-address.jsp" />
+ <forward name="editAddress" path="/edit-address.jsp" />
</action>
<action name="addressForm" path="/address2" scope="request"
type="examples.app1.AddressAction">
- <forward contextRelative="true" name="showAddress"
path="/examples/struts_app1/show-address.vm" />
- <forward contextRelative="true" name="editAddress"
path="/examples/struts_app1/edit-address.vm" />
+ <forward name="showAddress" path="/show-address.vm" />
+ <forward name="editAddress" path="/edit-address.vm" />
</action>
</action-mappings>
<message-resources parameter="examples.app1.ApplicationResources" />
Modified:
jakarta/velocity-tools/trunk/examples/struts/WEB-INF/struts-app2-config.xml
URL:
http://svn.apache.org/viewcvs/jakarta/velocity-tools/trunk/examples/struts/WEB-INF/struts-app2-config.xml?view=diff&r1=154926&r2=154927
==============================================================================
--- jakarta/velocity-tools/trunk/examples/struts/WEB-INF/struts-app2-config.xml
(original)
+++ jakarta/velocity-tools/trunk/examples/struts/WEB-INF/struts-app2-config.xml
Tue Feb 22 18:00:04 2005
@@ -4,14 +4,14 @@
<form-beans>
<form-bean name="demoForm" type="examples.app2.DemoForm" />
</form-beans>
- <global-forwards>
- <forward contextRelative="true" name="src"
path="/examples/struts_app2/tool-demo.vm" />
- </global-forwards>
+ <!--global-forwards>
+ <forward name="src" path="/tool-demo.vm" />
+ </global-forwards-->
<action-mappings>
<action name="demoForm" path="/demo" scope="request"
type="examples.app2.DemoAction" validate="false">
- <forward contextRelative="true" name="home"
path="/examples/struts_app2/tool-demo.vm" />
+ <forward name="home" path="/tool-demo.vm" />
</action>
- <action forward="/examples/struts_app2/tool-demo.txt" path="/demoSrc" />
+ <action forward="/tool-demo.txt" path="/demoSrc" />
</action-mappings>
<message-resources parameter="examples.app2.ApplicationResources" />
<plug-in className="org.apache.struts.validator.ValidatorPlugIn">
Modified:
jakarta/velocity-tools/trunk/examples/struts/WEB-INF/struts-app3-config.xml
URL:
http://svn.apache.org/viewcvs/jakarta/velocity-tools/trunk/examples/struts/WEB-INF/struts-app3-config.xml?view=diff&r1=154926&r2=154927
==============================================================================
--- jakarta/velocity-tools/trunk/examples/struts/WEB-INF/struts-app3-config.xml
(original)
+++ jakarta/velocity-tools/trunk/examples/struts/WEB-INF/struts-app3-config.xml
Tue Feb 22 18:00:04 2005
@@ -8,30 +8,30 @@
<forward name="welcome_jsp" path="/welcome_jsp.do" />
<forward name="logon_jsp" path="/logon_jsp.do" />
<forward name="logoff_jsp" path="/logoff_jsp.do" />
- <forward contextRelative="true" name="index_jsp_src"
path="/examples/struts_app3/index_jsp.txt" />
- <forward contextRelative="true" name="logon_jsp_src"
path="/examples/struts_app3/logon_jsp.txt" />
+ <forward name="index_jsp_src" path="/index_jsp.txt" />
+ <forward name="logon_jsp_src" path="/logon_jsp.txt" />
<forward name="welcome_vm" path="/welcome_vm.do" />
<forward name="logon_vm" path="/logon_vm.do" />
<forward name="logoff_vm" path="/logoff_vm.do" />
- <forward contextRelative="true" name="index_vm_src"
path="/examples/struts_app3/index_vm.txt" />
- <forward contextRelative="true" name="logon_vm_src"
path="/examples/struts_app3/logon_vm.txt" />
+ <forward name="index_vm_src" path="/index_vm.txt" />
+ <forward name="logon_vm_src" path="/logon_vm.txt" />
</global-forwards>
<action-mappings>
- <action forward="/examples/struts_app3/index.jsp" path="/welcome_jsp" />
- <action name="logonForm" forward="/examples/struts_app3/logon.jsp"
path="/logon_jsp" scope="request" validate="false" />
- <action input="/examples/struts_app3/logon.jsp" name="logonForm"
path="/logonSubmit_jsp" scope="request" type="examples.app3.LogonAction"
validate="true">
- <forward contextRelative="true" name="continue"
path="/examples/struts_app3/index.jsp" />
+ <action forward="/index.jsp" path="/welcome_jsp" />
+ <action name="logonForm" forward="/logon.jsp" path="/logon_jsp"
scope="request" validate="false" />
+ <action input="/logon.jsp" name="logonForm" path="/logonSubmit_jsp"
scope="request" type="examples.app3.LogonAction" validate="true">
+ <forward name="continue" path="/index.jsp" />
</action>
<action path="/logoff_jsp" type="examples.app3.LogoffAction">
- <forward contextRelative="true" name="continue"
path="/examples/struts_app3/index.jsp" />
+ <forward name="continue" path="/index.jsp" />
</action>
- <action forward="/examples/struts_app3/index.vm" path="/welcome_vm" />
- <action name="logonForm" forward="/examples/struts_app3/logon.vm"
path="/logon_vm" scope="request" validate="false" />
- <action input="/examples/struts_app3/logon.vm" name="logonForm"
path="/logonSubmit_vm" scope="request" type="examples.app3.LogonAction"
validate="true">
- <forward contextRelative="true" name="continue"
path="/examples/struts_app3/index.vm" />
+ <action forward="/index.vm" path="/welcome_vm" />
+ <action name="logonForm" forward="/logon.vm" path="/logon_vm"
scope="request" validate="false" />
+ <action input="/logon.vm" name="logonForm" path="/logonSubmit_vm"
scope="request" type="examples.app3.LogonAction" validate="true">
+ <forward name="continue" path="/index.vm" />
</action>
<action path="/logoff_vm" type="examples.app3.LogoffAction">
- <forward contextRelative="true" name="continue"
path="/examples/struts_app3/index.vm" />
+ <forward name="continue" path="/index.vm" />
</action>
</action-mappings>
<message-resources parameter="examples.app3.ApplicationResources" />
Modified:
jakarta/velocity-tools/trunk/examples/struts/WEB-INF/struts-app5-config.xml
URL:
http://svn.apache.org/viewcvs/jakarta/velocity-tools/trunk/examples/struts/WEB-INF/struts-app5-config.xml?view=diff&r1=154926&r2=154927
==============================================================================
--- jakarta/velocity-tools/trunk/examples/struts/WEB-INF/struts-app5-config.xml
(original)
+++ jakarta/velocity-tools/trunk/examples/struts/WEB-INF/struts-app5-config.xml
Tue Feb 22 18:00:04 2005
@@ -6,18 +6,12 @@
<form-property name="email" type="java.lang.String" />
</form-bean>
</form-beans>
- <global-forwards>
- <forward contextRelative="true" name="demoVm"
path="/examples/struts_app5/validator-demo.vm" />
- <forward contextRelative="true" name="successVm"
path="/examples/struts_app5/success.vm" />
- <forward contextRelative="true" name="demoJsp"
path="/examples/struts_app5/validator-demo.jsp" />
- <forward contextRelative="true" name="successJsp"
path="/examples/struts_app5/success.jsp" />
- </global-forwards>
<action-mappings>
- <action name="emailForm" forward="/examples/struts_app5/validator-demo.vm"
path="/index_vm" validate="false" />
- <action input="/index_vm.do" name="emailForm" forward="successVm"
path="/do_submit_vm" validate="true" />
+ <action name="emailForm" forward="/validator-demo.vm" path="/index_vm"
validate="false" />
+ <action input="/index_vm.do" name="emailForm" forward="/success.vm"
path="/do_submit_vm" validate="true" />
- <action name="emailForm" forward="demoJsp" path="/index_jsp"
validate="false" />
- <action input="/index_jsp.do" name="emailForm" forward="successJsp"
path="/do_submit_jsp" validate="true" />
+ <action name="emailForm" forward="/validator-demo.jsp" path="/index_jsp"
validate="false" />
+ <action input="/index_jsp.do" name="emailForm" forward="/success.jsp"
path="/do_submit_jsp" validate="true" />
</action-mappings>
<message-resources parameter="examples.app5.ApplicationResources" />
<plug-in className="org.apache.struts.validator.ValidatorPlugIn">
Modified:
jakarta/velocity-tools/trunk/examples/struts/WEB-INF/struts-app6-config.xml
URL:
http://svn.apache.org/viewcvs/jakarta/velocity-tools/trunk/examples/struts/WEB-INF/struts-app6-config.xml?view=diff&r1=154926&r2=154927
==============================================================================
--- jakarta/velocity-tools/trunk/examples/struts/WEB-INF/struts-app6-config.xml
(original)
+++ jakarta/velocity-tools/trunk/examples/struts/WEB-INF/struts-app6-config.xml
Tue Feb 22 18:00:04 2005
@@ -8,40 +8,40 @@
</form-bean>
</form-beans>
<action-mappings type="org.apache.struts.config.SecureActionConfig">
- <action forward="/examples/struts_app6/true.vm" path="/true">
+ <action forward="/true.vm" path="/true">
<set-property property="secure" value="true" />
</action>
- <action forward="/examples/struts_app6/false.vm" path="/false">
+ <action forward="/false.vm" path="/false">
<set-property property="secure" value="false" />
</action>
- <action forward="/examples/struts_app6/any.vm" path="/any">
+ <action forward="/any.vm" path="/any">
<set-property property="secure" value="any" />
</action>
- <action name="testForm" forward="/examples/struts_app6/submitted.vm"
path="/secureSubmit">
+ <action name="testForm" forward="/submitted.vm" path="/secureSubmit">
<set-property property="secure" value="true" />
</action>
- <action name="testForm" forward="/examples/struts_app6/submitted.vm"
path="/nonsecureSubmit">
+ <action name="testForm" forward="/submitted.vm" path="/nonsecureSubmit">
<set-property property="secure" value="false" />
</action>
- <action forward="/examples/struts_app6/form.vm" path="/formAction">
+ <action forward="/form.vm" path="/formAction">
<set-property property="secure" value="false" />
</action>
- <action forward="/examples/struts_app6/true.jsp" path="/true_jsp">
+ <action forward="/true.jsp" path="/true_jsp">
<set-property property="secure" value="true" />
</action>
- <action forward="/examples/struts_app6/false.jsp" path="/false_jsp">
+ <action forward="/false.jsp" path="/false_jsp">
<set-property property="secure" value="false" />
</action>
- <action forward="/examples/struts_app6/any.jsp" path="/any_jsp">
+ <action forward="/any.jsp" path="/any_jsp">
<set-property property="secure" value="any" />
</action>
- <action name="testForm" forward="/examples/struts_app6/submitted.jsp"
path="/secureSubmit_jsp">
+ <action name="testForm" forward="/submitted.jsp" path="/secureSubmit_jsp">
<set-property property="secure" value="true" />
</action>
- <action name="testForm" forward="/examples/struts_app6/submitted.jsp"
path="/nonsecureSubmit_jsp">
+ <action name="testForm" forward="/submitted.jsp"
path="/nonsecureSubmit_jsp">
<set-property property="secure" value="false" />
</action>
- <action forward="/examples/struts_app6/form.jsp" path="/formAction_jsp">
+ <action forward="/form.jsp" path="/formAction_jsp">
<set-property property="secure" value="false" />
</action>
</action-mappings>
Modified: jakarta/velocity-tools/trunk/examples/struts/WEB-INF/struts-config.xml
URL:
http://svn.apache.org/viewcvs/jakarta/velocity-tools/trunk/examples/struts/WEB-INF/struts-config.xml?view=diff&r1=154926&r2=154927
==============================================================================
--- jakarta/velocity-tools/trunk/examples/struts/WEB-INF/struts-config.xml
(original)
+++ jakarta/velocity-tools/trunk/examples/struts/WEB-INF/struts-config.xml Tue
Feb 22 18:00:04 2005
@@ -17,13 +17,13 @@
<forward name="app6Jsp" path="/app6/true_jsp.do" redirect="true" />
<forward name="app7" path="/app7/true.do" redirect="true" />
<forward name="app7Jsp" path="/app7/true_jsp.do" redirect="true" />
- <forward name="math" path="/examples/context_tools/mathtool-demo.vm"
redirect="true" />
+ <!--forward name="math" path="/examples/context_tools/mathtool-demo.vm"
redirect="true" />
<forward name="mathSrc" path="/examples/context_tools/mathtool-demo.txt"
redirect="true" />
<forward name="header" path="/examples/request_headers/list.vm"
redirect="true" />
- <forward name="headerJsp" path="/examples/request_headers/list.jsp"
redirect="true" />
+ <forward name="headerJsp" path="/examples/request_headers/list.jsp"
redirect="true" /-->
</global-forwards>
<action-mappings>
<action forward="/index.vm" path="/index" />
- <action forward="/doc/examples.vm" path="/examples" />
+ <action forward="/examples.vm" path="/examples" />
</action-mappings>
</struts-config>
Modified:
jakarta/velocity-tools/trunk/examples/struts/WEB-INF/tiles-app4-defs.xml
URL:
http://svn.apache.org/viewcvs/jakarta/velocity-tools/trunk/examples/struts/WEB-INF/tiles-app4-defs.xml?view=diff&r1=154926&r2=154927
==============================================================================
--- jakarta/velocity-tools/trunk/examples/struts/WEB-INF/tiles-app4-defs.xml
(original)
+++ jakarta/velocity-tools/trunk/examples/struts/WEB-INF/tiles-app4-defs.xml
Tue Feb 22 18:00:04 2005
@@ -4,48 +4,48 @@
<definition name=".common">
<put name="title" value="TilesTool Demo!" />
</definition>
- <definition extends=".common" name=".frontpage"
path="/examples/struts_app4/layout/masterLayout.vm">
+ <definition extends=".common" name=".frontpage"
path="/app4/layout/masterLayout.vm">
<put name="someAttribute" value="some.value" />
<put name="menu" value=".frontpage.menu" />
- <put name="footer" value="/examples/struts_app4/footer.vm" />
+ <put name="footer" value="/app4/footer.vm" />
<put name="body" value=".frontpage.body" />
</definition>
- <definition name=".frontpage.menu"
path="/examples/struts_app4/menu_frontpage.vm">
+ <definition name=".frontpage.menu" path="/app4/menu_frontpage.vm">
<putList name="items">
<item link="http://www.link1.com"; value="Link 1" />
<item link="http://www.link2.com"; value="Link 2" />
</putList>
</definition>
- <definition controllerClass="examples.app4.MyTileController"
name=".frontpage.body" path="/examples/struts_app4/layout/bodyLayout.vm">
- <put name="header" value="/examples/struts_app4/header_frontpage.vm" />
- <put name="body" value="/examples/struts_app4/body_frontpage.vm" />
+ <definition controllerClass="examples.app4.MyTileController"
name=".frontpage.body" path="/app4/layout/bodyLayout.vm">
+ <put name="header" value="/app4/header_frontpage.vm" />
+ <put name="body" value="/app4/body_frontpage.vm" />
</definition>
<definition name=".common.jsp">
<put name="title" value="TilesTool Demo (JSP)!" />
</definition>
- <definition extends=".common.jsp" name=".frontpage.jsp"
path="/examples/struts_app4/layout/masterLayout.jsp">
+ <definition extends=".common.jsp" name=".frontpage.jsp"
path="/app4/layout/masterLayout.jsp">
<put name="someAttribute" value="some.value" />
<put name="body" value=".frontpage.body.jsp" />
<put name="menu" value=".frontpage.menu.jsp" />
- <put name="footer" value="/examples/struts_app4/footer.jsp" />
+ <put name="footer" value="/app4/footer.jsp" />
</definition>
- <definition name=".frontpage.menu.jsp"
path="/examples/struts_app4/menu_frontpage.jsp">
+ <definition name=".frontpage.menu.jsp" path="/app4/menu_frontpage.jsp">
<putList name="items">
<item link="http://www.link1.com"; value="Link 1" />
<item link="http://www.link2.com"; value="Link 2" />
</putList>
</definition>
- <definition controllerClass="examples.app4.MyTileController"
name=".frontpage.body.jsp" path="/examples/struts_app4/layout/bodyLayout.jsp">
- <put name="header" value="/examples/struts_app4/header_frontpage.jsp" />
- <put name="body" value="/examples/struts_app4/body_frontpage.jsp" />
+ <definition controllerClass="examples.app4.MyTileController"
name=".frontpage.body.jsp" path="/app4/layout/bodyLayout.jsp">
+ <put name="header" value="/app4/header_frontpage.jsp" />
+ <put name="body" value="/app4/body_frontpage.jsp" />
</definition>
<definition name=".common.mixed">
<put name="title" value="TilesTool Demo (Mixed)!" />
</definition>
- <definition extends=".common.mixed" name=".frontpage.mixed"
path="/examples/struts_app4/layout/masterLayout.vm">
+ <definition extends=".common.mixed" name=".frontpage.mixed"
path="/app4/layout/masterLayout.vm">
<put name="someAttribute" value="some.value" />
<put name="body" value=".frontpage.body.jsp" />
<put name="menu" value=".frontpage.menu" />
- <put name="footer" value="/examples/struts_app4/footer.jsp" />
+ <put name="footer" value="/app4/footer.jsp" />
</definition>
</tiles-definitions>
Modified:
jakarta/velocity-tools/trunk/examples/struts/WEB-INF/tiles-app7-defs.xml
URL:
http://svn.apache.org/viewcvs/jakarta/velocity-tools/trunk/examples/struts/WEB-INF/tiles-app7-defs.xml?view=diff&r1=154926&r2=154927
==============================================================================
--- jakarta/velocity-tools/trunk/examples/struts/WEB-INF/tiles-app7-defs.xml
(original)
+++ jakarta/velocity-tools/trunk/examples/struts/WEB-INF/tiles-app7-defs.xml
Tue Feb 22 18:00:04 2005
@@ -15,20 +15,20 @@
See the License for the specific language governing permissions and
limitations under the License.
- $Id: tiles-app7-defs.xml,v 1.2 2004/02/20 13:13:42 marino Exp $
+ $Id$
-->
<tiles-definitions>
<definition name=".common">
- <put name="top" value="/examples/struts_app7/top.html" />
+ <put name="top" value="/app7/top.html" />
</definition>
- <definition extends=".common" name=".true"
path="/examples/struts_app7/true.vm" />
- <definition extends=".common" name=".false"
path="/examples/struts_app7/false.vm" />
- <definition extends=".common" name=".any"
path="/examples/struts_app7/any.vm" />
- <definition name=".form" path="/examples/struts_app7/form.vm" />
- <definition name=".submitted" path="/examples/struts_app7/submitted.vm" />
- <definition extends=".common" name=".true.jsp"
path="/examples/struts_app7/true.jsp" />
- <definition extends=".common" name=".false.jsp"
path="/examples/struts_app7/false.jsp" />
- <definition extends=".common" name=".any.jsp"
path="/examples/struts_app7/any.jsp" />
- <definition name=".form.jsp" path="/examples/struts_app7/form.jsp" />
- <definition name=".submitted.jsp" path="/examples/struts_app7/submitted.jsp"
/>
+ <definition extends=".common" name=".true" path="/app7/true.vm" />
+ <definition extends=".common" name=".false" path="/app7/false.vm" />
+ <definition extends=".common" name=".any" path="/app7/any.vm" />
+ <definition name=".form" path="/app7/form.vm" />
+ <definition name=".submitted" path="/app7/submitted.vm" />
+ <definition extends=".common" name=".true.jsp" path="/app7/true.jsp" />
+ <definition extends=".common" name=".false.jsp" path="/app7/false.jsp" />
+ <definition extends=".common" name=".any.jsp" path="/app7/any.jsp" />
+ <definition name=".form.jsp" path="/app7/form.jsp" />
+ <definition name=".submitted.jsp" path="/app7/submitted.jsp" />
</tiles-definitions>
Modified: jakarta/velocity-tools/trunk/examples/struts/app5/validator-demo.jsp
URL:
http://svn.apache.org/viewcvs/jakarta/velocity-tools/trunk/examples/struts/app5/validator-demo.jsp?view=diff&r1=154926&r2=154927
==============================================================================
--- jakarta/velocity-tools/trunk/examples/struts/app5/validator-demo.jsp
(original)
+++ jakarta/velocity-tools/trunk/examples/struts/app5/validator-demo.jsp Tue
Feb 22 18:00:04 2005
@@ -28,7 +28,7 @@
<html:errors/>
- <html:form type="emailForm" action="do_submit_jsp" method="post"
onsubmit="return validateEmailForm(this)">
+ <html:form action="do_submit_jsp" method="post" onsubmit="return
validateEmailForm(this)">
<html:text property="email"/>
<html:submit/>
</html:form>
Modified: jakarta/velocity-tools/trunk/examples/struts/app5/validator-demo.vm
URL:
http://svn.apache.org/viewcvs/jakarta/velocity-tools/trunk/examples/struts/app5/validator-demo.vm?view=diff&r1=154926&r2=154927
==============================================================================
--- jakarta/velocity-tools/trunk/examples/struts/app5/validator-demo.vm
(original)
+++ jakarta/velocity-tools/trunk/examples/struts/app5/validator-demo.vm Tue Feb
22 18:00:04 2005
@@ -28,7 +28,7 @@
#errorMarkup()
- <form action='$link.setAction("do_submit_vm")' method="post"
onsubmit="return validateEmailForm(this)">
+ <form name="$form.name" action="$link.setAction('do_submit_vm')"
method="post" onsubmit="return validateEmailForm(this)">
$text.get("emailForm.label.email") <input type="text"
name="email" value="$!emailForm.email"/>
<input type="submit" name="submit"/>
</form>
Modified: jakarta/velocity-tools/trunk/examples/struts/app6/any.jsp
URL:
http://svn.apache.org/viewcvs/jakarta/velocity-tools/trunk/examples/struts/app6/any.jsp?view=diff&r1=154926&r2=154927
==============================================================================
--- jakarta/velocity-tools/trunk/examples/struts/app6/any.jsp (original)
+++ jakarta/velocity-tools/trunk/examples/struts/app6/any.jsp Tue Feb 22
18:00:04 2005
@@ -25,7 +25,7 @@
<body>
<font size="+4"><center><%=request.getRequestURI()%></center></font>
<br>
-<jsp:include page="top.html"/>
+<jsp:include page="top.html" flush="true"/>
<br>
We are on the any page. The action "any" forwards to this page.
<br>
Modified: jakarta/velocity-tools/trunk/examples/struts/app6/any.vm
URL:
http://svn.apache.org/viewcvs/jakarta/velocity-tools/trunk/examples/struts/app6/any.vm?view=diff&r1=154926&r2=154927
==============================================================================
--- jakarta/velocity-tools/trunk/examples/struts/app6/any.vm (original)
+++ jakarta/velocity-tools/trunk/examples/struts/app6/any.vm Tue Feb 22
18:00:04 2005
@@ -23,17 +23,17 @@
<body>
<font size="+4"><center>$request.getRequestURI()</center></font>
<br>
-#include("/examples/struts_app6/top.html")
+#include("/app6/top.html")
<br>
We are on the any page. The action "any" forwards to this page.
<br>
<br>
-Try the <a href="$slink.setAction("false")">false</a> page.
+Try the <a href="$slink.setAction('false')">false</a> page.
<br>
-Try the <a href="$slink.setAction("true")">true</a> page.
+Try the <a href="$slink.setAction('true')">true</a> page.
<br>
<br>
-Go to <a href="$slink.setAction("formAction")">form</a> test page.
+Go to <a href="$slink.setAction('formAction')">form</a> test page.
</body>
</html>
Modified: jakarta/velocity-tools/trunk/examples/struts/app6/false.jsp
URL:
http://svn.apache.org/viewcvs/jakarta/velocity-tools/trunk/examples/struts/app6/false.jsp?view=diff&r1=154926&r2=154927
==============================================================================
--- jakarta/velocity-tools/trunk/examples/struts/app6/false.jsp (original)
+++ jakarta/velocity-tools/trunk/examples/struts/app6/false.jsp Tue Feb 22
18:00:04 2005
@@ -23,7 +23,7 @@
<body>
<font size="+4"><center><%=request.getRequestURI()%></center></font>
<br>
-<jsp:include page="top.html"/>
+<jsp:include page="top.html" flush="true"/>
<br>
We are on the false page. The non-secure (non-SSL) action "false" forwards to
this page.
<br>
Modified: jakarta/velocity-tools/trunk/examples/struts/app6/false.vm
URL:
http://svn.apache.org/viewcvs/jakarta/velocity-tools/trunk/examples/struts/app6/false.vm?view=diff&r1=154926&r2=154927
==============================================================================
--- jakarta/velocity-tools/trunk/examples/struts/app6/false.vm (original)
+++ jakarta/velocity-tools/trunk/examples/struts/app6/false.vm Tue Feb 22
18:00:04 2005
@@ -21,16 +21,16 @@
<body>
<font size="+4"><center>$request.getRequestURI()</center></font>
<br>
-#include("/examples/struts_app6/top.html")
+#include("/app6/top.html")
<br>
We are on the false page. The non-secure (non-SSL) action "false" forwards to
this page.
<br>
<br>
-Try the <a href="$slink.setAction("true")">true</a> page.
+Try the <a href="$slink.setAction('true')">true</a> page.
<br>
-Try the <a href="$slink.setAction("any")">any</a> page.
+Try the <a href="$slink.setAction('any')">any</a> page.
<br>
<br>
-Go to <a href="$slink.setAction("formAction")">form</a> test page.
+Go to <a href="$slink.setAction('formAction')">form</a> test page.
</body>
</html>
Modified: jakarta/velocity-tools/trunk/examples/struts/app6/form.vm
URL:
http://svn.apache.org/viewcvs/jakarta/velocity-tools/trunk/examples/struts/app6/form.vm?view=diff&r1=154926&r2=154927
==============================================================================
--- jakarta/velocity-tools/trunk/examples/struts/app6/form.vm (original)
+++ jakarta/velocity-tools/trunk/examples/struts/app6/form.vm Tue Feb 22
18:00:04 2005
@@ -25,7 +25,7 @@
We are on the form page. View the page source to see the difference in the
action attribute values between the two forms.
<br>
<br>
-<form action='$slink.setAction("secureSubmit")' >
+<form action="$slink.setAction('secureSubmit')" >
This posts to a secure action.
<br>
<input type="text" name="propA" value="" size="8" maxlength="8" />
@@ -34,7 +34,7 @@
<br>
<input type="submit"/>
</form>
-<form action='$slink.setAction("nonsecureSubmit")' >
+<form action="$slink.setAction('nonsecureSubmit')" >
This posts to a non-secure action.
<br>
<input type="text" name="propA" value="" size="8" maxlength="8" />
Modified: jakarta/velocity-tools/trunk/examples/struts/app6/submitted.vm
URL:
http://svn.apache.org/viewcvs/jakarta/velocity-tools/trunk/examples/struts/app6/submitted.vm?view=diff&r1=154926&r2=154927
==============================================================================
--- jakarta/velocity-tools/trunk/examples/struts/app6/submitted.vm (original)
+++ jakarta/velocity-tools/trunk/examples/struts/app6/submitted.vm Tue Feb 22
18:00:04 2005
@@ -29,13 +29,13 @@
$testForm.propB
<br>
<br>
-Return to <a href="$slink.setAction("formAction")">form</a> test page.
+Return to <a href="$slink.setAction('formAction')">form</a> test page.
<br>
<br>
-Go to <a href="$slink.setAction("true")">true</a> page.
+Go to <a href="$slink.setAction('true')">true</a> page.
<br>
-Go to <a href="$slink.setAction("false")">false</a> page.
+Go to <a href="$slink.setAction('false')">false</a> page.
<br>
-Go to <a href="$slink.setAction("any")">any</a> page.
+Go to <a href="$slink.setAction('any')">any</a> page.
</body>
</html>
Modified: jakarta/velocity-tools/trunk/examples/struts/app6/true.jsp
URL:
http://svn.apache.org/viewcvs/jakarta/velocity-tools/trunk/examples/struts/app6/true.jsp?view=diff&r1=154926&r2=154927
==============================================================================
--- jakarta/velocity-tools/trunk/examples/struts/app6/true.jsp (original)
+++ jakarta/velocity-tools/trunk/examples/struts/app6/true.jsp Tue Feb 22
18:00:04 2005
@@ -24,7 +24,7 @@
<body>
<font size="+4"><center><%=request.getRequestURI()%></center></font>
<br>
-<jsp:include page="top.html"/>
+<jsp:include page="top.html" flush="true"/>
<br>
We are on the true page. The secure (SSL) action "true" forwards to this page.
<br>
Modified: jakarta/velocity-tools/trunk/examples/struts/app6/true.vm
URL:
http://svn.apache.org/viewcvs/jakarta/velocity-tools/trunk/examples/struts/app6/true.vm?view=diff&r1=154926&r2=154927
==============================================================================
--- jakarta/velocity-tools/trunk/examples/struts/app6/true.vm (original)
+++ jakarta/velocity-tools/trunk/examples/struts/app6/true.vm Tue Feb 22
18:00:04 2005
@@ -22,17 +22,17 @@
<body>
<font size="+4"><center>$request.getRequestURI()</center></font>
<br>
-#include("/examples/struts_app6/top.html")
+#include("/app6/top.html")
<br>
We are on the true page. The secure (SSL) action "true" forwards to this page.
<br>
<br>
-Try the <a href="$slink.setAction("false")">false</a> page.
+Try the <a href="$slink.setAction('false')">false</a> page.
<br>
-Try the <a href="$slink.setAction("any")">any</a> page.
+Try the <a href="$slink.setAction('any')">any</a> page.
<br>
<br>
-Go to <a href="$slink.setAction("formAction")">form</a> test page.
+Go to <a href="$slink.setAction('formAction')">form</a> test page.
</body>
</html>
Modified: jakarta/velocity-tools/trunk/examples/struts/app7/any.jsp
URL:
http://svn.apache.org/viewcvs/jakarta/velocity-tools/trunk/examples/struts/app7/any.jsp?view=diff&r1=154926&r2=154927
==============================================================================
--- jakarta/velocity-tools/trunk/examples/struts/app7/any.jsp (original)
+++ jakarta/velocity-tools/trunk/examples/struts/app7/any.jsp Tue Feb 22
18:00:04 2005
@@ -25,7 +25,7 @@
<body>
<font size="+4"><center><%=request.getRequestURI()%></center></font>
<br>
-<jsp:include page="top.html"/>
+<jsp:include page="top.html" flush="true"/>
<br>
We are on the any page. The action "any" forwards to this page.
<br>
Modified: jakarta/velocity-tools/trunk/examples/struts/app7/any.vm
URL:
http://svn.apache.org/viewcvs/jakarta/velocity-tools/trunk/examples/struts/app7/any.vm?view=diff&r1=154926&r2=154927
==============================================================================
--- jakarta/velocity-tools/trunk/examples/struts/app7/any.vm (original)
+++ jakarta/velocity-tools/trunk/examples/struts/app7/any.vm Tue Feb 22
18:00:04 2005
@@ -23,17 +23,17 @@
<body>
<font size="+4"><center>$request.getRequestURI()</center></font>
<br>
-#include("/examples/struts_app7/top.html")
+#include("/app7/top.html")
<br>
We are on the any page. The action "any" forwards to this page.
<br>
<br>
-Try the <a href="$slink.setAction("false")">false</a> page.
+Try the <a href="$slink.setAction('false')">false</a> page.
<br>
-Try the <a href="$slink.setAction("true")">true</a> page.
+Try the <a href="$slink.setAction('true')">true</a> page.
<br>
<br>
-Go to <a href="$slink.setAction("formAction")">form</a> test page.
+Go to <a href="$slink.setAction('formAction')">form</a> test page.
</body>
</html>
Modified: jakarta/velocity-tools/trunk/examples/struts/app7/false.jsp
URL:
http://svn.apache.org/viewcvs/jakarta/velocity-tools/trunk/examples/struts/app7/false.jsp?view=diff&r1=154926&r2=154927
==============================================================================
--- jakarta/velocity-tools/trunk/examples/struts/app7/false.jsp (original)
+++ jakarta/velocity-tools/trunk/examples/struts/app7/false.jsp Tue Feb 22
18:00:04 2005
@@ -23,7 +23,7 @@
<body>
<font size="+4"><center><%=request.getRequestURI()%></center></font>
<br>
-<jsp:include page="top.html"/>
+<jsp:include page="top.html" flush="true"/>
<br>
We are on the false page. The non-secure (non-SSL) action "false" forwards to
this page.
<br>
Modified: jakarta/velocity-tools/trunk/examples/struts/app7/false.vm
URL:
http://svn.apache.org/viewcvs/jakarta/velocity-tools/trunk/examples/struts/app7/false.vm?view=diff&r1=154926&r2=154927
==============================================================================
--- jakarta/velocity-tools/trunk/examples/struts/app7/false.vm (original)
+++ jakarta/velocity-tools/trunk/examples/struts/app7/false.vm Tue Feb 22
18:00:04 2005
@@ -21,16 +21,16 @@
<body>
<font size="+4"><center>$request.getRequestURI()</center></font>
<br>
-#include("/examples/struts_app7/top.html")
+#include("/app7/top.html")
<br>
We are on the false page. The non-secure (non-SSL) action "false" forwards to
this page.
<br>
<br>
-Try the <a href="$slink.setAction("true")">true</a> page.
+Try the <a href="$slink.setAction('true')">true</a> page.
<br>
-Try the <a href="$slink.setAction("any")">any</a> page.
+Try the <a href="$slink.setAction('any')">any</a> page.
<br>
<br>
-Go to <a href="$slink.setAction("formAction")">form</a> test page.
+Go to <a href="$slink.setAction('formAction')">form</a> test page.
</body>
</html>
Modified: jakarta/velocity-tools/trunk/examples/struts/app7/form.vm
URL:
http://svn.apache.org/viewcvs/jakarta/velocity-tools/trunk/examples/struts/app7/form.vm?view=diff&r1=154926&r2=154927
==============================================================================
--- jakarta/velocity-tools/trunk/examples/struts/app7/form.vm (original)
+++ jakarta/velocity-tools/trunk/examples/struts/app7/form.vm Tue Feb 22
18:00:04 2005
@@ -25,7 +25,7 @@
We are on the form page. View the page source to see the difference in the
action attribute values between the two forms.
<br>
<br>
-<form action='$slink.setAction("secureSubmit")' >
+<form action="$slink.setAction('secureSubmit')" >
This posts to a secure action.
<br>
<input type="text" name="propA" value="" size="8" maxlength="8" />
@@ -34,7 +34,7 @@
<br>
<input type="submit"/>
</form>
-<form action='$slink.setAction("nonsecureSubmit")' >
+<form action="$slink.setAction('nonsecureSubmit')" >
This posts to a non-secure action.
<br>
<input type="text" name="propA" value="" size="8" maxlength="8" />
Modified: jakarta/velocity-tools/trunk/examples/struts/app7/submitted.vm
URL:
http://svn.apache.org/viewcvs/jakarta/velocity-tools/trunk/examples/struts/app7/submitted.vm?view=diff&r1=154926&r2=154927
==============================================================================
--- jakarta/velocity-tools/trunk/examples/struts/app7/submitted.vm (original)
+++ jakarta/velocity-tools/trunk/examples/struts/app7/submitted.vm Tue Feb 22
18:00:04 2005
@@ -29,13 +29,13 @@
$testForm.propB
<br>
<br>
-Return to <a href="$slink.setAction("formAction")">form</a> test page.
+Return to <a href="$slink.setAction('formAction')">form</a> test page.
<br>
<br>
-Go to <a href="$slink.setAction("true")">true</a> page.
+Go to <a href="$slink.setAction('true')">true</a> page.
<br>
-Go to <a href="$slink.setAction("false")">false</a> page.
+Go to <a href="$slink.setAction('false')">false</a> page.
<br>
-Go to <a href="$slink.setAction("any")">any</a> page.
+Go to <a href="$slink.setAction('any')">any</a> page.
</body>
</html>
Modified: jakarta/velocity-tools/trunk/examples/struts/app7/true.jsp
URL:
http://svn.apache.org/viewcvs/jakarta/velocity-tools/trunk/examples/struts/app7/true.jsp?view=diff&r1=154926&r2=154927
==============================================================================
--- jakarta/velocity-tools/trunk/examples/struts/app7/true.jsp (original)
+++ jakarta/velocity-tools/trunk/examples/struts/app7/true.jsp Tue Feb 22
18:00:04 2005
@@ -24,7 +24,7 @@
<body>
<font size="+4"><center><%=request.getRequestURI()%></center></font>
<br>
-<jsp:include page="top.html"/>
+<jsp:include page="top.html" flush="true"/>
<br>
We are on the true page. The secure (SSL) action "true" forwards to this page.
<br>
Modified: jakarta/velocity-tools/trunk/examples/struts/app7/true.vm
URL:
http://svn.apache.org/viewcvs/jakarta/velocity-tools/trunk/examples/struts/app7/true.vm?view=diff&r1=154926&r2=154927
==============================================================================
--- jakarta/velocity-tools/trunk/examples/struts/app7/true.vm (original)
+++ jakarta/velocity-tools/trunk/examples/struts/app7/true.vm Tue Feb 22
18:00:04 2005
@@ -22,17 +22,17 @@
<body>
<font size="+4"><center>$request.getRequestURI()</center></font>
<br>
-#include("/examples/struts_app7/top.html")
+#include("/app7/top.html")
<br>
We are on the true page. The secure (SSL) action "true" forwards to this page.
<br>
<br>
-Try the <a href="$slink.setAction("false")">false</a> page.
+Try the <a href="$slink.setAction('false')">false</a> page.
<br>
-Try the <a href="$slink.setAction("any")">any</a> page.
+Try the <a href="$slink.setAction('any')">any</a> page.
<br>
<br>
-Go to <a href="$slink.setAction("formAction")">form</a> test page.
+Go to <a href="$slink.setAction('formAction')">form</a> test page.
</body>
</html>
Copied: jakarta/velocity-tools/trunk/examples/struts/examples.vm (from r154914,
jakarta/velocity-tools/trunk/examples/struts/doc/examples.vm)
URL:
http://svn.apache.org/viewcvs/jakarta/velocity-tools/trunk/examples/struts/examples.vm?view=diff&rev=154927&p1=jakarta/velocity-tools/trunk/examples/struts/doc/examples.vm&r1=154914&p2=jakarta/velocity-tools/trunk/examples/struts/examples.vm&r2=154927
==============================================================================
--- jakarta/velocity-tools/trunk/examples/struts/doc/examples.vm (original)
+++ jakarta/velocity-tools/trunk/examples/struts/examples.vm Tue Feb 22
18:00:04 2005
@@ -27,7 +27,7 @@
<td>
<h2><font color="#FFFFFF"><br>
Velocity for Struts 1.2</font></h2>
- <font color="#FFFFFF">January 25. 2004</font></td>
+ <font color="#FFFFFF">February 22. 2004</font></td>
<td align="right"> </td>
</tr>
</table>
@@ -59,7 +59,7 @@
libraries for JSP.
<ul>
<li><a href="$link.setForward('app2')"
target="demo">Struts View Tools Demo</a>
- (<a
href="$link.setForward('app2Src')">template</a>)</li>
+ (<a href="$link.setForward('app2Src')"
target="demo">template</a>)</li>
</ul>
<p> </p>
</li>
Modified: jakarta/velocity-tools/trunk/examples/struts/index.vm
URL:
http://svn.apache.org/viewcvs/jakarta/velocity-tools/trunk/examples/struts/index.vm?view=diff&r1=154926&r2=154927
==============================================================================
--- jakarta/velocity-tools/trunk/examples/struts/index.vm (original)
+++ jakarta/velocity-tools/trunk/examples/struts/index.vm Tue Feb 22 18:00:04
2005
@@ -13,21 +13,21 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*
- * $Id: index.vm,v 1.4 2004/02/20 13:13:38 marino Exp $
+ * $Id$
*#
<HTML>
<HEAD>
<TITLE>VelocityStruts</TITLE>
- <link rel="stylesheet" href="doc/styles.css" type="text/css">
+ <link rel="stylesheet" href="$link.setRelative('styles.css')"
type="text/css">
</HEAD>
<BODY>
<table width="100%" border="0" cellspacing="0" cellpadding="5">
<tr bgcolor="#000066">
<td>
- <h2><font color="#FFFFFF"><img src="doc/img/spacer.gif" width="520"
height="1"><br>
+ <h2><font color="#FFFFFF"><br>
VelocityStruts</font></h2>
- <font color="#FFFFFF">Version 1.1, january 25. 2004</font></td>
+ <font color="#FFFFFF">Version 1.2, february 22. 2005</font></td>
<td align="right"> </td>
</tr>
</table>
@@ -46,16 +46,17 @@
<li>Velocity is now becoming an alternative view technology for
Struts-based
Web applications.</li>
<li>Velocity templates can be mixed with JSP templates in the same
application.</li>
- <li>No changes are required to Struts. This works with Struts 1.0,
1.01, 1.02, and 1.1.</li>
+ <li>No changes are required to Struts. This works with Struts 1.2.</li>
</ul>
<h5>Status</h5>
<p>A great deal of progress has been made since our 1.0 release. These include
-support for Struts 1.1 features like modules, Tiles, and Validator. For a more
+support for Struts 1.1 features like modules, Tiles, and Validator. These
features have been enhanced further
+to support Struts 1.2. For a more
complete listing, see the project <a
href="http://jakarta.apache.org/velocity/tools/changes.html";>change log</a>.</p>
<h5>Application Examples</h5>
-<p>Seven small <a href="$link.setAction("examples")">application examples</a>
have
+<p>Seven small <a href="$link.setAction('examples')">application examples</a>
have
been included. Look at example 2 for a demonstration of the Velocity
view tools for Struts. JSP versions of some of the examples have
been included to allow a direct comparison of the two view technologies.
Copied: jakarta/velocity-tools/trunk/examples/struts/styles.css (from r154914,
jakarta/velocity-tools/trunk/examples/struts/doc/styles.css)
URL:
http://svn.apache.org/viewcvs/jakarta/velocity-tools/trunk/examples/struts/styles.css?view=diff&rev=154927&p1=jakarta/velocity-tools/trunk/examples/struts/doc/styles.css&r1=154914&p2=jakarta/velocity-tools/trunk/examples/struts/styles.css&r2=154927
==============================================================================
--- jakarta/velocity-tools/trunk/examples/struts/doc/styles.css (original)
+++ jakarta/velocity-tools/trunk/examples/struts/styles.css Tue Feb 22 18:00:04
2005
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*
- * $Id: styles.css,v 1.2 2004/02/20 13:13:36 marino Exp $
+ * $Id$
*/
BODY {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
