rleland 2002/12/21 22:10:05
Modified: conf/test struts-config.xml
contrib/struts-el build-tests.xml
doc/userGuide building_controller.xml configuration.xml
src/share/org/apache/struts/taglib/html package.html
src/test/org/apache/struts/action TestActionServlet.java
Log:
Replace all references to o.a.s.example with
o.a.s.webapp.example
except under contrib and tiles doc
Revision Changes Path
1.2 +3 -3 jakarta-struts/conf/test/struts-config.xml
Index: struts-config.xml
===================================================================
RCS file: /home/cvs/jakarta-struts/conf/test/struts-config.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- struts-config.xml 6 May 2001 12:07:32 -0000 1.1
+++ struts-config.xml 22 Dec 2002 06:10:04 -0000 1.2
@@ -33,7 +33,7 @@
<!-- Example logon form bean
<form-bean name="logonForm"
- type="org.apache.struts.example.LogonForm"/>
+ type="org.apache.struts.webapp.example.LogonForm"/>
-->
</form-beans>
@@ -54,7 +54,7 @@
<!-- Example logon action
<action path="/logon"
- type="org.apache.struts.example.LogonAction"
+ type="org.apache.struts.webapp.example.LogonAction"
name="logonForm"
scope="request"
input="/logon.jsp">
@@ -63,7 +63,7 @@
<!-- Example logoff action
<action path="/logoff"
- type="org.apache.struts.example.LogoffAction">
+ type="org.apache.struts.webapp.example.LogoffAction">
<forward name="success" path="/index.jsp"/>
</action>
-->
1.3 +1 -3 jakarta-struts/contrib/struts-el/build-tests.xml
Index: build-tests.xml
===================================================================
RCS file: /home/cvs/jakarta-struts/contrib/struts-el/build-tests.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- build-tests.xml 22 Dec 2002 01:25:33 -0000 1.2
+++ build-tests.xml 22 Dec 2002 06:10:05 -0000 1.3
@@ -534,9 +534,7 @@
<formatter type="plain" usefile="false"/>
<!-- Tests for org.apache.struts.action -->
- <test name="org.apache.struts.action.TestDynaActionForm"/>
- <test name="org.apache.struts.action.TestDynaActionFormClass"/>
- <test name="org.apache.struts.config.TestApplicationConfig"/>
+ <test name="org.apache.struts.action.XXXX"/>
<!-- Tests for org.apache.struts.util -->
<batchtest fork="yes">
1.50 +4 -4 jakarta-struts/doc/userGuide/building_controller.xml
Index: building_controller.xml
===================================================================
RCS file: /home/cvs/jakarta-struts/doc/userGuide/building_controller.xml,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- building_controller.xml 2 Dec 2002 13:09:07 -0000 1.49
+++ building_controller.xml 22 Dec 2002 06:10:05 -0000 1.50
@@ -1148,7 +1148,7 @@
<form-beans>
<form-bean
name="logonForm"
- type="org.apache.struts.example.LogonForm" />
+ type="org.apache.struts.webapp.example.LogonForm" />
</form-beans>
<global-forwards
type="org.apache.struts.action.ActionForward" />
@@ -1160,7 +1160,7 @@
<action-mappings>
<action
path="/logon"
- type="org.apache.struts.example.LogonAction"
+ type="org.apache.struts.webapp.example.LogonAction"
name="logonForm"
scope="request"
input="/logon.jsp"
@@ -1172,7 +1172,7 @@
<p>
First the form bean is defined.
- A basic bean of class "<code>org.apache.struts.example.LogonForm</code>"
+ A basic bean of class "<code>org.apache.struts.webapp.example.LogonForm</code>"
is mapped to the logical name "<code>logonForm</code>".
This name is used as a session or request attribute name for the form
bean.
@@ -1206,7 +1206,7 @@
<pre><code><![CDATA[<!-- Edit mail subscription -->
<action
path="/editSubscription"
- type="org.apache.struts.example.EditSubscriptionAction"
+ type="org.apache.struts.webapp.example.EditSubscriptionAction"
name="subscriptionForm"
scope="request"
validate="false">
1.3 +2 -2 jakarta-struts/doc/userGuide/configuration.xml
Index: configuration.xml
===================================================================
RCS file: /home/cvs/jakarta-struts/doc/userGuide/configuration.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- configuration.xml 8 Dec 2002 00:22:56 -0000 1.2
+++ configuration.xml 22 Dec 2002 06:10:05 -0000 1.3
@@ -496,7 +496,7 @@
<init-param>
<param-name>application</param-name>
<param-value>
- org.apache.struts.example.ApplicationResources
+ org.apache.struts.webapp.example.ApplicationResources
</param-value>
</init-param>
<init-param>
@@ -512,7 +512,7 @@
<init-param>
<param-name>mapping</param-name>
<param-value>
- org.apache.struts.example.ApplicationMapping
+ org.apache.struts.webapp.example.ApplicationMapping
</param-value>
</init-param>
<load-on-startup>2</load-on-startup>
1.20 +2 -2
jakarta-struts/src/share/org/apache/struts/taglib/html/package.html
Index: package.html
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/package.html,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- package.html 29 Oct 2002 06:08:14 -0000 1.19
+++ package.html 22 Dec 2002 06:10:05 -0000 1.20
@@ -102,11 +102,11 @@
<p>Here's a clip from the Struts Example configuration:</p>
-<pre><action-mappings><br> <!-- Process a user logon --><br>
<action path="/logon"<br> type="org.apache.struts.example.LogonAction"<br>
name="logonForm"<br> scope="request"<br> input="/logon.jsp"><br>
</action><br> < ...
/><br></action-mappings><br><form-beans><br> <!-- Logon form bean
--><br> <form-bean name="logonForm"<br>
type="org.apache.struts.example.LogonForm"/><br> < ... /><br>
</form-beans><br></pre><br></pre>
+<pre><action-mappings><br> <!-- Process a user logon --><br>
<action path="/logon"<br>
type="org.apache.struts.webapp.example.LogonAction"<br> name="logonForm"<br>
scope="request"<br> input="/logon.jsp"><br> </action><br> < ...
/><br></action-mappings><br><form-beans><br> <!-- Logon form bean
--><br> <form-bean name="logonForm"<br>
type="org.apache.struts.webapp.example.LogonForm"/><br> < ... /><br>
</form-beans><br></pre><br></pre>
<p>Given this configuration, the HTML form tag for <code>logon.jsp</code>
will default to using "<code>logonForm</code>" as its name property and
-"<code> org.apache.struts.example.LogonForm</code>" as the attribute's type.
+"<code> org.apache.struts.webapp.example.LogonForm</code>" as the attribute's type.
This way you can manage the namespace for your framework components from
the configuration file.</p>
1.5 +1 -1
jakarta-struts/src/test/org/apache/struts/action/TestActionServlet.java
Index: TestActionServlet.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/test/org/apache/struts/action/TestActionServlet.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TestActionServlet.java 16 Nov 2002 04:58:47 -0000 1.4
+++ TestActionServlet.java 22 Dec 2002 06:10:05 -0000 1.5
@@ -154,7 +154,7 @@
public void testInitApplicationOk1() throws ServletException
{
// initialize config
- config.setInitParameter("application",
"org.apache.struts.example.ApplicationResources");
+ config.setInitParameter("application",
"org.apache.struts.webapp.example.ApplicationResources");
ActionServlet servlet = new ActionServlet();
servlet.init(config);
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
