craigmcc 2004/07/16 18:47:52
Modified: contrib/struts-chain build.properties.sample build.xml
contrib/struts-chain/web/example/WEB-INF struts-config.xml
Log:
Bring up to date with respect to current head branch code, and the fact that
Commons Chain has been promoted.
Revision Changes Path
1.6 +2 -2 jakarta-struts/contrib/struts-chain/build.properties.sample
Index: build.properties.sample
===================================================================
RCS file: /home/cvs/jakarta-struts/contrib/struts-chain/build.properties.sample,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- build.properties.sample 8 Mar 2004 03:15:16 -0000 1.5
+++ build.properties.sample 17 Jul 2004 01:47:52 -0000 1.6
@@ -40,5 +40,5 @@
# The absolute or relative pathname of the Commons Chain
# distribution
-chain.home=/usr/local/jakarta-commons-sandbox/commons-chain/dist
+chain.home=/usr/local/jakarta-commons/chain/dist
1.6 +4 -2 jakarta-struts/contrib/struts-chain/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-struts/contrib/struts-chain/build.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- build.xml 8 Mar 2004 03:10:47 -0000 1.5
+++ build.xml 17 Jul 2004 01:47:52 -0000 1.6
@@ -31,9 +31,11 @@
<!-- Dependency home defaults -->
- <property name="chain.home"
value="../../../jakarta-commons-sandbox/commons-chain/dist"/>
+
+
+ <property name="chain.home" value="../../../jakarta-commons/chain/dist"/>
<property name="servlet.home" value="/usr/local/tomcat-4.1/common/lib"/>
- <property name="struts.home" value="../../dist/lib"/>
+ <property name="struts.home" value="../../dist"/>
<!-- The Commons Chain Of Responsibility Library -->
1.3 +103 -105
jakarta-struts/contrib/struts-chain/web/example/WEB-INF/struts-config.xml
Index: struts-config.xml
===================================================================
RCS file:
/home/cvs/jakarta-struts/contrib/struts-chain/web/example/WEB-INF/struts-config.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- struts-config.xml 8 Mar 2004 03:10:48 -0000 1.2
+++ struts-config.xml 17 Jul 2004 01:47:52 -0000 1.3
@@ -1,33 +1,29 @@
<?xml version="1.0" encoding="ISO-8859-1" ?>
-
-
<!DOCTYPE struts-config PUBLIC
"-//Apache Software Foundation//DTD Struts Configuration 1.2//EN"
"http://jakarta.apache.org/struts/dtds/struts-config_1_2.dtd";>
-
-
<!--
+ $Header$
+ $Revision$
+ $Date$
+
+ Copyright 2000-2004 Apache Software Foundation
- Copyright 2002,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
-
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-
-->
-
-
<struts-config>
<display-name><![CDATA[
- account maintaince
+ account maintenance
]]>
</display-name>
<description><![CDATA[
@@ -35,116 +31,116 @@
]]>
</description>
-
- <!-- ========== Data Source Configuration =============================== -->
-<!--
- <data-sources>
- <data-source>
- <set-property property="autoCommit"
- value="false"/>
- <set-property property="description"
- value="Example Data Source Configuration"/>
- <set-property property="driverClass"
- value="org.postgresql.Driver"/>
- <set-property property="maxCount"
- value="4"/>
- <set-property property="minCount"
- value="2"/>
- <set-property property="password"
- value="mypassword"/>
- <set-property property="url"
- value="jdbc:postgresql://localhost/mydatabase"/>
- <set-property property="user"
- value="myusername"/>
- </data-source>
- </data-sources>
--->
<!-- ========== Form Bean Definitions =================================== -->
<form-beans>
<!-- Logon form bean -->
- <form-bean name="logonForm"
+ <form-bean name="LogonForm"
type="org.apache.struts.validator.DynaValidatorForm">
<form-property name="username" type="java.lang.String"/>
<form-property name="password" type="java.lang.String"/>
</form-bean>
<!-- Subscription form bean -->
- <form-bean name="subscriptionForm"
+ <form-bean name="SubscriptionForm"
type="org.apache.struts.webapp.example.SubscriptionForm"/>
-
- </form-beans>
+ </form-beans>
<!-- ========== Global Forward Definitions ============================== -->
<global-forwards>
- <forward name="logoff" path="/logoff.do"/>
- <forward name="logon" path="/logon.jsp"/>
- <forward name="success" path="/mainMenu.jsp"/>
+ <forward name="welcome" path="/Welcome.do"/>
+ <forward name="logoff" path="/Logoff.do"/>
+ <forward name="logon" path="/Logon.do"/>
+ <forward name="success" path="/MainMenu.do"/>
</global-forwards>
<!-- ========== Action Mapping Definitions ============================== -->
<action-mappings>
- <!-- Edit mail subscription -->
- <action path="/editSubscription"
- type="org.apache.struts.webapp.example.EditSubscriptionAction"
- attribute="subscriptionForm"
- scope="request"
- validate="false">
- <forward name="failure" path="/mainMenu.jsp"/>
- <forward name="success" path="/subscription.jsp"/>
- </action>
-
- <!-- Process a user logoff -->
- <action path="/logoff"
- type="org.apache.struts.webapp.example.LogoffAction">
- <forward name="success" path="/index.jsp"/>
- </action>
-
- <!-- Process a user logon -->
- <action path="/logon"
- type="org.apache.struts.webapp.example.LogonAction"
- name="logonForm"
- scope="session"
- input="logon">
- <exception
- key="expired.password"
- type="org.apache.struts.webapp.example.ExpiredPasswordException"
- path="/changePassword.jsp"/>
- </action>
-
- <!-- Save mail subscription -->
- <action path="/saveSubscription"
- type="org.apache.struts.webapp.example.SaveSubscriptionAction"
- name="subscriptionForm"
- scope="request"
- input="subscription">
- <forward name="subscription" path="/subscription.jsp"/>
- <forward name="success" path="/editRegistration.do?action=Edit"/>
- </action>
-
-
- <!-- Display the "walking tour" documentation -->
- <action path="/tour"
- forward="/tour.htm">
- </action>
+ <!-- Display welcome page -->
+ <action path="/Welcome"
+ type="org.apache.struts.webapp.example.WelcomeAction">
+ <forward name="failure" path="/Error.jsp" />
+ <forward name="success" path="/welcome.jsp" />
+ </action>
+
+ <!-- Change locale action -->
+ <action
+ path="/Locale"
+ type="org.apache.struts.webapp.example.LocaleAction"
+ parameter="welcome" />
+
+ <!-- Display registration page -->
+ <action path="/Registration"
+ forward="/registration.jsp"/>
+
+ <!-- Display logon page -->
+ <action path="/MainMenu"
+ forward="/mainMenu.jsp"/>
+
+ <!-- Display logon page -->
+ <action path="/Logon"
+ forward="/logon.jsp"/>
+
+ <!-- Process a user logon -->
+ <action path="/SubmitLogon"
+ type="org.apache.struts.webapp.example.LogonAction"
+ name="LogonForm"
+ scope="request"
+ input="logon">
+ <exception
+ key="expired.password"
+ type="org.apache.struts.webapp.example.ExpiredPasswordException"
+ path="/ExpiredPassword.do"/>
+ </action>
+
+ <!-- Process a user logoff -->
+ <action path="/Logoff"
+ type="org.apache.struts.webapp.example.LogoffAction">
+ <forward name="success" path="/Welcome.do"/>
+ </action>
+
+ <!-- Edit mail subscription -->
+ <action path="/EditSubscription"
+ type="org.apache.struts.webapp.example.EditSubscriptionAction"
+ name="SubscriptionForm"
+ scope="request"
+ validate="false">
+ <forward name="failure" path="/MainMenu.do"/>
+ <forward name="success" path="/subscription.jsp"/>
+ </action>
+
+ <!-- Save mail subscription -->
+ <action path="/SaveSubscription"
+ type="org.apache.struts.webapp.example.SaveSubscriptionAction"
+ name="SubscriptionForm"
+ scope="request"
+ input="subscription">
+ <forward name="subscription" path="/subscription.jsp"/>
+ <forward name="success" path="/EditRegistration.do?action=Edit"/>
+ </action>
+
+ <!-- Display the change password page when a password expires -->
+ <action path="/ExpiredPassword"
+ forward="/changePassword.jsp">
+ </action>
+
+ <!-- Display the "walking tour" documentation -->
+ <action path="/Tour"
+ forward="/tour.html">
+ </action>
</action-mappings>
-
<!-- ========== Controller Configuration ================================ -->
- <controller>
- <!-- The "input" parameter on "action" elements is the name of a
+ <controller pagePattern="$M$P" inputForward="true" />
+ <!-- pagePattern: use this pattern when creating URIs to resources.
+ $M=module, $P=path -->
+ <!-- inputForward: The "input" parameter on "action" elements is the name of a
local or global "forward" rather than a module-relative path -->
- <set-property property="inputForward" value="true"/>
- <!-- Use the composable request processor implementation -->
- <set-property
- property="processorClass"
- value="org.apache.struts.chain.legacy.ComposableRequestProcessor"/>
- </controller>
<!-- ========== Message Resources Definitions =========================== -->
@@ -154,21 +150,13 @@
<message-resources
parameter="org.apache.struts.webapp.example.AlternateApplicationResources"
- key="alternate">
- </message-resources>
+ key="alternate"/>
<!-- ========== Plug Ins Configuration ================================== -->
<plug-in className="org.apache.struts.plugins.ModuleConfigVerifier"/>
- <!-- Configure the command chains to be used -->
- <plug-in className="org.apache.struts.chain.legacy.CatalogConfiguratorPlugIn">
- <set-property
- property="resource"
- value="org/apache/struts/chain/chain-config.xml"/>
- </plug-in>
-
<plug-in className="org.apache.struts.webapp.example.memory.MemoryDatabasePlugIn">
<set-property property="pathname" value="/WEB-INF/database.xml"/>
</plug-in>
@@ -179,5 +167,15 @@
/WEB-INF/validation.xml"/>
</plug-in>
+ <plug-in className="org.apache.struts.plugins.DigestingPlugIn">
+ <set-property property="key" value="serverTypes"/>
+ <set-property property="configPath" value="/WEB-INF/server-types.xml"/>
+ <set-property property="digesterPath" value="/WEB-INF/lvb-digester-rules.xml"/>
+ </plug-in>
+
+ <plug-in className="org.apache.struts.chain.legacy.CatalogConfiguratorPlugIn">
+ <set-property property="resource"
+ value="org/apache/struts/chain/chain-config.xml"/>
+ </plug-in>
</struts-config>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
