You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by mr...@apache.org on 2006/07/07 05:46:02 UTC
svn commit: r419790 - in /struts/struts2/trunk/core/src: main/etc/
main/java/org/apache/struts/ main/java/org/apache/struts2/
main/java/org/apache/struts2/components/ main/java/org/apache/struts2/config/
main/java/org/apache/struts2/dispatcher/ main/ja...
Author: mrdon
Date: Thu Jul 6 20:46:00 2006
New Revision: 419790
URL: http://svn.apache.org/viewvc?rev=419790&view=rev
Log:
Cleanups and more renaming changes
WW-1367
Removed:
struts/struts2/trunk/core/src/main/java/org/apache/struts/
struts/struts2/trunk/core/src/test/java/org/apache/struts/
Modified:
struts/struts2/trunk/core/src/main/etc/README.txt
struts/struts2/trunk/core/src/main/java/org/apache/struts2/Main.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/StrutsTestCase.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/DoubleListUIBean.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/File.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ListUIBean.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/RichTextEditor.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Token.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/UIBean.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/Configuration.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/package.html
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ServletDispatcherResult.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/ActionMapper.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/ActionMapperFactory.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/package.html
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/package.html
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/AbstractDirective.java
struts/struts2/trunk/core/src/main/resources/config-browser/page-footer.ftl
struts/struts2/trunk/core/src/main/resources/config-browser/page-header.ftl
struts/struts2/trunk/core/src/main/resources/org/apache/struts2/default.properties
struts/struts2/trunk/core/src/main/resources/org/apache/struts2/dispatcher/error.ftl
struts/struts2/trunk/core/src/main/resources/org/apache/struts2/jsf/package.html
struts/struts2/trunk/core/src/main/resources/org/apache/struts2/lifecycle/package.html
struts/struts2/trunk/core/src/main/resources/org/apache/struts2/package.html
struts/struts2/trunk/core/src/main/resources/org/apache/struts2/views/jsp/ui/package.html
struts/struts2/trunk/core/src/main/resources/overview.html
struts/struts2/trunk/core/src/main/resources/template/archive/simple/debug.vm
struts/struts2/trunk/core/src/main/resources/template/simple/debug.ftl
struts/struts2/trunk/core/src/main/xdt/Readme-tagdoclet.txt
struts/struts2/trunk/core/src/main/xdt/tagdoc-toc.xdt
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/Category.java
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/tree-2.txt
Modified: struts/struts2/trunk/core/src/main/etc/README.txt
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/etc/README.txt?rev=419790&r1=419789&r2=419790&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/etc/README.txt (original)
+++ struts/struts2/trunk/core/src/main/etc/README.txt Thu Jul 6 20:46:00 2006
@@ -1,30 +1,30 @@
-Thanks for trying out Struts Action Framework 2.0:
+Thanks for trying out Struts:
Java's most cutting edge web development platform.
-Struts Action Framework 2.0 is brought to you by the Apache Struts team. You can
-find out more about Struts Action Framework 2.0 and the Apache Struts project at
+Struts is brought to you by the Apache Struts team. You can
+find out more about Struts and the Apache Struts project at
http://struts.apache.org.
=== Getting started ===
We think the best way to get started with any technology is to try it
-out right away. That's why we've made Struts Action Framework 2.0 the easiest web
+out right away. That's why we've made Struts the easiest web
development platform to get started with. You can use the QuickStart
feature (read the docs on QuickStart to learn how you can use this
important tool with your own projects):
* Open a command prompt to the root directory of this distribution
* Using a Java 5 JDK, execute:
- java -jar struts-action-dev-2.0.jar quickstart:showcase
+ java -jar struts-2.0.jar quickstart:showcase
* Open your browser to the URL:
http://localhost:8080/showcase
* Feel free to edit any of the sources (.java, .jsp, etc) in:
- webapps/showcase
+ apps/showcase
* Reload your browser to see the changes right away
=== Getting help ===
-To get help from the Struts Action Framework 2.0 developers and community,
+To get help from the Struts developers and community,
please read the instructions at the following URL:
-http://www.opensymphony.com/webwork/userForums.action
+http://struts.apache.org/mail.html
=== Documentation ===
The documentation can be found in HTML and PDF format in the docs
@@ -34,7 +34,7 @@
* PDF format: docs/docs.pdf
* Javadocs: docs/api/index.html
-This documentation has been generated from the Struts Action Framework 2.0 wiki at the time
+This documentation has been generated from the Struts wiki at the time
of this release. If you are looking for the absolute latest
documentation, please visit the wiki at:
@@ -44,7 +44,7 @@
included in this release, so take care when referencing the wiki.
=== Building ===
-If you'd like to build your own version of Struts Action 2, we've included
+If you'd like to build your own version of Struts, we've included
everything you need in this distribution. The ant script, build.xml,
contains a "jar" task that you can launch to create your own struts
jar. The only thing you must do before hand is set up the proper jars
@@ -55,19 +55,19 @@
* lib/build/junit.jar
Once you've copied these three jars in to the ANT_HOME/lib directory,
-simply run "ant jar" to create your own version of Struts Action 2.
+simply run "ant jar" to create your own version of Struts.
=== Distribution jars ===
-The distribution zip file contains in the main dir the Struts Action 2 jar, named struts-action-<version>.jar.
+The distribution zip file contains in the main dir the Struts jar, named struts-action-<version>.jar.
-You can also find in the dist subdirectory a different Struts Action 2 packaging:
-- struts-action-nostatic-<version>.jar: containing only Struts Action 2 without the static content
-- struts-action-static-<version>.zip: containing the required Struts Action 2 static dependencies
+You can also find in the dist subdirectory a different Struts packaging:
+- struts-action-nostatic-<version>.jar: containing only Struts without the static content
+- struts-action-static-<version>.zip: containing the required Struts static dependencies
The struts-action-static-<version>.zip content must be included in the war distribution under struts directory,
or a directory mapped to the URL <context_path>/struts.
You must also set in your webapp struts.properties the struts.serve.static property to false.
-If these conditions are not fullfilled, Struts Action 2 may report strange errors.
\ No newline at end of file
+If these conditions are not fullfilled, Struts may report strange errors.
\ No newline at end of file
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/Main.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/Main.java?rev=419790&r1=419789&r2=419790&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/Main.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/Main.java Thu Jul 6 20:46:00 2006
@@ -30,11 +30,11 @@
/**
* <!-- START SNIPPET: javadoc -->
*
- * Struts Action 2.0 comes with various related tools included in the struts-action-2.0 jar file. You can access these
- * tools by simply unpacking the Struts Action 2.0 distribution and running <b>java -jar struts.jar</b>.
- * Struts Action 2.0 will automatically include all jars in the same directory as the struts.jar file as well as all
+ * Struts comes with various related tools included in the struts-action-2.0 jar file. You can access these
+ * tools by simply unpacking the Struts distribution and running <b>java -jar struts.jar</b>.
+ * Struts will automatically include all jars in the same directory as the struts.jar file as well as all
* jars in the <i>lib</i> directory. This means you can invoke these tools either from within the standard directory
- * structure found in the Struts Action 2.0 distribution, or from within your WEB-INF/lib directory.
+ * structure found in the Struts distribution, or from within your WEB-INF/lib directory.
*
* <p/> You can access the help information for these tools by simply running the jar without any arguments.
*
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/StrutsTestCase.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/StrutsTestCase.java?rev=419790&r1=419789&r2=419790&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/StrutsTestCase.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/StrutsTestCase.java Thu Jul 6 20:46:00 2006
@@ -27,7 +27,7 @@
import com.opensymphony.xwork.util.LocalizedTextUtil;
/**
- * Base test case for unit testing WebWork.
+ * Base test case for unit testing Struts.
*/
public abstract class StrutsTestCase extends XWorkTestCase {
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/DoubleListUIBean.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/DoubleListUIBean.java?rev=419790&r1=419789&r2=419790&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/DoubleListUIBean.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/DoubleListUIBean.java Thu Jul 6 20:46:00 2006
@@ -25,7 +25,7 @@
import javax.servlet.http.HttpServletResponse;
/**
- * DoubleListUIBean is the standard superclass of all Struts Action Framework 2.0 double list handling components.
+ * DoubleListUIBean is the standard superclass of all Struts double list handling components.
*
* <p/>
*
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/File.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/File.java?rev=419790&r1=419789&r2=419790&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/File.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/File.java Thu Jul 6 20:46:00 2006
@@ -66,13 +66,13 @@
String encType = (String) form.getParameters().get("enctype");
if (!"multipart/form-data".equals(encType)) {
// uh oh, this isn't good! Let's warn the developer
- log.warn("Struts Action Framework has detected a file upload UI tag (a:file) being used without a form set to enctype 'multipart/form-data'. This is probably an error!");
+ log.warn("Struts has detected a file upload UI tag (a:file) being used without a form set to enctype 'multipart/form-data'. This is probably an error!");
}
String method = (String) form.getParameters().get("method");
if (!"post".equalsIgnoreCase(method)) {
// uh oh, this isn't good! Let's warn the developer
- log.warn("Struts Action Framework has detected a file upload UI tag (a:file) being used without a form set to method 'POST'. This is probably an error!");
+ log.warn("Struts has detected a file upload UI tag (a:file) being used without a form set to method 'POST'. This is probably an error!");
}
}
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ListUIBean.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ListUIBean.java?rev=419790&r1=419789&r2=419790&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ListUIBean.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ListUIBean.java Thu Jul 6 20:46:00 2006
@@ -28,7 +28,7 @@
import java.util.Map;
/**
- * DoubleListUIBean is the standard superclass of all Struts Action Framework list handling components.
+ * DoubleListUIBean is the standard superclass of all Struts list handling components.
*
* <p/>
*
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/RichTextEditor.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/RichTextEditor.java?rev=419790&r1=419789&r2=419790&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/RichTextEditor.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/RichTextEditor.java Thu Jul 6 20:46:00 2006
@@ -53,7 +53,7 @@
*
* It is possible to have a rich text editor do server side browsing
* when for example the image button is clicked. To integrate this functionality with
- * Struts Action Framework, one need to defined the following action definition typically in xwork.xml
+ * Struts, one need to defined the following action definition typically in xwork.xml
*
* <pre>
* <package name="richtexteditor-browse" extends="struts-default"
@@ -73,7 +73,7 @@
* 'browse server' button, the url '/struts/static/richtexteditor/editor/filemanager/browser/default/browser.html?&Type=Image&Connector=connectors/jsp/connector.action'.
* The page browser.html which comes with FCK Editor will trigger the url
* '/struts/richtexteditor/editor/filemanager/browser/default/connectors/jsp/connector.action' which will
- * caused the Struts Action Framework's DefaultRichtexteditorConnector to be executed. The trigerring url could be
+ * caused the Struts' DefaultRichtexteditorConnector to be executed. The trigerring url could be
* changed by altering the 'imageBrowseURL'. There 3 types of such related url, namely 'imageBrowseURL',
* 'linkBrowseURL' and 'flashBrowseURL'. It is recomended that the default one being used. One could change the
* Connector parameter instead. For example
@@ -114,7 +114,7 @@
* It is possible for the richtexteditor to do server side uploading as well. For example when clicking
* on the 'Image' button and then the 'Upload' tab and then selecting a file from client local
* machine and the clicking 'Send it to the server'. To integrate this functionality with
- * Struts Action Framework, one need to defined the following action definition typically in xwork.xml
+ * Struts, one need to defined the following action definition typically in xwork.xml
*
* <pre>
* <package name="richtexteditor-upload" extends="struts-default"
@@ -129,7 +129,7 @@
*
* By default whenever an upload command is triggered, a '/struts/static/richtexteditor/editor/filemanager/upload/uploader.action?Type=Image'
* will be issued. This could be changed by setting the imageUploadURL attribute of the tag.
- * When this link is issued, the Struts Action Framework action will get executed. There's 3 such related upload url
+ * When this link is issued, the Struts action will get executed. There's 3 such related upload url
* namely, 'imageUploadURL', 'linkUploadURL' and 'flashUploadURL'. It is recomended that the default
* one being used. However one could change the url, but need to include the Type parameter. For example
*
@@ -160,7 +160,7 @@
*
* <!-- START SNIPPET: richtexteditoraction -->
*
- * The Struts Action Framework action that handles the server-side browsing and uploading needs to extends from
+ * The Struts action that handles the server-side browsing and uploading needs to extends from
* AbstractRichtexteditorConnector.
*
* There are four abstract methods need to be implemented, namely
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Token.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Token.java?rev=419790&r1=419789&r2=419790&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Token.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Token.java Thu Jul 6 20:46:00 2006
@@ -93,7 +93,7 @@
}
/**
- * This will be removed in a future version of Struts Action Framework.
+ * This will be removed in a future version of Struts.
* @deprecated Templates should use $parameters from now on, not $tag.
*/
public String getTokenNameField() {
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/UIBean.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/UIBean.java?rev=419790&r1=419789&r2=419790&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/UIBean.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/UIBean.java Thu Jul 6 20:46:00 2006
@@ -38,8 +38,8 @@
import java.util.Map;
/**
- * UIBean is the standard superclass of all Struts Action Framework UI componentns.
- * It defines common Struts Action Framework and html properties all UI components should present for usage.
+ * UIBean is the standard superclass of all Struts UI componentns.
+ * It defines common Struts and html properties all UI components should present for usage.
*
* <!-- START SNIPPET: templateRelatedAttributes -->
*
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/Configuration.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/Configuration.java?rev=419790&r1=419789&r2=419790&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/Configuration.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/Configuration.java Thu Jul 6 20:46:00 2006
@@ -31,7 +31,7 @@
* Handles all Struts config properties. Implementation of this class is pluggable (the
* default implementation is {@link DefaultConfiguration}). This gives developers to ability to customize how
* Struts properties are set and retrieved. As an example, a developer may wish to check a separate property
- * store before delegating to the Struts Action Framework one. <p>
+ * store before delegating to the Struts one. <p>
* <p/>
* Key methods: <ul>
* <p/>
@@ -76,13 +76,13 @@
}
/**
- * Returns the Struts Action Framework locale. Keys off the property <tt>struts.locale</tt> which should be set
+ * Returns the Struts locale. Keys off the property <tt>struts.locale</tt> which should be set
* as the Java {@link java.util.Locale#toString() toString()} representation of a Locale object (i.e.,
* "en", "de_DE", "_GB", "en_US_WIN", "de__POSIX", "fr_MAC", etc). <p>
* <p/>
* If no locale is specified then the default VM locale is used ({@link java.util.Locale#getDefault()}).
*
- * @return the Struts Action Framework locale if specified or the VM default locale.
+ * @return the Struts locale if specified or the VM default locale.
*/
public static Locale getLocale() {
if (locale == null) {
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/package.html
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/package.html?rev=419790&r1=419789&r2=419790&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/package.html (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/package.html Thu Jul 6 20:46:00 2006
@@ -1 +1 @@
-<body>Classes for WebWork configuration and property handling.</body>
+<body>Classes for Struts configuration and property handling.</body>
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ServletDispatcherResult.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ServletDispatcherResult.java?rev=419790&r1=419789&r2=419790&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ServletDispatcherResult.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ServletDispatcherResult.java Thu Jul 6 20:46:00 2006
@@ -34,7 +34,7 @@
* Includes or forwards to a view (usually a jsp). Behind the scenes Struts
* will use a RequestDispatcher, where the target servlet/JSP receives the same
* request/response objects as the original servlet/JSP. Therefore, you can pass
- * data between them using request.setAttribute() - the WebWork action is
+ * data between them using request.setAttribute() - the Struts action is
* available.
* <p/>
* There are three possible ways the result can be executed:
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/ActionMapper.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/ActionMapper.java?rev=419790&r1=419789&r2=419790&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/ActionMapper.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/ActionMapper.java Thu Jul 6 20:46:00 2006
@@ -26,7 +26,7 @@
* vice-versa. When given an HttpServletRequest, the ActionMapper may return null if no action invocation request maps,
* or it may return an {@link ActionMapping} that describes an action invocation that Struts should attempt to try. The
* ActionMapper is not required to guarantee that the {@link ActionMapping} returned be a real action or otherwise
- * ensure a valid request. This means that most ActionMappers do not need to consult Struts Action Framework 's configuration to
+ * ensure a valid request. This means that most ActionMappers do not need to consult the Struts configuration to
* determine if a request should be mapped.
*
* <p/> Just as requests can be mapped from HTTP to an action invocation, the opposite is true as well. However, because
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/ActionMapperFactory.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/ActionMapperFactory.java?rev=419790&r1=419789&r2=419790&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/ActionMapperFactory.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/ActionMapperFactory.java Thu Jul 6 20:46:00 2006
@@ -51,7 +51,7 @@
return mapper;
} catch (Exception e) {
- String msg = "Could not create ActionMapper: Struts Action Framework will *not* work!";
+ String msg = "Could not create ActionMapper: Struts will *not* work!";
LOG.fatal(msg, e);
throw new RuntimeException(msg, e);
}
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/package.html
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/package.html?rev=419790&r1=419789&r2=419790&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/package.html (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/package.html Thu Jul 6 20:46:00 2006
@@ -1 +1 @@
-<body>Classes for action dispatching in WebWork (the Controller part of MVC).</body>
+<body>Classes for action dispatching in Struts (the Controller part of MVC).</body>
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/package.html
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/package.html?rev=419790&r1=419789&r2=419790&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/package.html (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/package.html Thu Jul 6 20:46:00 2006
@@ -1 +1 @@
-<body>WebWork's JSP tag library.</body>
+<body>Struts's JSP tag library.</body>
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/AbstractDirective.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/AbstractDirective.java?rev=419790&r1=419789&r2=419790&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/AbstractDirective.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/AbstractDirective.java Thu Jul 6 20:46:00 2006
@@ -107,7 +107,7 @@
* @param node the parameter to set expressed in "name=value" format
*/
protected void putProperty(Map propertyMap, InternalContextAdapter contextAdapter, Node node) throws ParseErrorException, MethodInvocationException {
- // node.value uses the WebWorkValueStack to evaluate the directive's value parameter
+ // node.value uses the StrutsValueStack to evaluate the directive's value parameter
String param = node.value(contextAdapter).toString();
int idx = param.indexOf("=");
Modified: struts/struts2/trunk/core/src/main/resources/config-browser/page-footer.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/config-browser/page-footer.ftl?rev=419790&r1=419789&r2=419790&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/config-browser/page-footer.ftl (original)
+++ struts/struts2/trunk/core/src/main/resources/config-browser/page-footer.ftl Thu Jul 6 20:46:00 2006
@@ -7,7 +7,7 @@
<table border="0" cellspacing="0" cellpadding="4" width="100%">
<tr>
<td align="center">
- <a href="http://struts.apache.org/">Apache Struts Project</a> <a href="http://incubator.apache.org/projects/webwork2.html">Struts Action 2.0</a> © 2003 - 2006 | <a href="http://wiki.opensymphony.com/display/WW/Documentation">Manual</a> | <a href="http://jira.opensymphony.com/secure/Dashboard.jspa">Bugs</a> | <a href="http://forums.opensymphony.com/category.jspa?categoryID=5">Forums</a>
+ <a href="http://struts.apache.org/">Apache Struts Project</a> <a href="http://struts.apache.org/2.0">Struts</a> © 2003 - 2006 | <a href="http://issues.apache.org/struts/">Bugs</a> | <a href="http://struts.apache.org/mail.html">Mailing Lists</a>
</td>
</tr>
</table>
Modified: struts/struts2/trunk/core/src/main/resources/config-browser/page-header.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/config-browser/page-header.ftl?rev=419790&r1=419789&r2=419790&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/config-browser/page-header.ftl (original)
+++ struts/struts2/trunk/core/src/main/resources/config-browser/page-header.ftl Thu Jul 6 20:46:00 2006
@@ -11,7 +11,7 @@
<table border="0" cellspacing="0" cellpadding="4" width="100%">
<tr>
<td>
- WebWork Configuration Browser > ${pageTitle}
+ Struts Configuration Browser > ${pageTitle}
</td>
</tr>
</table>
Modified: struts/struts2/trunk/core/src/main/resources/org/apache/struts2/default.properties
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/org/apache/struts2/default.properties?rev=419790&r1=419789&r2=419790&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/org/apache/struts2/default.properties (original)
+++ struts/struts2/trunk/core/src/main/resources/org/apache/struts2/default.properties Thu Jul 6 20:46:00 2006
@@ -1,12 +1,12 @@
### START SNIPPET: complete_file
-### Struts Action 2.0 default properties
+### Struts default properties
###(can be overridden by a struts.properties file in the root of the classpath)
###
-### Specifies the Configuration used to configure Struts Action 2.0
+### Specifies the Configuration used to configure Struts
### one could extend org.apache.struts2.config.Configuration
-### to build one's customize way of getting the configurations parameters into Struts Action 2.0
+### to build one's customize way of getting the configurations parameters into Struts
# struts.configuration=org.apache.struts2.config.DefaultConfiguration
### This can be used to set your default locale and encoding scheme
@@ -22,7 +22,7 @@
### valid values are: name, type, auto, and constructor (name is the default)
struts.objectFactory.spring.autoWire = name
-### indicates to the struts-action-2.0-spring integration if Class instances should be cached
+### indicates to the struts-spring integration if Class instances should be cached
### this should, until a future Spring release makes it possible, be left as true
### unless you know exactly what you are doing!
### valid values are: true, false (true is the default)
@@ -75,7 +75,7 @@
### to evaluate expressions for String attributes for tags
struts.tag.altSyntax=true
-### when set to true, Struts Action 2.0 will act much more friendly for developers. This
+### when set to true, Struts will act much more friendly for developers. This
### includes:
### - struts.i18n.reload = true
### - struts.configuration.xml.reload = true
Modified: struts/struts2/trunk/core/src/main/resources/org/apache/struts2/dispatcher/error.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/org/apache/struts2/dispatcher/error.ftl?rev=419790&r1=419789&r2=419790&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/org/apache/struts2/dispatcher/error.ftl (original)
+++ struts/struts2/trunk/core/src/main/resources/org/apache/struts2/dispatcher/error.ftl Thu Jul 6 20:46:00 2006
@@ -1,11 +1,11 @@
<html>
<head>
- <title>Struts Action Framework Problem Report</title>
+ <title>Struts Problem Report</title>
</head>
<body>
- <h2>Struts Action Framework Problem Report</h2>
+ <h2>Struts Problem Report</h2>
<p>
- The Struts Action Framework has detected an unhandled exception:
+ The Struts has detected an unhandled exception:
</p>
<#assign msgs = [] />
Modified: struts/struts2/trunk/core/src/main/resources/org/apache/struts2/jsf/package.html
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/org/apache/struts2/jsf/package.html?rev=419790&r1=419789&r2=419790&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/org/apache/struts2/jsf/package.html (original)
+++ struts/struts2/trunk/core/src/main/resources/org/apache/struts2/jsf/package.html Thu Jul 6 20:46:00 2006
@@ -1,5 +1,5 @@
<body>
-Integrates the JSF library into the Struts Action Framework. The overall approach
+Integrates the JSF library into Struts. The overall approach
splits the JSF lifecycle into an Interceptor stack and Result, delegating
navigation and general controller functions to Struts.
<p>
Modified: struts/struts2/trunk/core/src/main/resources/org/apache/struts2/lifecycle/package.html
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/org/apache/struts2/lifecycle/package.html?rev=419790&r1=419789&r2=419790&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/org/apache/struts2/lifecycle/package.html (original)
+++ struts/struts2/trunk/core/src/main/resources/org/apache/struts2/lifecycle/package.html Thu Jul 6 20:46:00 2006
@@ -1,4 +1,4 @@
<body>
Web specific listener classes for lifecycle management.
-This package has been deprecated in favor of Spring-WebWork integration.
+This package has been deprecated in favor of Spring-Struts integration.
</body>
Modified: struts/struts2/trunk/core/src/main/resources/org/apache/struts2/package.html
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/org/apache/struts2/package.html?rev=419790&r1=419789&r2=419790&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/org/apache/struts2/package.html (original)
+++ struts/struts2/trunk/core/src/main/resources/org/apache/struts2/package.html Thu Jul 6 20:46:00 2006
@@ -1 +1 @@
-<body>Main WebWork interfaces and classes.</body>
+<body>Main Struts interfaces and classes.</body>
Modified: struts/struts2/trunk/core/src/main/resources/org/apache/struts2/views/jsp/ui/package.html
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/org/apache/struts2/views/jsp/ui/package.html?rev=419790&r1=419789&r2=419790&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/org/apache/struts2/views/jsp/ui/package.html (original)
+++ struts/struts2/trunk/core/src/main/resources/org/apache/struts2/views/jsp/ui/package.html Thu Jul 6 20:46:00 2006
@@ -1 +1 @@
-<body>WebWorks's JSP UI tags.</body>
+<body>Struts' JSP UI tags.</body>
Modified: struts/struts2/trunk/core/src/main/resources/overview.html
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/overview.html?rev=419790&r1=419789&r2=419790&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/overview.html (original)
+++ struts/struts2/trunk/core/src/main/resources/overview.html Thu Jul 6 20:46:00 2006
@@ -1,6 +1,6 @@
<body>
-This document is the API specification for Struts Action 2.0 - note, Struts Action 2.0 is built on top of
+This document is the API specification for Struts - note, Struts is built on top of
<a href="http://wiki.opensymphony.com/space/XWork" target="_blank">XWork</a>.
</body>
Modified: struts/struts2/trunk/core/src/main/resources/template/archive/simple/debug.vm
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/archive/simple/debug.vm?rev=419790&r1=419789&r2=419790&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/archive/simple/debug.vm (original)
+++ struts/struts2/trunk/core/src/main/resources/template/archive/simple/debug.vm Thu Jul 6 20:46:00 2006
@@ -19,7 +19,7 @@
#if ($id) #else #set ($id = 'debug') #end
<a href="#" onclick="toggleDebug('$id');return false;">[Debug]</a>
<div style="display:none" id="$id">
-<h2>WebWork ValueStack Debug</h2>
+<h2>Struts ValueStack Debug</h2>
<p/>
#set($contextMap = $stack.context)
Modified: struts/struts2/trunk/core/src/main/resources/template/simple/debug.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/simple/debug.ftl?rev=419790&r1=419789&r2=419790&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/simple/debug.ftl (original)
+++ struts/struts2/trunk/core/src/main/resources/template/simple/debug.ftl Thu Jul 6 20:46:00 2006
@@ -17,7 +17,7 @@
<a href="#" onclick="toggleDebug('${parameters.id?default("debug")}');return false;">[Debug]</a>
<div style="display:none" id="${parameters.id?default("debug")}">
-<h2>WebWork ValueStack Debug</h2>
+<h2>Struts ValueStack Debug</h2>
<p/>
<h3>Value Stack Contents</h3>
Modified: struts/struts2/trunk/core/src/main/xdt/Readme-tagdoclet.txt
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/xdt/Readme-tagdoclet.txt?rev=419790&r1=419789&r2=419790&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/xdt/Readme-tagdoclet.txt (original)
+++ struts/struts2/trunk/core/src/main/xdt/Readme-tagdoclet.txt Thu Jul 6 20:46:00 2006
@@ -1,4 +1,4 @@
-Struts Action 2 Custom Tagdoclet
+Struts Custom Tagdoclet
================================
The provided xdoclet templates are based on original xdoclet distribution templates for tld generation.
Modified: struts/struts2/trunk/core/src/main/xdt/tagdoc-toc.xdt
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/xdt/tagdoc-toc.xdt?rev=419790&r1=419789&r2=419790&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/xdt/tagdoc-toc.xdt (original)
+++ struts/struts2/trunk/core/src/main/xdt/tagdoc-toc.xdt Thu Jul 6 20:46:00 2006
@@ -1,11 +1,11 @@
<html>
<head>
-<title>Struts Action 2 <XDtConfig:configParameterValue paramName="Taglibversion"/> Taglib Index</title>
+<title>Struts <XDtConfig:configParameterValue paramName="Taglibversion"/> Taglib Index</title>
</head>
<body>
-<h1>Struts Action 2 <XDtConfig:configParameterValue paramName="Taglibversion"/> Taglib Index</h1>
+<h1>Struts <XDtConfig:configParameterValue paramName="Taglibversion"/> Taglib Index</h1>
<p>
<table width="100%">
Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/Category.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/Category.java?rev=419790&r1=419789&r2=419790&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/Category.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/Category.java Thu Jul 6 20:46:00 2006
@@ -32,9 +32,7 @@
new Category(1, "Root",
new Category(2, "Java",
new Category(3, "Web Frameworks",
- new Category(4, "WebWork"),
- new Category(5, "Struts Action"),
- new Category(6, "Struts Shale"),
+ new Category(4, "Struts"),
new Category(7, "Stripes"),
new Category(8, "Rife")),
new Category(9, "Persistence",
Modified: struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/tree-2.txt
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/tree-2.txt?rev=419790&r1=419789&r2=419790&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/tree-2.txt (original)
+++ struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/tree-2.txt Thu Jul 6 20:46:00 2006
@@ -17,13 +17,7 @@
<div dojoType="TreeNode" title="Web Frameworks" id="3">
-<div dojoType="TreeNode" title="WebWork" id="4">
-</div>
-
-<div dojoType="TreeNode" title="Struts Action" id="5">
-</div>
-
-<div dojoType="TreeNode" title="Struts Shale" id="6">
+<div dojoType="TreeNode" title="Struts" id="4">
</div>
<div dojoType="TreeNode" title="Stripes" id="7">