You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@velocity.apache.org by ma...@apache.org on 2005/02/23 00:52:47 UTC
svn commit: r154916 - in jakarta/velocity-tools/trunk/examples/struts:
WEB-INF/ app1/ app2/ app3/ app4/ app5/ app6/ app7/ examples/app1/
examples/app2/ examples/app3/ examples/app4/ examples/app5/ examples/app6/
examples/app7/
Author: marino
Date: Tue Feb 22 15:52:45 2005
New Revision: 154916
URL: http://svn.apache.org/viewcvs?view=rev&rev=154916
Log:
step 2 towards improving the structure for struts modularization
Added:
jakarta/velocity-tools/trunk/examples/struts/app1/
- copied from r154915, jakarta/velocity-tools/trunk/examples/struts/examples/app1/
jakarta/velocity-tools/trunk/examples/struts/app2/
- copied from r154915, jakarta/velocity-tools/trunk/examples/struts/examples/app2/
jakarta/velocity-tools/trunk/examples/struts/app3/
- copied from r154915, jakarta/velocity-tools/trunk/examples/struts/examples/app3/
jakarta/velocity-tools/trunk/examples/struts/app4/
- copied from r154915, jakarta/velocity-tools/trunk/examples/struts/examples/app4/
jakarta/velocity-tools/trunk/examples/struts/app5/
- copied from r154915, jakarta/velocity-tools/trunk/examples/struts/examples/app5/
jakarta/velocity-tools/trunk/examples/struts/app6/
- copied from r154915, jakarta/velocity-tools/trunk/examples/struts/examples/app6/
jakarta/velocity-tools/trunk/examples/struts/app7/
- copied from r154915, jakarta/velocity-tools/trunk/examples/struts/examples/app7/
Removed:
jakarta/velocity-tools/trunk/examples/struts/examples/app1/
jakarta/velocity-tools/trunk/examples/struts/examples/app2/
jakarta/velocity-tools/trunk/examples/struts/examples/app3/
jakarta/velocity-tools/trunk/examples/struts/examples/app4/
jakarta/velocity-tools/trunk/examples/struts/examples/app5/
jakarta/velocity-tools/trunk/examples/struts/examples/app6/
jakarta/velocity-tools/trunk/examples/struts/examples/app7/
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/velocity.properties
jakarta/velocity-tools/trunk/examples/struts/WEB-INF/web.xml
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?view=diff&r1=154915&r2=154916
==============================================================================
--- 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 Tue Feb 22 15:52:45 2005
@@ -1,48 +1,16 @@
-<?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">
-<!--
- Copyright 2004 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.
- 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.
-
- $Id: struts-admin-config.xml,v 1.2 2004/02/20 13:13:42 marino Exp $
--->
+<?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">
<struts-config>
-
-
- <!-- ========== Action Mapping Definitions ============================== -->
<action-mappings>
-
- <!-- The standard administrative actions available with Struts -->
- <!-- These would be either omitted or protected by security -->
- <!-- in a real application deployment -->
- <action path="/admin/addFormBean"
- type="org.apache.struts.actions.AddFormBeanAction"/>
- <action path="/admin/addForward"
- type="org.apache.struts.actions.AddForwardAction"/>
- <action path="/admin/addMapping"
- type="org.apache.struts.actions.AddMappingAction"/>
- <action path="/admin/reload"
- type="org.apache.struts.actions.ReloadAction"/>
- <action path="/admin/removeFormBean"
- type="org.apache.struts.actions.RemoveFormBeanAction"/>
- <action path="/admin/removeForward"
- type="org.apache.struts.actions.RemoveForwardAction"/>
- <action path="/admin/removeMapping"
- type="org.apache.struts.actions.RemoveMappingAction"/>
-
+ <action path="/admin/addFormBean" type="org.apache.struts.actions.AddFormBeanAction" />
+ <action path="/admin/addForward" type="org.apache.struts.actions.AddForwardAction" />
+ <action path="/admin/addMapping" type="org.apache.struts.actions.AddMappingAction" />
+ <action path="/admin/reload" type="org.apache.struts.actions.ReloadAction" />
+ <action path="/admin/removeFormBean" type="org.apache.struts.actions.RemoveFormBeanAction" />
+ <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?view=diff&r1=154915&r2=154916
==============================================================================
--- 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 15:52:45 2005
@@ -1,106 +1,27 @@
-<?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">
-<!--
- Copyright 2004 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.
- 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.
-
- $Id: struts-app1-config.xml,v 1.2 2004/02/20 13:13:42 marino Exp $
--->
-
-<!--
- This is a blank Struts configuration file for a single example module,
- with commented examples of some items.
-
- NOTE: If you have a generator tool to create the corresponding Java classes
- for you, you could include the details in the "form-bean" declarations.
- Otherwise, you would only define the "form-bean" element itself, with the
- corresponding "name" and "type" attributes, as shown here.
--->
-
-
+<?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">
<struts-config>
-
- <!-- ========== Form Bean Definitions =================================== -->
<form-beans>
-
- <!-- Struts Example Application 1 -->
-
- <form-bean name="addressForm"
- type="examples.app1.AddressForm"/>
-
+ <form-bean name="addressForm" type="examples.app1.AddressForm" />
</form-beans>
-
- <!-- ========== Global Forward Definitions ============================== -->
<global-forwards>
-
- <!-- Forward to source pages -->
- <forward
- name="editAddressSrcJsp"
- path="/examples/struts_app1/edit-addressjsp.txt"
- contextRelative="true"/>
-
- <forward
- name="showAddressSrcJsp"
- path="/examples/struts_app1/show-addressjsp.txt"
- contextRelative="true"/>
-
- <forward
- name="editAddressSrc"
- path="/examples/struts_app1/edit-address.txt"
- contextRelative="true"/>
-
- <forward
- name="showAddressSrc"
- path="/examples/struts_app1/show-address.txt"
- contextRelative="true"/>
-
+ <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" />
</global-forwards>
-
-
- <!-- ========== Action Mapping Definitions ============================== -->
<action-mappings>
-
- <!-- Struts Example Application 1, JSP Version -->
- <action path="/address1"
- type="examples.app1.AddressAction"
- name="addressForm"
- scope="request">
- <forward name="showAddress"
- path="/examples/struts_app1/show-address.jsp"
- contextRelative="true"/>
- <forward name="editAddress"
- path="/examples/struts_app1/edit-address.jsp"
- contextRelative="true"/>
+ <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" />
</action>
-
- <!-- Struts Example Application 1, Velocity Version -->
- <action path="/address2"
- type="examples.app1.AddressAction"
- name="addressForm"
- scope="request">
- <forward name="showAddress"
- path="/examples/struts_app1/show-address.vm"
- contextRelative="true"/>
- <forward name="editAddress"
- path="/examples/struts_app1/edit-address.vm"
- contextRelative="true"/>
+ <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" />
</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?view=diff&r1=154915&r2=154916
==============================================================================
--- 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 15:52:45 2005
@@ -1,81 +1,20 @@
-<?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">
-<!--
- Copyright 2004 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.
- 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.
-
- $Id: struts-app2-config.xml,v 1.3 2004/02/20 13:13:42 marino Exp $
--->
-
-<!--
- This is a blank Struts configuration file for a single example module,
- with commented examples of some items.
-
- NOTE: If you have a generator tool to create the corresponding Java classes
- for you, you could include the details in the "form-bean" declarations.
- Otherwise, you would only define the "form-bean" element itself, with the
- corresponding "name" and "type" attributes, as shown here.
--->
-
-
+<?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">
<struts-config>
-
-
- <!-- ========== Form Bean Definitions =================================== -->
<form-beans>
-
- <!-- Struts Example Application 2 -->
-
- <form-bean
- name="demoForm"
- type= "examples.app2.DemoForm"/>
-
-
+ <form-bean name="demoForm" type="examples.app2.DemoForm" />
</form-beans>
-
- <!-- ========== Global Forward Definitions ============================== -->
<global-forwards>
-
- <!-- Forward to source pages -->
- <forward
- name="src"
- path="/examples/struts_app2/tool-demo.vm"
- contextRelative="true"/>
-
+ <forward contextRelative="true" name="src" path="/examples/struts_app2/tool-demo.vm" />
</global-forwards>
-
- <!-- ========== Action Mapping Definitions ============================== -->
<action-mappings>
-
-
- <!-- Struts Example Application 2, Velocity Version -->
- <action path="/demo"
- type="examples.app2.DemoAction"
- name="demoForm"
- scope="request"
- validate="false">
- <forward name="home" path="/examples/struts_app2/tool-demo.vm" contextRelative="true"/>
+ <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" />
</action>
-
- <action path="/demoSrc"
- type="org.apache.struts.actions.ForwardAction"
- parameter="/examples/struts_app2/tool-demo.txt"/>
-
+ <action forward="/examples/struts_app2/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?view=diff&r1=154915&r2=154916
==============================================================================
--- 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 15:52:45 2005
@@ -1,188 +1,41 @@
-<?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">
-<!--
- Copyright 2004 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.
- 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.
-
- $Id: struts-app3-config.xml,v 1.3 2004/02/20 13:13:42 marino Exp $
--->
-
-<!--
- This is a blank Struts configuration file for a single example module,
- with commented examples of some items.
-
- NOTE: If you have a generator tool to create the corresponding Java classes
- for you, you could include the details in the "form-bean" declarations.
- Otherwise, you would only define the "form-bean" element itself, with the
- corresponding "name" and "type" attributes, as shown here.
--->
-
-
+<?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">
<struts-config>
-
-
<form-beans>
-
- <!-- Struts Example Application 3 -->
-
- <form-bean
- name="logonForm"
- type= "examples.app3.LogonForm"/>
-
-
+ <form-bean name="logonForm" type="examples.app3.LogonForm" />
</form-beans>
-
-
- <!-- ========== Global Forward Definitions ============================== -->
<global-forwards>
-
- <!-- Struts Example Application 3, JSP Version -->
-
- <!-- Forward to welcome -->
- <forward
- name="welcome_jsp"
- path="/welcome_jsp.do"/>
-
- <!-- Forward to logon -->
- <forward
- name="logon_jsp"
- path="/logon_jsp.do"/>
-
- <!-- Forward to logoff -->
- <forward
- name="logoff_jsp"
- path="/logoff_jsp.do"/>
-
- <!-- Forward to sources -->
- <forward
- name="index_jsp_src"
- path="/examples/struts_app3/index_jsp.txt"
- contextRelative="true"/>
-
- <forward
- name="logon_jsp_src"
- path="/examples/struts_app3/logon_jsp.txt"
- contextRelative="true"/>
-
- <!-- Struts Example Application 3, VM Version -->
-
- <!-- Forward to welcome -->
- <forward
- name="welcome_vm"
- path="/welcome_vm.do"/>
-
- <!-- Forward to logon -->
- <forward
- name="logon_vm"
- path="/logon_vm.do"/>
-
- <!-- Forward to logoff -->
- <forward
- name="logoff_vm"
- path="/logoff_vm.do"/>
-
- <!-- Forward to sources -->
- <forward
- name="index_vm_src"
- path="/examples/struts_app3/index_vm.txt"
- contextRelative="true"/>
-
- <forward
- name="logon_vm_src"
- path="/examples/struts_app3/logon_vm.txt"
- contextRelative="true"/>
-
+ <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="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" />
</global-forwards>
-
-
- <!-- ========== Action Mapping Definitions ============================== -->
<action-mappings>
-
-
- <!-- Struts Example Application 3, JSP Version -->
-
- <!-- Proceed to welcome page -->
- <action
- path="/welcome_jsp"
- type="org.apache.struts.actions.ForwardAction"
- parameter="/examples/struts_app3/index.jsp"/>
-
- <!-- Process a user logon -->
- <action
- path="/logon_jsp"
- type="org.apache.struts.actions.ForwardAction"
- name="logonForm"
- scope="request"
- validate="false"
- parameter="/examples/struts_app3/logon.jsp"/>
-
- <action
- path="/logonSubmit_jsp"
- type="examples.app3.LogonAction"
- name="logonForm"
- scope="request"
- validate="true"
- input="/examples/struts_app3/logon.jsp">
- <forward name="continue" path="/examples/struts_app3/index.jsp" contextRelative="true"/>
+ <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>
-
- <!-- Process a user logoff -->
- <action
- path="/logoff_jsp"
- type="examples.app3.LogoffAction">
- <forward name="continue" path="/examples/struts_app3/index.jsp" contextRelative="true"/>
+ <action path="/logoff_jsp" type="examples.app3.LogoffAction">
+ <forward contextRelative="true" name="continue" path="/examples/struts_app3/index.jsp" />
</action>
-
-
- <!-- Struts Example Application 3, VM Version -->
-
- <!-- Proceed to welcome page -->
- <action
- path="/welcome_vm"
- type="org.apache.struts.actions.ForwardAction"
- parameter="/examples/struts_app3/index.vm" />
-
- <!-- Process a user logon -->
- <action
- path="/logon_vm"
- type="org.apache.struts.actions.ForwardAction"
- name="logonForm"
- scope="request"
- validate="false"
- parameter="/examples/struts_app3/logon.vm"/>
-
- <action
- path="/logonSubmit_vm"
- type="examples.app3.LogonAction"
- name="logonForm"
- scope="request"
- validate="true"
- input="/examples/struts_app3/logon.vm">
- <forward name="continue" path="/examples/struts_app3/index.vm" contextRelative="true"/>
+ <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>
-
- <!-- Process a user logoff -->
- <action
- path="/logoff_vm"
- type="examples.app3.LogoffAction">
- <forward name="continue" path="/examples/struts_app3/index.vm" contextRelative="true"/>
+ <action path="/logoff_vm" type="examples.app3.LogoffAction">
+ <forward contextRelative="true" name="continue" path="/examples/struts_app3/index.vm" />
</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?view=diff&r1=154915&r2=154916
==============================================================================
--- 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 Tue Feb 22 15:52:45 2005
@@ -1,74 +1,20 @@
-<?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">
-<!--
- Copyright 2004 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.
- 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.
-
- $Id: struts-app4-config.xml,v 1.3 2004/03/12 01:24:04 marino Exp $
--->
-
-<!--
- This is a blank Struts configuration file for a single example module,
- with commented examples of some items.
-
- NOTE: If you have a generator tool to create the corresponding Java classes
- for you, you could include the details in the "form-bean" declarations.
- Otherwise, you would only define the "form-bean" element itself, with the
- corresponding "name" and "type" attributes, as shown here.
--->
-
-
+<?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">
<struts-config>
-
- <!-- ========== Action Mapping Definitions ============================== -->
<action-mappings>
-
- <!-- Velocity Version -->
-
- <action path="/index_vm"
- type="org.apache.struts.actions.ForwardAction"
- parameter=".frontpage"/>
-
- <!-- JSP Version -->
-
- <action path="/index_jsp"
- type="org.apache.struts.actions.ForwardAction"
- parameter=".frontpage.jsp"/>
-
- <!-- Mixed Version -->
-
- <action path="/index_mixed"
- type="org.apache.struts.actions.ForwardAction"
- parameter=".frontpage.mixed"/>
-
+ <action forward=".frontpage" path="/index_vm" />
+ <action forward=".frontpage.jsp" path="/index_jsp" />
+ <action forward=".frontpage.mixed" path="/index_mixed" />
</action-mappings>
-
<message-resources parameter="examples.app4.ApplicationResources" />
- <!-- ========== PlugIn Definitions ============================== -->
-
<plug-in className="org.apache.struts.tiles.TilesPlugin">
- <set-property property="definitions-config"
- value="/WEB-INF/tiles-app4-defs.xml"/>
- <set-property property="definitions-debug"
- value="1"/>
- <set-property property="moduleAware"
- value="true"/>
- <set-property property="definitions-parser-details"
- value="100"/>
- <set-property property="definitions-parser-validate"
- value="true"/>
+ <set-property property="definitions-config" value="/WEB-INF/tiles-app4-defs.xml" />
+ <set-property property="definitions-debug" value="1" />
+ <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?view=diff&r1=154915&r2=154916
==============================================================================
--- 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 15:52:45 2005
@@ -1,89 +1,26 @@
-<?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">
-<!--
- Copyright 2004 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.
- 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.
-
- $Id: struts-app5-config.xml,v 1.3 2004/02/20 13:13:42 marino Exp $
--->
-
-<!--
- This is a blank Struts configuration file for a single example module,
- with commented examples of some items.
-
- NOTE: If you have a generator tool to create the corresponding Java classes
- for you, you could include the details in the "form-bean" declarations.
- Otherwise, you would only define the "form-bean" element itself, with the
- corresponding "name" and "type" attributes, as shown here.
--->
-
-
+<?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">
<struts-config>
-
- <!-- ========== Form Bean Definitions =================================== -->
<form-beans>
- <form-bean name="emailForm" type="org.apache.struts.validator.DynaValidatorForm">
- <form-property name="email" type="java.lang.String"/>
- </form-bean>
+ <form-bean name="emailForm" type="org.apache.struts.validator.DynaValidatorForm">
+ <form-property name="email" type="java.lang.String" />
+ </form-bean>
</form-beans>
-
-
- <!-- ========== Action Mapping Definitions ============================== -->
+ <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" />
- <!-- Struts Example Application 5, Velocity Version -->
-
- <action path="/index_vm"
- type="org.apache.struts.actions.ForwardAction"
- name="emailForm"
- validate="false"
- parameter="/examples/struts_app5/validator-demo.vm"/>
-
- <action path="/do_submit_vm"
- type="org.apache.struts.actions.ForwardAction"
- name="emailForm"
- input="/index_vm.do"
- validate="true"
- parameter="/examples/struts_app5/success.vm"/>
-
-
- <!-- Struts Example Application 5, JSP Version -->
-
- <action path="/index_jsp"
- type="org.apache.struts.actions.ForwardAction"
- name="emailForm"
- validate="false"
- parameter="/examples/struts_app5/validator-demo.jsp"/>
-
- <action path="/do_submit_jsp"
- type="org.apache.struts.actions.ForwardAction"
- name="emailForm"
- input="/index_jsp.do"
- validate="true"
- parameter="/examples/struts_app5/success.jsp"/>
-
+ <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-mappings>
-
- <!-- ========== Message Resource bundles ============================== -->
<message-resources parameter="examples.app5.ApplicationResources" />
-
- <!-- ========== PlugIn Definitions ============================== -->
<plug-in className="org.apache.struts.validator.ValidatorPlugIn">
- <set-property property="pathnames"
- value="/WEB-INF/validator-rules.xml,/WEB-INF/validation.xml"/>
+ <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-app6-config.xml
URL: http://svn.apache.org/viewcvs/jakarta/velocity-tools/trunk/examples/struts/WEB-INF/struts-app6-config.xml?view=diff&r1=154915&r2=154916
==============================================================================
--- 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 15:52:45 2005
@@ -1,136 +1,58 @@
-<?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">
-<!--
- Copyright 2004 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.
- 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.
-
- $Id: struts-app6-config.xml,v 1.2 2004/02/20 13:13:42 marino Exp $
--->
-
-<!--
- This is a blank Struts configuration file for a single example module,
- with commented examples of some items.
-
- NOTE: If you have a generator tool to create the corresponding Java classes
- for you, you could include the details in the "form-bean" declarations.
- Otherwise, you would only define the "form-bean" element itself, with the
- corresponding "name" and "type" attributes, as shown here.
--->
-
-
+<?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">
<struts-config>
-
- <!-- ========== Form Bean Definitions ============================== -->
-
<form-beans>
-
<form-bean name="testForm" type="org.apache.struts.action.DynaActionForm">
- <form-property name="propA" type="java.lang.String"/>
- <form-property name="propB" type="java.lang.String"/>
+ <form-property name="propA" type="java.lang.String" />
+ <form-property name="propB" type="java.lang.String" />
</form-bean>
-
</form-beans>
-
- <!-- ========== Action Mapping Definitions ============================== -->
<action-mappings type="org.apache.struts.config.SecureActionConfig">
-
- <!-- Struts Example Application 6, Velocity Version -->
-
- <action path="/true" type="org.apache.struts.actions.ForwardAction"
- parameter="/examples/struts_app6/true.vm">
- <set-property property="secure" value="true"/>
- </action>
-
- <action path="/false" type="org.apache.struts.actions.ForwardAction"
- parameter="/examples/struts_app6/false.vm">
- <set-property property="secure" value="false"/>
- </action>
-
- <action path="/any" type="org.apache.struts.actions.ForwardAction"
- parameter="/examples/struts_app6/any.vm">
- <set-property property="secure" value="any"/>
- </action>
-
- <action path="/secureSubmit" type="org.apache.struts.actions.ForwardAction"
- name="testForm"
- parameter="/examples/struts_app6/submitted.vm">
- <set-property property="secure" value="true"/>
- </action>
-
- <action path="/nonsecureSubmit" type="org.apache.struts.actions.ForwardAction"
- name="testForm"
- parameter="/examples/struts_app6/submitted.vm">
- <set-property property="secure" value="false"/>
- </action>
-
- <action path="/formAction" type="org.apache.struts.actions.ForwardAction"
- parameter="/examples/struts_app6/form.vm">
- <set-property property="secure" value="false"/>
- </action>
-
-
- <!-- Struts Example Application 6, JSP Version -->
-
- <action path="/true_jsp" type="org.apache.struts.actions.ForwardAction"
- parameter="/examples/struts_app6/true.jsp">
- <set-property property="secure" value="true"/>
- </action>
-
- <action path="/false_jsp" type="org.apache.struts.actions.ForwardAction"
- parameter="/examples/struts_app6/false.jsp">
- <set-property property="secure" value="false"/>
- </action>
-
- <action path="/any_jsp" type="org.apache.struts.actions.ForwardAction"
- parameter="/examples/struts_app6/any.jsp">
- <set-property property="secure" value="any"/>
- </action>
-
- <action path="/secureSubmit_jsp" type="org.apache.struts.actions.ForwardAction"
- name="testForm"
- parameter="/examples/struts_app6/submitted.jsp">
- <set-property property="secure" value="true"/>
- </action>
-
- <action path="/nonsecureSubmit_jsp" type="org.apache.struts.actions.ForwardAction"
- name="testForm"
- parameter="/examples/struts_app6/submitted.jsp">
- <set-property property="secure" value="false"/>
- </action>
-
- <action path="/formAction_jsp" type="org.apache.struts.actions.ForwardAction"
- parameter="/examples/struts_app6/form.jsp">
- <set-property property="secure" value="false"/>
+ <action forward="/examples/struts_app6/true.vm" path="/true">
+ <set-property property="secure" value="true" />
+ </action>
+ <action forward="/examples/struts_app6/false.vm" path="/false">
+ <set-property property="secure" value="false" />
+ </action>
+ <action forward="/examples/struts_app6/any.vm" path="/any">
+ <set-property property="secure" value="any" />
+ </action>
+ <action name="testForm" forward="/examples/struts_app6/submitted.vm" path="/secureSubmit">
+ <set-property property="secure" value="true" />
+ </action>
+ <action name="testForm" forward="/examples/struts_app6/submitted.vm" path="/nonsecureSubmit">
+ <set-property property="secure" value="false" />
+ </action>
+ <action forward="/examples/struts_app6/form.vm" path="/formAction">
+ <set-property property="secure" value="false" />
+ </action>
+ <action forward="/examples/struts_app6/true.jsp" path="/true_jsp">
+ <set-property property="secure" value="true" />
+ </action>
+ <action forward="/examples/struts_app6/false.jsp" path="/false_jsp">
+ <set-property property="secure" value="false" />
+ </action>
+ <action forward="/examples/struts_app6/any.jsp" path="/any_jsp">
+ <set-property property="secure" value="any" />
+ </action>
+ <action name="testForm" forward="/examples/struts_app6/submitted.jsp" path="/secureSubmit_jsp">
+ <set-property property="secure" value="true" />
+ </action>
+ <action name="testForm" forward="/examples/struts_app6/submitted.jsp" path="/nonsecureSubmit_jsp">
+ <set-property property="secure" value="false" />
+ </action>
+ <action forward="/examples/struts_app6/form.jsp" path="/formAction_jsp">
+ <set-property property="secure" value="false" />
</action>
-
</action-mappings>
-
- <!-- ========== Controller Definitions ============================== -->
<controller processorClass="org.apache.struts.action.SecureRequestProcessor" />
-
- <!-- ========== PlugIn Definitions ============================== -->
<plug-in className="org.apache.struts.action.SecurePlugIn">
- <set-property property="httpPort"
- value="8080"/>
- <set-property property="httpsPort"
- value="8443"/>
- <set-property property="enable"
- value="true"/>
- <set-property property="addSession"
- value="true"/>
+ <set-property property="httpPort" value="8080" />
+ <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?view=diff&r1=154915&r2=154916
==============================================================================
--- 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 Tue Feb 22 15:52:45 2005
@@ -1,147 +1,63 @@
-<?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">
-<!--
- Copyright 2004 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.
- 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.
-
- $Id: struts-app7-config.xml,v 1.2 2004/02/20 13:13:42 marino Exp $
--->
-
-<!--
- This is a blank Struts configuration file for a single example module,
- with commented examples of some items.
-
- NOTE: If you have a generator tool to create the corresponding Java classes
- for you, you could include the details in the "form-bean" declarations.
- Otherwise, you would only define the "form-bean" element itself, with the
- corresponding "name" and "type" attributes, as shown here.
--->
-
-
+<?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">
<struts-config>
-
- <!-- ========== Form Bean Definitions ============================== -->
-
<form-beans>
-
<form-bean name="testForm" type="org.apache.struts.action.DynaActionForm">
- <form-property name="propA" type="java.lang.String"/>
- <form-property name="propB" type="java.lang.String"/>
+ <form-property name="propA" type="java.lang.String" />
+ <form-property name="propB" type="java.lang.String" />
</form-bean>
-
</form-beans>
-
- <!-- ========== Action Mapping Definitions ============================== -->
<action-mappings type="org.apache.struts.config.SecureActionConfig">
-
- <!-- Struts Example Application 6, Velocity Version -->
-
- <action path="/true" type="org.apache.struts.actions.ForwardAction"
- parameter=".true">
- <set-property property="secure" value="true"/>
- </action>
-
- <action path="/false" type="org.apache.struts.actions.ForwardAction"
- parameter=".false">
- <set-property property="secure" value="false"/>
- </action>
-
- <action path="/any" type="org.apache.struts.actions.ForwardAction"
- parameter=".any">
- <set-property property="secure" value="any"/>
- </action>
-
- <action path="/secureSubmit" type="org.apache.struts.actions.ForwardAction"
- name="testForm"
- parameter=".submitted">
- <set-property property="secure" value="true"/>
- </action>
-
- <action path="/nonsecureSubmit" type="org.apache.struts.actions.ForwardAction"
- name="testForm"
- parameter=".submitted">
- <set-property property="secure" value="false"/>
- </action>
-
- <action path="/formAction" type="org.apache.struts.actions.ForwardAction"
- parameter=".form">
- <set-property property="secure" value="false"/>
- </action>
-
-
- <!-- Struts Example Application 6, JSP Version -->
-
- <action path="/true_jsp" type="org.apache.struts.actions.ForwardAction"
- parameter=".true.jsp">
- <set-property property="secure" value="true"/>
- </action>
-
- <action path="/false_jsp" type="org.apache.struts.actions.ForwardAction"
- parameter=".false.jsp">
- <set-property property="secure" value="false"/>
- </action>
-
- <action path="/any_jsp" type="org.apache.struts.actions.ForwardAction"
- parameter=".any.jsp">
- <set-property property="secure" value="any"/>
- </action>
-
- <action path="/secureSubmit_jsp" type="org.apache.struts.actions.ForwardAction"
- name="testForm"
- parameter=".submitted.jsp">
- <set-property property="secure" value="true"/>
- </action>
-
- <action path="/nonsecureSubmit_jsp" type="org.apache.struts.actions.ForwardAction"
- name="testForm"
- parameter=".submitted.jsp">
- <set-property property="secure" value="false"/>
- </action>
-
- <action path="/formAction_jsp" type="org.apache.struts.actions.ForwardAction"
- parameter=".form.jsp">
- <set-property property="secure" value="false"/>
+ <action forward=".true" path="/true">
+ <set-property property="secure" value="true" />
+ </action>
+ <action forward=".false" path="/false">
+ <set-property property="secure" value="false" />
+ </action>
+ <action forward=".any" path="/any">
+ <set-property property="secure" value="any" />
+ </action>
+ <action name="testForm" forward=".submitted" path="/secureSubmit">
+ <set-property property="secure" value="true" />
+ </action>
+ <action name="testForm" forward=".submitted" path="/nonsecureSubmit">
+ <set-property property="secure" value="false" />
+ </action>
+ <action forward=".form" path="/formAction">
+ <set-property property="secure" value="false" />
+ </action>
+ <action forward=".true.jsp" path="/true_jsp">
+ <set-property property="secure" value="true" />
+ </action>
+ <action forward=".false.jsp" path="/false_jsp">
+ <set-property property="secure" value="false" />
+ </action>
+ <action forward=".any.jsp" path="/any_jsp">
+ <set-property property="secure" value="any" />
+ </action>
+ <action name="testForm" forward=".submitted.jsp" path="/secureSubmit_jsp">
+ <set-property property="secure" value="true" />
+ </action>
+ <action name="testForm" forward=".submitted.jsp" path="/nonsecureSubmit_jsp">
+ <set-property property="secure" value="false" />
+ </action>
+ <action forward=".form.jsp" path="/formAction_jsp">
+ <set-property property="secure" value="false" />
</action>
-
</action-mappings>
-
- <!-- ========== Controller Definitions ============================== -->
- <!-- no need to specify the custom controller - the plugin takes care of that for us. -->
- <!--controller processorClass="org.apache.struts.action.SecureRequestProcessor" /-->
-
- <!-- ========== PlugIn Definitions ============================== -->
+ <controller processorClass="org.apache.struts.action.SecureTilesRequestProcessor"/>
<plug-in className="org.apache.struts.tiles.SecureTilesPlugin">
- <set-property property="httpPort"
- value="8080"/>
- <set-property property="httpsPort"
- value="8443"/>
- <set-property property="enable"
- value="true"/>
- <set-property property="addSession"
- value="true"/>
- <set-property property="definitions-config"
- value="/WEB-INF/tiles-app7-defs.xml"/>
- <set-property property="definitions-debug"
- value="1"/>
- <set-property property="moduleAware"
- value="true"/>
- <set-property property="definitions-parser-details"
- value="0"/>
- <set-property property="definitions-parser-validate"
- value="true"/>
+ <set-property property="httpPort" value="8080" />
+ <set-property property="httpsPort" value="8443" />
+ <set-property property="enable" value="true" />
+ <set-property property="addSession" value="true" />
+ <set-property property="definitions-config" value="/WEB-INF/tiles-app7-defs.xml" />
+ <set-property property="definitions-debug" value="1" />
+ <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?view=diff&r1=154915&r2=154916
==============================================================================
--- 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 15:52:45 2005
@@ -1,136 +1,29 @@
-<?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">
-<!--
- Copyright 2003-2004 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.
- 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.
-
- $Id: struts-config.xml,v 1.7 2004/02/20 13:13:42 marino Exp $
--->
+<?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">
<struts-config>
-
- <!-- ========== Global Forward Definitions ============================== -->
<global-forwards>
-
- <!-- Access points into the apps -->
-
- <forward name="app1"
- path="/app1/address2.do"
- redirect="true"
- contextRelative="true" />
-
- <forward name="app1Jsp"
- path="/app1/address1.do"
- redirect="true"
- contextRelative="true" />
-
- <forward name="app2"
- path="/app2/demo.do"
- redirect="true"
- contextRelative="true" />
-
- <forward name="app2Src"
- path="/app2/demoSrc.do"
- redirect="true"
- contextRelative="true" />
-
- <forward name="app3"
- path="/app3/welcome_vm.do"
- redirect="true"
- contextRelative="true" />
-
- <forward name="app3Jsp"
- path="/app3/welcome_jsp.do"
- redirect="true"
- contextRelative="true" />
-
- <forward name="app4"
- path="/app4/index_vm.do"
- redirect="true"
- contextRelative="true" />
-
- <forward name="app4Jsp"
- path="/app4/index_jsp.do"
- redirect="true"
- contextRelative="true" />
-
- <forward name="app4Mixed"
- path="/app4/index_mixed.do"
- redirect="true"
- contextRelative="true" />
-
- <forward name="app5"
- path="/app5/index_vm.do"
- redirect="true"
- contextRelative="true" />
-
- <forward name="app5Jsp"
- path="/app5/index_jsp.do"
- redirect="true"
- contextRelative="true" />
-
- <forward name="app6"
- path="/app6/true.do"
- redirect="true"
- contextRelative="true" />
-
- <forward name="app6Jsp"
- path="/app6/true_jsp.do"
- redirect="true"
- contextRelative="true" />
-
- <forward name="app7"
- path="/app7/true.do"
- redirect="true"
- contextRelative="true" />
-
- <forward name="app7Jsp"
- path="/app7/true_jsp.do"
- redirect="true"
- contextRelative="true" />
-
- <forward name="math"
- path="/examples/context_tools/mathtool-demo.vm"
- redirect="true"
- contextRelative="true" />
-
- <forward name="mathSrc"
- path="/examples/context_tools/mathtool-demo.txt"
- redirect="true"
- contextRelative="true" />
-
- <forward name="header"
- path="/examples/request_headers/list.vm"
- redirect="true"
- contextRelative="true" />
-
- <forward name="headerJsp"
- path="/examples/request_headers/list.jsp"
- redirect="true"
- contextRelative="true" />
-
+ <forward name="app1" path="/app1/address2.do" redirect="true" />
+ <forward name="app1Jsp" path="/app1/address1.do" redirect="true" />
+ <forward name="app2" path="/app2/demo.do" redirect="true" />
+ <forward name="app2Src" path="/app2/demoSrc.do" redirect="true" />
+ <forward name="app3" path="/app3/welcome_vm.do" redirect="true" />
+ <forward name="app3Jsp" path="/app3/welcome_jsp.do" redirect="true" />
+ <forward name="app4" path="/app4/index_vm.do" redirect="true" />
+ <forward name="app4Jsp" path="/app4/index_jsp.do" redirect="true" />
+ <forward name="app4Mixed" path="/app4/index_mixed.do" redirect="true" />
+ <forward name="app5" path="/app5/index_vm.do" redirect="true" />
+ <forward name="app5Jsp" path="/app5/index_jsp.do" redirect="true" />
+ <forward name="app6" path="/app6/true.do" redirect="true" />
+ <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="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" />
</global-forwards>
-
<action-mappings>
-
-
- <!-- Struts Example Application 1, JSP Version -->
- <action path="/examples"
- type="org.apache.struts.actions.ForwardAction"
- parameter="/doc/examples.vm"/>
-
+ <action forward="/index.vm" path="/index" />
+ <action forward="/doc/examples.vm" path="/examples" />
</action-mappings>
-
</struts-config>
Modified: jakarta/velocity-tools/trunk/examples/struts/WEB-INF/velocity.properties
URL: http://svn.apache.org/viewcvs/jakarta/velocity-tools/trunk/examples/struts/WEB-INF/velocity.properties?view=diff&r1=154915&r2=154916
==============================================================================
--- jakarta/velocity-tools/trunk/examples/struts/WEB-INF/velocity.properties (original)
+++ jakarta/velocity-tools/trunk/examples/struts/WEB-INF/velocity.properties Tue Feb 22 15:52:45 2005
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*
- * $Id: velocity.properties,v 1.2 2004/02/20 13:13:42 marino Exp $
+ * $Id$
*#
#----------------------------------------------------------------------------
@@ -88,10 +88,10 @@
# you wish with no harm.
#----------------------------------------------------------------------------
#dev-changes by Marino
-webapp.resource.loader.cache = false
-velocimacro.library.autoreload = true
-
-velocimacro.library = /WEB-INF/VM_global_library.vm,/WEB-INF/Validator_library.vm
+webapp.resource.loader.cache = true
+webapp.resource.loader.modificationCheckInterval = 5
+velocimacro.library.autoreload = false
+velocimacro.library = /WEB-INF/VM_global_library.vm
velocimacro.permissions.allow.inline = true
velocimacro.permissions.allow.inline.to.replace.global = false
Modified: jakarta/velocity-tools/trunk/examples/struts/WEB-INF/web.xml
URL: http://svn.apache.org/viewcvs/jakarta/velocity-tools/trunk/examples/struts/WEB-INF/web.xml?view=diff&r1=154915&r2=154916
==============================================================================
--- jakarta/velocity-tools/trunk/examples/struts/WEB-INF/web.xml (original)
+++ jakarta/velocity-tools/trunk/examples/struts/WEB-INF/web.xml Tue Feb 22 15:52:45 2005
@@ -1,22 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.2//EN" "http://java.sun.com/j2ee/dtds/web-app_2_2.dtd">
-<!--
- Copyright 2003-2004 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.
- 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.
-
- $Id: web.xml,v 1.7 2004/02/20 13:13:42 marino Exp $
--->
<web-app>
<servlet>
<servlet-name>action</servlet-name>
@@ -96,31 +79,31 @@
<welcome-file>index.vm</welcome-file>
</welcome-file-list>
<taglib>
+ <taglib-uri>/WEB-INF/sslext.tld</taglib-uri>
+ <taglib-location>/WEB-INF/tld/sslext.tld</taglib-location>
+ </taglib>
+ <taglib>
<taglib-uri>/WEB-INF/struts-bean.tld</taglib-uri>
- <taglib-location>/WEB-INF/tld/struts-bean.tld</taglib-location>
+ <taglib-location>/WEB-INF/struts-bean.tld</taglib-location>
</taglib>
<taglib>
<taglib-uri>/WEB-INF/struts-html.tld</taglib-uri>
- <taglib-location>/WEB-INF/tld/struts-html.tld</taglib-location>
+ <taglib-location>/WEB-INF/struts-html.tld</taglib-location>
</taglib>
<taglib>
<taglib-uri>/WEB-INF/struts-logic.tld</taglib-uri>
- <taglib-location>/WEB-INF/tld/struts-logic.tld</taglib-location>
- </taglib>
- <taglib>
- <taglib-uri>/WEB-INF/struts-nested.tld</taglib-uri>
- <taglib-location>/WEB-INF/tld/struts-nested.tld</taglib-location>
+ <taglib-location>/WEB-INF/struts-logic.tld</taglib-location>
</taglib>
<taglib>
<taglib-uri>/WEB-INF/struts-template.tld</taglib-uri>
- <taglib-location>/WEB-INF/tld/struts-template.tld</taglib-location>
+ <taglib-location>/WEB-INF/struts-template.tld</taglib-location>
</taglib>
<taglib>
<taglib-uri>/WEB-INF/struts-tiles.tld</taglib-uri>
- <taglib-location>/WEB-INF/tld/struts-tiles.tld</taglib-location>
+ <taglib-location>/WEB-INF/struts-tiles.tld</taglib-location>
</taglib>
<taglib>
- <taglib-uri>/WEB-INF/sslext.tld</taglib-uri>
- <taglib-location>/WEB-INF/tld/sslext.tld</taglib-location>
+ <taglib-uri>/WEB-INF/struts-nested.tld</taglib-uri>
+ <taglib-location>/WEB-INF/struts-nested.tld</taglib-location>
</taglib>
</web-app>
---------------------------------------------------------------------
To unsubscribe, e-mail: velocity-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: velocity-dev-help@jakarta.apache.org