Author: nbubna
Date: Sat Oct 22 12:11:27 2005
New Revision: 327683
URL: http://svn.apache.org/viewcvs?rev=327683&view=rev
Log:
apply further fixes to velstruts example (from Niall Pemberton, Issues
VELTOOLS-53, VELTOOLS-54
Modified:
jakarta/velocity/tools/trunk/examples/struts/WEB-INF/struts-admin-config.xml
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-app4-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-app7-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/WEB-INF/validation.xml
jakarta/velocity/tools/trunk/examples/struts/app1/edit-address.jsp
Modified:
jakarta/velocity/tools/trunk/examples/struts/WEB-INF/struts-admin-config.xml
URL:
http://svn.apache.org/viewcvs/jakarta/velocity/tools/trunk/examples/struts/WEB-INF/struts-admin-config.xml?rev=327683&r1=327682&r2=327683&view=diff
==============================================================================
---
jakarta/velocity/tools/trunk/examples/struts/WEB-INF/struts-admin-config.xml
(original)
+++
jakarta/velocity/tools/trunk/examples/struts/WEB-INF/struts-admin-config.xml
Sat Oct 22 12:11:27 2005
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE struts-config PUBLIC "-//Apache Software Foundation//DTD Struts
Configuration 1.2//EN"
"http://jakarta.apache.org/struts/dtds/struts-config_1_2.dtd";>
+<!DOCTYPE struts-config PUBLIC "-//Apache Software Foundation//DTD Struts
Configuration 1.2//EN" "http://struts.apache.org/dtds/struts-config_1_2.dtd";>
<struts-config>
<action-mappings>
<action path="/admin/addFormBean"
type="org.apache.struts.actions.AddFormBeanAction" />
@@ -10,7 +10,4 @@
<action path="/admin/removeForward"
type="org.apache.struts.actions.RemoveForwardAction" />
<action path="/admin/removeMapping"
type="org.apache.struts.actions.RemoveMappingAction" />
</action-mappings>
- <plug-in className="org.apache.struts.validator.ValidatorPlugIn">
- <set-property property="pathnames"
value="/WEB-INF/validator-rules.xml,/WEB-INF/validation.xml" />
- </plug-in>
</struts-config>
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?rev=327683&r1=327682&r2=327683&view=diff
==============================================================================
--- 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
Sat Oct 22 12:11:27 2005
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE struts-config PUBLIC "-//Apache Software Foundation//DTD Struts
Configuration 1.2//EN"
"http://jakarta.apache.org/struts/dtds/struts-config_1_2.dtd";>
+<!DOCTYPE struts-config PUBLIC "-//Apache Software Foundation//DTD Struts
Configuration 1.2//EN" "http://struts.apache.org/dtds/struts-config_1_2.dtd";>
<struts-config>
<form-beans>
<form-bean name="addressForm" type="examples.app1.AddressForm" />
@@ -21,7 +21,4 @@
</action>
</action-mappings>
<message-resources parameter="examples.app1.ApplicationResources" />
- <plug-in className="org.apache.struts.validator.ValidatorPlugIn">
- <set-property property="pathnames"
value="/WEB-INF/validator-rules.xml,/WEB-INF/validation.xml" />
- </plug-in>
</struts-config>
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?rev=327683&r1=327682&r2=327683&view=diff
==============================================================================
--- 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
Sat Oct 22 12:11:27 2005
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE struts-config PUBLIC "-//Apache Software Foundation//DTD Struts
Configuration 1.2//EN"
"http://jakarta.apache.org/struts/dtds/struts-config_1_2.dtd";>
+<!DOCTYPE struts-config PUBLIC "-//Apache Software Foundation//DTD Struts
Configuration 1.2//EN" "http://struts.apache.org/dtds/struts-config_1_2.dtd";>
<struts-config>
<form-beans>
<form-bean name="demoForm" type="examples.app2.DemoForm" />
@@ -14,7 +14,4 @@
<action forward="/tool-demo.txt" path="/demoSrc" />
</action-mappings>
<message-resources parameter="examples.app2.ApplicationResources" />
- <plug-in className="org.apache.struts.validator.ValidatorPlugIn">
- <set-property property="pathnames"
value="/WEB-INF/validator-rules.xml,/WEB-INF/validation.xml" />
- </plug-in>
</struts-config>
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?rev=327683&r1=327682&r2=327683&view=diff
==============================================================================
--- 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
Sat Oct 22 12:11:27 2005
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE struts-config PUBLIC "-//Apache Software Foundation//DTD Struts
Configuration 1.2//EN"
"http://jakarta.apache.org/struts/dtds/struts-config_1_2.dtd";>
+<!DOCTYPE struts-config PUBLIC "-//Apache Software Foundation//DTD Struts
Configuration 1.2//EN" "http://struts.apache.org/dtds/struts-config_1_2.dtd";>
<struts-config>
<form-beans>
<form-bean name="logonForm" type="examples.app3.LogonForm" />
@@ -35,7 +35,4 @@
</action>
</action-mappings>
<message-resources parameter="examples.app3.ApplicationResources" />
- <plug-in className="org.apache.struts.validator.ValidatorPlugIn">
- <set-property property="pathnames"
value="/WEB-INF/validator-rules.xml,/WEB-INF/validation.xml" />
- </plug-in>
</struts-config>
Modified:
jakarta/velocity/tools/trunk/examples/struts/WEB-INF/struts-app4-config.xml
URL:
http://svn.apache.org/viewcvs/jakarta/velocity/tools/trunk/examples/struts/WEB-INF/struts-app4-config.xml?rev=327683&r1=327682&r2=327683&view=diff
==============================================================================
--- jakarta/velocity/tools/trunk/examples/struts/WEB-INF/struts-app4-config.xml
(original)
+++ jakarta/velocity/tools/trunk/examples/struts/WEB-INF/struts-app4-config.xml
Sat Oct 22 12:11:27 2005
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE struts-config PUBLIC "-//Apache Software Foundation//DTD Struts
Configuration 1.2//EN"
"http://jakarta.apache.org/struts/dtds/struts-config_1_2.dtd";>
+<!DOCTYPE struts-config PUBLIC "-//Apache Software Foundation//DTD Struts
Configuration 1.2//EN" "http://struts.apache.org/dtds/struts-config_1_2.dtd";>
<struts-config>
<action-mappings>
<action forward=".frontpage" path="/index_vm" />
@@ -13,8 +13,5 @@
<set-property property="moduleAware" value="true" />
<set-property property="definitions-parser-details" value="100" />
<set-property property="definitions-parser-validate" value="true" />
- </plug-in>
- <plug-in className="org.apache.struts.validator.ValidatorPlugIn">
- <set-property property="pathnames"
value="/WEB-INF/validator-rules.xml,/WEB-INF/validation.xml" />
</plug-in>
</struts-config>
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?rev=327683&r1=327682&r2=327683&view=diff
==============================================================================
--- 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
Sat Oct 22 12:11:27 2005
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE struts-config PUBLIC "-//Apache Software Foundation//DTD Struts
Configuration 1.2//EN"
"http://jakarta.apache.org/struts/dtds/struts-config_1_2.dtd";>
+<!DOCTYPE struts-config PUBLIC "-//Apache Software Foundation//DTD Struts
Configuration 1.2//EN" "http://struts.apache.org/dtds/struts-config_1_2.dtd";>
<struts-config>
<form-beans>
<form-bean name="emailForm"
type="org.apache.struts.validator.DynaValidatorForm">
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?rev=327683&r1=327682&r2=327683&view=diff
==============================================================================
--- 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
Sat Oct 22 12:11:27 2005
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE struts-config PUBLIC "-//Apache Software Foundation//DTD Struts
Configuration 1.2//EN"
"http://jakarta.apache.org/struts/dtds/struts-config_1_2.dtd";>
+<!DOCTYPE struts-config PUBLIC "-//Apache Software Foundation//DTD Struts
Configuration 1.2//EN" "http://struts.apache.org/dtds/struts-config_1_2.dtd";>
<struts-config>
<form-beans>
<form-bean name="testForm" type="org.apache.struts.action.DynaActionForm">
@@ -51,8 +51,5 @@
<set-property property="httpsPort" value="8443" />
<set-property property="enable" value="true" />
<set-property property="addSession" value="true" />
- </plug-in>
- <plug-in className="org.apache.struts.validator.ValidatorPlugIn">
- <set-property property="pathnames"
value="/WEB-INF/validator-rules.xml,/WEB-INF/validation.xml" />
</plug-in>
</struts-config>
Modified:
jakarta/velocity/tools/trunk/examples/struts/WEB-INF/struts-app7-config.xml
URL:
http://svn.apache.org/viewcvs/jakarta/velocity/tools/trunk/examples/struts/WEB-INF/struts-app7-config.xml?rev=327683&r1=327682&r2=327683&view=diff
==============================================================================
--- jakarta/velocity/tools/trunk/examples/struts/WEB-INF/struts-app7-config.xml
(original)
+++ jakarta/velocity/tools/trunk/examples/struts/WEB-INF/struts-app7-config.xml
Sat Oct 22 12:11:27 2005
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE struts-config PUBLIC "-//Apache Software Foundation//DTD Struts
Configuration 1.2//EN"
"http://jakarta.apache.org/struts/dtds/struts-config_1_2.dtd";>
+<!DOCTYPE struts-config PUBLIC "-//Apache Software Foundation//DTD Struts
Configuration 1.2//EN" "http://struts.apache.org/dtds/struts-config_1_2.dtd";>
<struts-config>
<form-beans>
<form-bean name="testForm" type="org.apache.struts.action.DynaActionForm">
@@ -56,8 +56,5 @@
<set-property property="moduleAware" value="true" />
<set-property property="definitions-parser-details" value="0" />
<set-property property="definitions-parser-validate" value="true" />
- </plug-in>
- <plug-in className="org.apache.struts.validator.ValidatorPlugIn">
- <set-property property="pathnames"
value="/WEB-INF/validator-rules.xml,/WEB-INF/validation.xml" />
</plug-in>
</struts-config>
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?rev=327683&r1=327682&r2=327683&view=diff
==============================================================================
--- jakarta/velocity/tools/trunk/examples/struts/WEB-INF/struts-config.xml
(original)
+++ jakarta/velocity/tools/trunk/examples/struts/WEB-INF/struts-config.xml Sat
Oct 22 12:11:27 2005
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE struts-config PUBLIC "-//Apache Software Foundation//DTD Struts
Configuration 1.2//EN"
"http://jakarta.apache.org/struts/dtds/struts-config_1_2.dtd";>
+<!DOCTYPE struts-config PUBLIC "-//Apache Software Foundation//DTD Struts
Configuration 1.2//EN" "http://struts.apache.org/dtds/struts-config_1_2.dtd";>
<struts-config>
<global-forwards>
<forward name="app1" path="/app1/address2.do" redirect="true" />
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?rev=327683&r1=327682&r2=327683&view=diff
==============================================================================
--- 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
Sat Oct 22 12:11:27 2005
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles
Configuration 1.1//EN"
"http://jakarta.apache.org/struts/dtds/tiles-config_1_1.dtd";>
+<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles
Configuration 1.1//EN" "http://struts.apache.org/dtds/tiles-config_1_1.dtd";>
<tiles-definitions>
<definition name=".common">
<put name="title" value="TilesTool Demo!" />
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?rev=327683&r1=327682&r2=327683&view=diff
==============================================================================
--- 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
Sat Oct 22 12:11:27 2005
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles
Configuration 1.1//EN"
"http://jakarta.apache.org/struts/dtds/tiles-config_1_1.dtd";>
+<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles
Configuration 1.1//EN" "http://struts.apache.org/dtds/tiles-config_1_1.dtd";>
<!--
- Copyright 2004 The Apache Software Foundation.
+ Copyright 2004-2005 The 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.
Modified: jakarta/velocity/tools/trunk/examples/struts/WEB-INF/validation.xml
URL:
http://svn.apache.org/viewcvs/jakarta/velocity/tools/trunk/examples/struts/WEB-INF/validation.xml?rev=327683&r1=327682&r2=327683&view=diff
==============================================================================
--- jakarta/velocity/tools/trunk/examples/struts/WEB-INF/validation.xml
(original)
+++ jakarta/velocity/tools/trunk/examples/struts/WEB-INF/validation.xml Sat Oct
22 12:11:27 2005
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE form-validation PUBLIC "-//Apache Software Foundation//DTD Commons
Validator Rules Configuration 1.0//EN"
- "http://jakarta.apache.org/commons/dtds/validator_1_0.dtd";>
+<!DOCTYPE form-validation PUBLIC "-//Apache Software Foundation//DTD Commons
Validator Rules Configuration 1.1.3//EN"
+ "http://jakarta.apache.org/commons/dtds/validator_1_1_3.dtd";>
<!--
- Copyright 2004 The Apache Software Foundation.
+ Copyright 2005 The 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.
@@ -16,7 +16,7 @@
See the License for the specific language governing permissions and
limitations under the License.
- $Id: validation.xml,v 1.3 2004/02/20 13:13:42 marino Exp $
+ $Id$
-->
<form-validation>
<formset>
@@ -24,7 +24,7 @@
<field property="email"
depends="required,email">
<msg name="email" key="errors.invalid"/>
- <arg0 key="emailForm.label.email"/>
+ <arg key="emailForm.label.email"/>
</field>
</form>
</formset>
Modified: jakarta/velocity/tools/trunk/examples/struts/app1/edit-address.jsp
URL:
http://svn.apache.org/viewcvs/jakarta/velocity/tools/trunk/examples/struts/app1/edit-address.jsp?rev=327683&r1=327682&r2=327683&view=diff
==============================================================================
--- jakarta/velocity/tools/trunk/examples/struts/app1/edit-address.jsp
(original)
+++ jakarta/velocity/tools/trunk/examples/struts/app1/edit-address.jsp Sat Oct
22 12:11:27 2005
@@ -30,7 +30,7 @@
<html:form action="address1.do">
<input type="hidden" name="action" value="list">
-
+ <jsp:useBean id="address" scope="session"
class="examples.app1.AddressBean"></jsp:useBean>
<table width="300" border="1" cellspacing="" cellpadding="5">
<tr>
<td><bean:message key="firstname"/>:</td>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
