cvs commit: jakarta-struts/src/share/org/apache/struts/action ActionServlet.java Action.java
dgraham 2003/06/27 23:16:35
Modified:src/share/org/apache/struts/action ActionServlet.java
Action.java
Log:
Replaced the last remaining references to Action constants with Globals
constants.
Revision ChangesPath
1.150 +10 -10
jakarta-struts/src/share/org/apache/struts/action/ActionServlet.java
Index: ActionServlet.java
===
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/action/ActionServlet.java,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -r1.149 -r1.150
--- ActionServlet.java19 Jun 2003 00:11:54 - 1.149
+++ ActionServlet.java28 Jun 2003 06:16:34 - 1.150
@@ -581,7 +581,7 @@
public ActionFormBean findFormBean(String name) {
ActionFormBeans afb = (ActionFormBeans)
-getServletContext().getAttribute(Action.FORM_BEANS_KEY);
+getServletContext().getAttribute(Globals.FORM_BEANS_KEY);
if (afb == null) {
return (null);
}
@@ -601,7 +601,7 @@
public ActionForward findForward(String name) {
ActionForwards af = (ActionForwards)
-getServletContext().getAttribute(Action.FORWARDS_KEY);
+getServletContext().getAttribute(Globals.FORWARDS_KEY);
if (af == null) {
return (null);
}
@@ -621,7 +621,7 @@
public ActionMapping findMapping(String path) {
ActionMappings am = (ActionMappings)
-getServletContext().getAttribute(Action.MAPPINGS_KEY);
+getServletContext().getAttribute(Globals.MAPPINGS_KEY);
if (am == null) {
return (null);
}
@@ -1570,7 +1570,7 @@
afb.addFormBean((ActionFormBean) fbcs[i]);
}
afb.setFast(true);
-getServletContext().setAttribute(Action.FORM_BEANS_KEY, afb);
+getServletContext().setAttribute(Globals.FORM_BEANS_KEY, afb);
}
@@ -1595,7 +1595,7 @@
af.addForward((ActionForward) fcs[i]);
}
af.setFast(true);
-getServletContext().setAttribute(Action.FORWARDS_KEY, af);
+getServletContext().setAttribute(Globals.FORWARDS_KEY, af);
}
@@ -1621,7 +1621,7 @@
am.addMapping((ActionMapping) acs[i]);
}
am.setFast(true);
-getServletContext().setAttribute(Action.MAPPINGS_KEY, am);
+getServletContext().setAttribute(Globals.MAPPINGS_KEY, am);
}
1.61 +9 -13 jakarta-struts/src/share/org/apache/struts/action/Action.java
Index: Action.java
===
RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/action/Action.java,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- Action.java 25 Apr 2003 04:23:28 - 1.60
+++ Action.java 28 Jun 2003 06:16:34 - 1.61
@@ -1,4 +1,3 @@
-
/*
* $Header$
* $Revision$
@@ -60,10 +59,8 @@
*
*/
-
package org.apache.struts.action;
-
import java.io.IOException;
import java.util.Locale;
@@ -82,7 +79,6 @@
import org.apache.struts.util.RequestUtils;
import org.apache.struts.util.TokenProcessor;
-
/**
* An strongAction/strong is an adapter between the contents of an incoming
* HTTP request and the corresponding business logic that should be executed to
@@ -514,7 +510,7 @@
*/
protected DataSource getDataSource(HttpServletRequest request) {
-return (getDataSource(request, DATA_SOURCE_KEY));
+return (getDataSource(request, Globals.DATA_SOURCE_KEY));
}
@@ -702,12 +698,12 @@
// Remove any error messages attribute if none are required
if ((errors == null) || errors.isEmpty()) {
-request.removeAttribute(ERROR_KEY);
+request.removeAttribute(Globals.ERROR_KEY);
return;
}
// Save the error messages we need
-request.setAttribute(ERROR_KEY, errors);
+request.setAttribute(Globals.ERROR_KEY, errors);
}
@@ -727,12 +723,12 @@
// Remove any messages attribute if none are required
if ((messages == null) || messages.isEmpty()) {
-request.removeAttribute(MESSAGE_KEY);
+request.removeAttribute(Globals.MESSAGE_KEY);
return;
}
// Save the messages we need
-request.setAttribute(MESSAGE_KEY, messages);
+request.setAttribute(Globals.MESSAGE_KEY, messages);
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands,
DO NOT REPLY [Bug 20784] - Enhanced Error Handling Style Control
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=20784. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=20784 Enhanced Error Handling Style Control --- Additional Comments From [EMAIL PROTECTED] 2003-06-28 10:11 --- This tag sounds like a very good addition to Struts. The only thing I was wondering is, why you're using span markup for the label text and not label (http://www.w3.org/TR/html4/interact/forms.html#h-17.9): form action=foo.do p label class=error for=firstNameIdFirst name:/label input id=firstNameId name=firstName type=text br label style=normal for=lastNameIdLast name:/label input id=lastNameId name=lastName type=text value= /p /form The only reason I could see is that label is a HTML4 addition, but all modern browsers (IE6, Opera7, Netscape7 are the ones I checked) support it. So having the option to use label would be great. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: [VOTE] Struts 1.1 Final Release
-0 Only because there is a bug raised against the nested tags where it's dropping a reference for included/tiles files in some strange instance. I would have liked to have confirmed, patched and squished/handled it, but my last few weeks have been crazy with moving to the US. I wont be able to get onto it until thurday next week until after the move. Would be sweet if 1.1 could wait until then, but anyways. Just need to say that a version cut now is done with possible issue. Anyone's welcome to dive in there and have a play to see if it is an issue... With obvious other priorities, I'll probably just gruble a little and wait to have it handled for 1.2 or 1.1.1 :P Arron. Ted Husted wrote: Since no significant issues have arisen in response to Struts 1.1 RC2, I propose that we release the tip of the main trunk in CVS as the Struts 1.1 Final release. I have checked in a proposed release plan, which is available for review on the Struts web site: http://jakarta.apache.org/struts/proposals/release-plan-1.1.html Release plans must pass by a majority vote of committers on the project, but all other interested parties are welcome to cast their votes (and/or make comments or suggestions on the plan) as well. -- Vote: Struts 1.1 Final Release Plan [ ] +1 I am in favor of the release, and will help support it [ ] +0 I am in favor of the release, but am unable to help support it [ ] -0 I am not in favor of the release [ ] -1 I am against this proposal (must include a reason). - I am +1 on the Struts 1.1 Final release plan. -Ted. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: [VOTE] Struts 1.1 Final Release
Arron, In all likelihood, as soon as you get around to handling this, we may have applied some other small patches (like finishing putting the action property on the rest of the tags), and we will be ready to pop-out another milestone. Moving forward, I think we should let the state of the CVS decide when it's time for another release. If any of us post a patch that needs to get out into the hands of production teams, then we should roll a release. Those numbers between the dots are integers, and we should treat them as such =;0) It's important to remember that a release is a majority vote. Any one of us can tag the CVS and roll a release whenever we like. All it takes to get it out the door is three binding +1's and more positive votes than negative votes. So, release *.* can be ready whenever you are =:0) On a related note, the one thing we should be careful about is allowing product changes that would foil a release. The Commons Resource initiative (which I support, use, and will continue to help with) is a good example. I would be leery of moving the main trunk over to Commons Resources until C/R is out of the sandbox and ready for beta. I would especially insist that any other product changes be released before making a dependency change, lest innocent bystanders get stuck behind unexpected issues. (Been there, did that, won't let it happen again.) But, as far something like this goes, make the fix, and I'll help roll the release =:0) -Ted. Arron Bates wrote: -0 Only because there is a bug raised against the nested tags where it's dropping a reference for included/tiles files in some strange instance. I would have liked to have confirmed, patched and squished/handled it, but my last few weeks have been crazy with moving to the US. I wont be able to get onto it until thurday next week until after the move. Would be sweet if 1.1 could wait until then, but anyways. Just need to say that a version cut now is done with possible issue. Anyone's welcome to dive in there and have a play to see if it is an issue... With obvious other priorities, I'll probably just gruble a little and wait to have it handled for 1.2 or 1.1.1 :P Arron. Ted Husted wrote: Since no significant issues have arisen in response to Struts 1.1 RC2, I propose that we release the tip of the main trunk in CVS as the Struts 1.1 Final release. I have checked in a proposed release plan, which is available for review on the Struts web site: http://jakarta.apache.org/struts/proposals/release-plan-1.1.html Release plans must pass by a majority vote of committers on the project, but all other interested parties are welcome to cast their votes (and/or make comments or suggestions on the plan) as well. -- Vote: Struts 1.1 Final Release Plan [ ] +1 I am in favor of the release, and will help support it [ ] +0 I am in favor of the release, but am unable to help support it [ ] -0 I am not in favor of the release [ ] -1 I am against this proposal (must include a reason). - I am +1 on the Struts 1.1 Final release plan. -Ted. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] -- Ted Husted, Struts in Action http://husted.com/struts/book.html - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 20784] - Enhanced Error Handling Style Control
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=20784. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=20784 Enhanced Error Handling Style Control --- Additional Comments From [EMAIL PROTECTED] 2003-06-28 17:41 --- It should use label when added to Struts. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-struts build.xml
martinc 2003/06/28 22:25:32 Modified:.build.xml Log: Update build version for 1.1 Final release. Revision ChangesPath 1.111 +1 -1 jakarta-struts/build.xml Index: build.xml === RCS file: /home/cvs/jakarta-struts/build.xml,v retrieving revision 1.110 retrieving revision 1.111 diff -u -r1.110 -r1.111 --- build.xml 25 Jun 2003 12:52:55 - 1.110 +++ build.xml 29 Jun 2003 05:25:32 - 1.111 @@ -137,7 +137,7 @@ property name=project.name value=jakarta-struts/ !-- Version of the project -- -property name=project.version value=1.1-dev/ +property name=project.version value=1.1/ !-- == Derived Properties -- - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-struts build.properties.sample
martinc 2003/06/28 22:27:58
Modified:.build.properties.sample
Log:
Update version numbers for 1.1 Final release. Although the latest versions
of all of our dependencies may not strictly be needed to actually build
Struts, it seems like asking for trouble to list older versions here.
Revision ChangesPath
1.42 +8 -8 jakarta-struts/build.properties.sample
Index: build.properties.sample
===
RCS file: /home/cvs/jakarta-struts/build.properties.sample,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- build.properties.sample 19 Jun 2003 11:16:41 - 1.41
+++ build.properties.sample 29 Jun 2003 05:27:58 - 1.42
@@ -32,7 +32,7 @@
# if you are going to execute the deploy.catalina target.
catalina.home=${apache.home}/jakarta-tomcat-4.0.6
-# The JAR file containing the Beanutils package (Version 1.5 or later)
+# The JAR file containing the Beanutils package (Version 1.6.1 or later)
# from the Jakarta Commons project.
commons-beanutils.jar=${commons-lib.home}/beanutils/dist/commons-beanutils.jar
@@ -40,27 +40,27 @@
# from the Jakarta Commons project.
commons-collections.jar=${commons-lib.home}/collections/dist/commons-collections.jar
-# The JAR file containing the Digester package (Version 1.3 or later)
+# The JAR file containing the Digester package (Version 1.5 or later)
# from the Jakarta Commons project.
commons-digester.jar=${commons-lib.home}/digester/dist/commons-digester.jar
-# The JAR file containing the FileUpload package (Version 1.0 RC1 or later)
+# The JAR file containing the FileUpload package (Version 1.0 or later)
# from the Jakarta Commons project.
-commons-fileupload.jar=${commons-lib.home}/fileupload/dist/commons-fileupload.jar
+commons-fileupload.jar=${commons-lib.home}/fileupload/dist/commons-fileupload-1.0.jar
# The JAR file containing the Lang package (Version 1.0.1 or later)
# from the Jakarta Commons project.
-commons-lang.jar=${commons-lib.home}/lang/dist/commons-lang.jar
+commons-lang.jar=${commons-lib.home}/lang/dist/commons-lang-1.0.1.jar
# The JAR file containing the Logging package (Version 1.0.3 or later)
# from the Jakarta Commons project.
commons-logging.jar=${commons-lib.home}/logging/dist/commons-logging.jar
-# The JAR file containing the Validator package (Version 1.0.1 or later)
+# The JAR file containing the Validator package (Version 1.0.2 or later)
# from the Jakarta Commons project.
commons-validator.jar=${commons-lib.home}/validator/dist/commons-validator.jar
-# The JAR file containing the Jakarta ORO project version 2.06 (or later)
+# The JAR file containing the Jakarta ORO package (Version 2.0.6 or later)
jakarta-oro.jar=${apache.home}/jakarta-oro-2.0.6/jakarta-oro-2.0.6.jar
# The JAR file containing the JDBC 2.0 Optional Package extensions API
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-struts/doc project.xml
martinc 2003/06/28 22:32:20 Modified:doc project.xml Log: Label 1.1 as the Stable Release, and 1.0.2 as the Previous Release. Update links for 1.1 release plan and release notes. Revision ChangesPath 1.37 +4 -4 jakarta-struts/doc/project.xml Index: project.xml === RCS file: /home/cvs/jakarta-struts/doc/project.xml,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- project.xml 7 Jun 2003 22:31:13 - 1.36 +++ project.xml 29 Jun 2003 05:32:19 - 1.37 @@ -85,18 +85,18 @@ / /menu -menu name=Release Candidate (1.1-rc2) +menu name=Stable Release (1.1) item name=Release Notes -href=userGuide/release-notes-1.1-rc2.html +href=userGuide/release-notes-1.1.html / item name=Release Plan -href=proposals/release-plan-1.1rc2.html +href=proposals/release-plan-1.1.html / /menu -menu name=Stable Release (1.0.2) +menu name=Previous Release (1.0.2) item name=Welcome page href=http://jakarta.apache.org/struts/doc-1.0.2/index.html; - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-struts/doc/userGuide installation.xml
martinc 2003/06/28 22:36:42 Modified:doc/userGuide installation.xml Log: Update dependency versions and correct a typo. Revision ChangesPath 1.29 +7 -7 jakarta-struts/doc/userGuide/installation.xml Index: installation.xml === RCS file: /home/cvs/jakarta-struts/doc/userGuide/installation.xml,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- installation.xml 7 Jun 2003 21:52:33 - 1.28 +++ installation.xml 29 Jun 2003 05:36:42 - 1.29 @@ -86,17 +86,17 @@ strongJakarta Commons Packages/strong - Struts utilizes several packages from the a href=http://jakarta.apache.org/commons/;Jakarta Commons Project/a. - These are the packages which must be available if you you wish to + These are the packages which must be available if you wish to build Struts from source: ul - liemBeanutils/em (Version 1.5 or later)/li + liemBeanutils/em (Version 1.6.1 or later)/li liemCollections/em (Version 2.1 or later)/li - liemDigester/em (Version 1.3 or later)/li - liemFileUpload/em (1.0 RC1 or later)/li - liemLang/em (Version 1.1 or later)/li + liemDigester/em (Version 1.5 or later)/li + liemFileUpload/em (Version 1.0 or later)/li + liemLang/em (Version 1.0.1 or later)/li liemLogging/em (Version 1.0.3 or later when it is available)/li liemStruts-Legacy/em (Version 1.0 or later)/li - liemValidator/em (Version 1.0.1 or later) /li + liemValidator/em (Version 1.0.2 or later) /li /ul For your convenience, the requisite JARs are provided as a single download under the codelib/code sub-directory with each release @@ -108,7 +108,7 @@ listrongJakarta ORO/strong - a href=http://jakarta.apache.org/oro/index.html;Apache Jakarta ORO/a - version 2.06 (or later) is required to build Struts from source./li + version 2.0.6 (or later) is required to build Struts from source./li listrongXalan XSLT Processor/strong - If you are building Struts from the source distribution, you will need a version of Xalan to perform - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-struts/doc/userGuide index.xml
martinc 2003/06/28 22:58:56 Modified:doc/userGuide index.xml Log: Add a link for the 1.1 release notes (and one for the 1.1-rc2 release notes, for completeness). Revision ChangesPath 1.34 +2 -0 jakarta-struts/doc/userGuide/index.xml Index: index.xml === RCS file: /home/cvs/jakarta-struts/doc/userGuide/index.xml,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- index.xml 20 Feb 2003 06:30:44 - 1.33 +++ index.xml 29 Jun 2003 05:58:56 - 1.34 @@ -159,6 +159,8 @@ ul lia href=release-notes.html6.1 Release Notes/a/li ul +lia href=release-notes-1.1.htmlRelease Notes 1.1/a/li +lia href=release-notes-1.1-rc2.htmlRelease Notes 1.1-rc2/a/li lia href=release-notes-1.1-rc1.htmlRelease Notes 1.1-rc1/a/li lia href=release-notes-1.1-b3.htmlRelease Notes 1.1-b3/a/li lia href=release-notes-1.1-b2.htmlRelease Notes 1.1-b2/a/li - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
