Author: hermanns
Date: Wed Apr 12 11:14:11 2006
New Revision: 393559
URL: http://svn.apache.org/viewcvs?rev=393559&view=rev
Log:
renaming of webwork/ww/WebWork occurances
Modified:
incubator/webwork2/action/src/main/etc/README.txt
incubator/webwork2/action/src/main/java/org/apache/struts/action2/Main.java
incubator/webwork2/action/src/main/java/org/apache/struts/action2/components/ActionComponent.java
incubator/webwork2/action/src/main/java/org/apache/struts/action2/quickstart/MultiWebApplicationContext.java
incubator/webwork2/action/src/main/resources/config-browser/page-footer.ftl
incubator/webwork2/action/src/main/resources/org/apache/struts/action2/default.properties
incubator/webwork2/action/src/main/resources/template/ajax/dojoRequire.js
incubator/webwork2/action/src/main/resources/template/ajax/validation.js
incubator/webwork2/action/src/test/resources/template/test/checkbox.jsp
Modified: incubator/webwork2/action/src/main/etc/README.txt
URL:
http://svn.apache.org/viewcvs/incubator/webwork2/action/src/main/etc/README.txt?rev=393559&r1=393558&r2=393559&view=diff
==============================================================================
--- incubator/webwork2/action/src/main/etc/README.txt (original)
+++ incubator/webwork2/action/src/main/etc/README.txt Wed Apr 12 11:14:11 2006
@@ -1,18 +1,19 @@
-Thanks for trying out WebWork: Java's most cutting edge web development
-platform. WebWork is brought to you by the OpenSymphony team. You can
-find out more about WebWork and OpenSymphony at
-http://www.opensymphony.com.
+Thanks for trying out Struts Action Framework 2.0:
+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
+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 WebWork the easiest web
+out right away. That's why we've made Struts Action Framework 2.0 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 webwork-2.2.jar quickstart:showcase
+ java -jar struts-action-dev-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:
@@ -20,8 +21,8 @@
* Reload your browser to see the changes right away
=== Getting help ===
-To get help from the WebWork developers and community, please read the
-instructions at the following URL:
+To get help from the Struts Action Framework 2.0 developers and community,
+please read the instructions at the following URL:
http://www.opensymphony.com/webwork/userForums.action
@@ -33,7 +34,7 @@
* PDF format: docs/docs.pdf
* Javadocs: docs/api/index.html
-This documentation has been generated from the WebWork wiki at the time
+This documentation has been generated from the Struts Action Framework 2.0
wiki at the time
of this release. If you are looking for the absolute latest
documentation, please visit the wiki at:
@@ -43,9 +44,9 @@
included in this release, so take care when referencing the wiki.
=== Building ===
-If you'd like to build your own version of WebWork, we've included
+If you'd like to build your own version of Struts Action 2, 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 webwork
+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
in the ANT_HOME/lib directory. These jars are:
@@ -54,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 WebWork.
+simply run "ant jar" to create your own version of Struts Action 2.
=== Distribution jars ===
-The distribution zip file contains in the main dir the WebWork jar, named
webwork-<version>.jar.
+The distribution zip file contains in the main dir the Struts Action 2 jar,
named struts-action-<version>.jar.
-You can also find in the dist subdirectory a different WebWork packaging:
-- webwork-nostatic-<version>.jar: containing only WebWork without the static
content
-- webwork-static-<version>.zip: containing the required WebWork static
dependencies
+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
-The webwork-static-<version>.zip content must be included in the war
distribution under webwork directory,
-or a directory mapped to the URL <context_path>/webwork.
-You must also set in your webapp webwork.properties the webwork.serve.static
property to false.
+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, WebWork may report strange errors.
\ No newline at end of file
+If these conditions are not fullfilled, Struts Action 2 may report strange
errors.
\ No newline at end of file
Modified:
incubator/webwork2/action/src/main/java/org/apache/struts/action2/Main.java
URL:
http://svn.apache.org/viewcvs/incubator/webwork2/action/src/main/java/org/apache/struts/action2/Main.java?rev=393559&r1=393558&r2=393559&view=diff
==============================================================================
--- incubator/webwork2/action/src/main/java/org/apache/struts/action2/Main.java
(original)
+++ incubator/webwork2/action/src/main/java/org/apache/struts/action2/Main.java
Wed Apr 12 11:14:11 2006
@@ -113,7 +113,7 @@
System.out.println(" - Specify JAVA_HOME to point to
your JDK 1.5 home");
System.out.println(" - Specify a direct path to
tools.jar via, as shown below:");
System.out.println("");
- System.out.println(" java -Dtools=/path/to/tools.jar
-jar webwork-launcher.jar ...");
+ System.out.println(" java -Dtools=/path/to/tools.jar
-jar struts.jar ...");
return;
}
Modified:
incubator/webwork2/action/src/main/java/org/apache/struts/action2/components/ActionComponent.java
URL:
http://svn.apache.org/viewcvs/incubator/webwork2/action/src/main/java/org/apache/struts/action2/components/ActionComponent.java?rev=393559&r1=393558&r2=393559&view=diff
==============================================================================
---
incubator/webwork2/action/src/main/java/org/apache/struts/action2/components/ActionComponent.java
(original)
+++
incubator/webwork2/action/src/main/java/org/apache/struts/action2/components/ActionComponent.java
Wed Apr 12 11:14:11 2006
@@ -70,7 +70,7 @@
* </pre>
*
* <pre>
- * <!-- START SNIPPET: webworkxml -->
+ * <!-- START SNIPPET: strutsxml -->
* <xwork>
* ....
* <action name="actionTagAction1" class="tmjee.testing.ActionTagAction">
@@ -81,7 +81,7 @@
* </action>
* ....
* </xwork>
- * <!-- END SNIPPET: webworkxml -->
+ * <!-- END SNIPPET: strutsxml -->
* </pre>
*
* <pre>
Modified:
incubator/webwork2/action/src/main/java/org/apache/struts/action2/quickstart/MultiWebApplicationContext.java
URL:
http://svn.apache.org/viewcvs/incubator/webwork2/action/src/main/java/org/apache/struts/action2/quickstart/MultiWebApplicationContext.java?rev=393559&r1=393558&r2=393559&view=diff
==============================================================================
---
incubator/webwork2/action/src/main/java/org/apache/struts/action2/quickstart/MultiWebApplicationContext.java
(original)
+++
incubator/webwork2/action/src/main/java/org/apache/struts/action2/quickstart/MultiWebApplicationContext.java
Wed Apr 12 11:14:11 2006
@@ -86,7 +86,7 @@
// still haven't found what we're looking for?
// Alright, let's just hack this to work in IDEA
- if (uriInContext.equals("/webwork")) {
+ if (uriInContext.equals("/struts")) {
// we do this check to support both "quickstart:showcase" and
"quickstart" (using quickstart.xml)
if (new File("../../src/java/META-INF/taglib.tld").exists()) {
return
FileResource.newResource("../../src/java/META-INF/taglib.tld");
Modified:
incubator/webwork2/action/src/main/resources/config-browser/page-footer.ftl
URL:
http://svn.apache.org/viewcvs/incubator/webwork2/action/src/main/resources/config-browser/page-footer.ftl?rev=393559&r1=393558&r2=393559&view=diff
==============================================================================
--- incubator/webwork2/action/src/main/resources/config-browser/page-footer.ftl
(original)
+++ incubator/webwork2/action/src/main/resources/config-browser/page-footer.ftl
Wed Apr 12 11:14:11 2006
@@ -7,7 +7,7 @@
<table border="0" cellspacing="0" cellpadding="4" width="100%">
<tr>
<td align="center">
- <a
href="http://www.opensymphony.com";>Opensymphony</a> <a
href="http://www.opensymphony.com/webwork";>WebWork</a> © 2003 - 2005 | <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://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>
</td>
</tr>
</table>
Modified:
incubator/webwork2/action/src/main/resources/org/apache/struts/action2/default.properties
URL:
http://svn.apache.org/viewcvs/incubator/webwork2/action/src/main/resources/org/apache/struts/action2/default.properties?rev=393559&r1=393558&r2=393559&view=diff
==============================================================================
---
incubator/webwork2/action/src/main/resources/org/apache/struts/action2/default.properties
(original)
+++
incubator/webwork2/action/src/main/resources/org/apache/struts/action2/default.properties
Wed Apr 12 11:14:11 2006
@@ -1,12 +1,12 @@
### START SNIPPET: complete_file
-### Webwork default properties
+### Struts Action 2.0 default properties
###(can be overridden by a struts.properties file in the root of the classpath)
###
-### Specifies the Configuration used to configure webwork
+### Specifies the Configuration used to configure Struts Action 2.0
### one could extend org.apache.struts.action2.config.Configuration
-### to build one's customize way of getting the configurations parameters into
webwork
+### to build one's customize way of getting the configurations parameters into
Struts Action 2.0
# struts.configuration=org.apache.struts.action2.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 webwork-spring integration if Class instances should be
cached
+### indicates to the struts-action-2.0-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)
@@ -56,14 +56,14 @@
### Used by FilterDispatcher
### If true than WW serves static content from inside its jar.
-### If false than the static content must be available at
<context_path>/webwork
+### If false than the static content must be available at <context_path>/struts
struts.serve.static=true
### use alternative syntax that requires %{} in most places
### to evaluate expressions for String attributes for tags
struts.tag.altSyntax=true
-### when set to true, WebWork will act much more friendly for developers. This
+### when set to true, Struts Action 2.0 will act much more friendly for
developers. This
### includes:
### - struts.i18n.reload = true
### - struts.configuration.xml.reload = true
@@ -93,7 +93,7 @@
### Location of velocity.properties file. defaults to velocity.properties
# struts.velocity.configfile = velocity.properties
-### Comma separated list of VelocityContext classnames to chain to the
WebWorkVelocityContext
+### Comma separated list of VelocityContext classnames to chain to the
StrutsVelocityContext
# struts.velocity.contexts =
### used to build URLs, such as the UrlTag
@@ -112,7 +112,7 @@
### MUST extends off
org.apache.struts.action2.views.freemarker.FreemarkerManager
#struts.freemarker.manager.classname=org.apache.struts.action2.views.freemarker.FreemarkerManager
-### See the WebWorkBeanWrapper javadocs for more information
+### See the StrutsBeanWrapper javadocs for more information
struts.freemarker.wrapper.altMap=true
### configure the XSLTResult class to use stylesheet caching.
Modified:
incubator/webwork2/action/src/main/resources/template/ajax/dojoRequire.js
URL:
http://svn.apache.org/viewcvs/incubator/webwork2/action/src/main/resources/template/ajax/dojoRequire.js?rev=393559&r1=393558&r2=393559&view=diff
==============================================================================
--- incubator/webwork2/action/src/main/resources/template/ajax/dojoRequire.js
(original)
+++ incubator/webwork2/action/src/main/resources/template/ajax/dojoRequire.js
Wed Apr 12 11:14:11 2006
@@ -1,7 +1,7 @@
dojo.require("dojo.io.BrowserIO");
dojo.require("dojo.event.topic");
-dojo.hostenv.setModulePrefix('webwork', 'webwork');
+dojo.hostenv.setModulePrefix('struts', 'struts');
dojo.require('dojo.widget.*');
dojo.widget.manager.registerWidgetPackage('struts.widgets');
Modified:
incubator/webwork2/action/src/main/resources/template/ajax/validation.js
URL:
http://svn.apache.org/viewcvs/incubator/webwork2/action/src/main/resources/template/ajax/validation.js?rev=393559&r1=393558&r2=393559&view=diff
==============================================================================
--- incubator/webwork2/action/src/main/resources/template/ajax/validation.js
(original)
+++ incubator/webwork2/action/src/main/resources/template/ajax/validation.js
Wed Apr 12 11:14:11 2006
@@ -1,5 +1,5 @@
-var webworkValidator = new ValidationClient("$!base/validation");
-webworkValidator.onErrors = function(input, errors) {
+var strutsValidator = new ValidationClient("$!base/validation");
+strutsValidator.onErrors = function(input, errors) {
var form = input.form;
@@ -22,5 +22,5 @@
element.touched = true;
var namespace = element.form.attributes['namespace'].nodeValue;
var actionName = element.form.attributes['name'].nodeValue;
- webworkValidator.validate(element, namespace, actionName);
+ strutsValidator.validate(element, namespace, actionName);
}
Modified:
incubator/webwork2/action/src/test/resources/template/test/checkbox.jsp
URL:
http://svn.apache.org/viewcvs/incubator/webwork2/action/src/test/resources/template/test/checkbox.jsp?rev=393559&r1=393558&r2=393559&view=diff
==============================================================================
--- incubator/webwork2/action/src/test/resources/template/test/checkbox.jsp
(original)
+++ incubator/webwork2/action/src/test/resources/template/test/checkbox.jsp Wed
Apr 12 11:14:11 2006
@@ -1,11 +1,11 @@
-<%@ taglib prefix="ww" uri="/webwork" %>
+<%@ taglib prefix="saf" uri="/struts-action" %>
-<input type="checkbox" <webwork:if
test="parameters['nameValue']">checked="checked"</webwork:if>
- name="<webwork:property value="parameters['name']"/>"
- value="<webwork:property value="parameters['fieldValue']"/>"
- <webwork:if test="parameters['disabled']">disabled="disabled"</webwork:if>
- <webwork:if test="parameters['tabindex'] !=
null">tabindex="<webwork:property value="parameters['tabindex']"/>"</webwork:if>
- <webwork:if test="parameters['onchange'] !=
null">onchange="<webwork:property value="parameters['onchange']"/>"</webwork:if>
- <webwork:if test="parameters['onclick'] !=
null">onclick="<webwork:property value="parameters['onclick']"/>"</webwork:if>
- <webwork:if test="parameters['id'] != null">id="<webwork:property
value="parameters['id']"/>"</webwork:if>
+<input type="checkbox" <saf:if
test="parameters['nameValue']">checked="checked"</saf:if>
+ name="<saf:property value="parameters['name']"/>"
+ value="<saf:property value="parameters['fieldValue']"/>"
+ <saf:if test="parameters['disabled']">disabled="disabled"</saf:if>
+ <saf:if test="parameters['tabindex'] != null">tabindex="<saf:property
value="parameters['tabindex']"/>"</saf:if>
+ <saf:if test="parameters['onchange'] != null">onchange="<saf:property
value="parameters['onchange']"/>"</saf:if>
+ <saf:if test="parameters['onclick'] != null">onclick="<saf:property
value="parameters['onclick']"/>"</saf:if>
+ <saf:if test="parameters['id'] != null">id="<saf:property
value="parameters['id']"/>"</saf:if>
/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
