date:20021026

cvs commit: jakarta-struts/src/share/org/apache/struts/validator FieldChecks.java Resources.java ValidatorPlugIn.java

2002-10-26 Thread rleland

rleland 2002/10/26 23:44:01

  Modified:src/share/org/apache/struts/validator FieldChecks.java
Resources.java ValidatorPlugIn.java
  Log:
  Cleanup JavaDoc.
  In Plugin close stream after use.
  
  Revision  ChangesPath
  1.2   +1 -2  
jakarta-struts/src/share/org/apache/struts/validator/FieldChecks.java
  
  Index: FieldChecks.java
  ===
  RCS file: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/validator/FieldChecks.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- FieldChecks.java  18 Oct 2002 03:41:10 -  1.1
  +++ FieldChecks.java  27 Oct 2002 06:44:00 -  1.2
  @@ -135,8 +135,7 @@
   
   /**
*  
  - *
  - *  Checks if the field isn't null based on the values of other fields
  + *  Checks if the field isn't null based on the values of other fields.
*  
*
*@param  bean The bean validation is being performed on.
  
  
  
  1.2   +32 -7 
jakarta-struts/src/share/org/apache/struts/validator/Resources.java
  
  Index: Resources.java
  ===
  RCS file: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/validator/Resources.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Resources.java18 Oct 2002 03:41:10 -  1.1
  +++ Resources.java27 Oct 2002 06:44:00 -  1.2
  @@ -108,6 +108,7 @@
   
  /**
   * Retrieve ValidatorResources for the module.
  +* @param application servlet context
   *
   * @deprecated In Struts 1.1b3 This method can only return the resources for the 
default
   *  module.  Use getValidatorResources(HttpServletRequest, ServletContext)
  @@ -119,6 +120,8 @@
   
 /**
  * Retrieve ValidatorResources for the current module.
  +   * @param application  Application Context
  +   * @param request The ServletRequest
  */
  public static ValidatorResources getValidatorResources(ServletContext 
application,HttpServletRequest request) {
 return (ValidatorResources) 
application.getAttribute(ValidatorPlugIn.VALIDATOR_KEY +
  @@ -127,6 +130,7 @@
   
  /**
   * Retrieve MessageResources for the application module.
  +* @param  application servlet context
   *
   * @deprecated This method can only return the resources for the default
   *  module.  Use getMessageResources(HttpServletRequest) to get the
  @@ -138,6 +142,7 @@
   
  /**
   * Retrieve MessageResources for the application module.
  +* @param request the servlet request
  */
  public static MessageResources getMessageResources(HttpServletRequest request) {
 return (MessageResources)request.getAttribute(Action.MESSAGES_KEY);
  @@ -145,6 +150,7 @@
   
  /**
   * Get the Locale of the current user.
  +* @param request servlet request
  */
  public static Locale getLocale(HttpServletRequest request) {
 Locale locale = null;
  @@ -162,6 +168,9 @@
   
  /**
   * Gets the Locale sensitive value based on the key passed in.
  +* @param messages  The Message resources
  +* @param localeThe locale
  +* @param key key used to lookup the message
  */
  public static String getMessage(MessageResources messages, Locale locale, String 
key) {
 String message = null;
  @@ -178,6 +187,8 @@
   
  /**
   * Gets the Locale sensitive value based on the key passed in.
  +* @param request servlet request
  +* @param key the request key
  */
  public static String getMessage(HttpServletRequest request, String key) {
 MessageResources messages = getMessageResources(request);
  @@ -188,6 +199,10 @@
  /**
   * Gets the locale sensitive message based on the ValidatorAction 
message and the
   * Field's arg objects.
  +* @param messages  The Message resources
  +* @param localeThe locale
  +* @param vaThe Validator Action
  +* @param field The Validator Field
  */
  public static String getMessage(MessageResources messages, Locale locale,
  ValidatorAction va, Field field) {
  @@ -201,6 +216,9 @@
  /**
   * Gets the ActionError based on the ValidatorAction 
message and the
   * Field's arg objects.
  +* @param request the servlet request
  +* @param va Validator action
  +* @param field the validator Field
  */
  public static ActionError getActionError(HttpServletRequest request,
   ValidatorAction va, Field field) {
  @@ -214,6 +232,10 @@
  /**
   * Gets the message arguments based on the current ValidatorAction
   * and Field.
  +* @param actionName   action name
  +* @param messages  message resources
  +* @param locale   the locale
  +*

cvs commit: jakarta-struts/src/share/org/apache/struts/action DynaActionForm.java

2002-10-26 Thread rleland

rleland 2002/10/26 23:11:00

  Modified:src/share/org/apache/struts/action DynaActionForm.java
  Log:
  Remove unused assignments and cleanup JavaDoc
  
  Revision  ChangesPath
  1.4   +7 -13 
jakarta-struts/src/share/org/apache/struts/action/DynaActionForm.java
  
  Index: DynaActionForm.java
  ===
  RCS file: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/action/DynaActionForm.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- DynaActionForm.java   17 Jul 2002 15:40:23 -  1.3
  +++ DynaActionForm.java   27 Oct 2002 06:10:59 -  1.4
  @@ -165,8 +165,8 @@
   
   
   /**
  - * Does the specified mapped property contain a value for the specified
  - * key value?
  + * Indicates if the specified mapped property contain a value for the specified
  + * key value.
*
* @param name Name of the property to check
* @param key Name of the key to check
  @@ -176,7 +176,6 @@
*/
   public boolean contains(String name, String key) {
   
  -DynaProperty descriptor = getDynaProperty(name);
   Object value = dynaValues.get(name);
   if (value == null) {
   throw new NullPointerException
  @@ -260,7 +259,6 @@
*/
   public Object get(String name, int index) {
   
  -DynaProperty descriptor = getDynaProperty(name);
   Object value = dynaValues.get(name);
   if (value == null) {
   throw new NullPointerException
  @@ -291,7 +289,6 @@
*/
   public Object get(String name, String key) {
   
  -DynaProperty descriptor = getDynaProperty(name);
   Object value = dynaValues.get(name);
   if (value == null) {
   throw new NullPointerException
  @@ -330,7 +327,6 @@
*/
   public void remove(String name, String key) {
   
  -DynaProperty descriptor = getDynaProperty(name);
   Object value = dynaValues.get(name);
   if (value == null) {
   throw new NullPointerException
  @@ -402,7 +398,6 @@
*/
   public void set(String name, int index, Object value) {
   
  -DynaProperty descriptor = getDynaProperty(name);
   Object prop = dynaValues.get(name);
   if (prop == null) {
   throw new NullPointerException
  @@ -439,7 +434,6 @@
*/
   public void set(String name, String key, Object value) {
   
  -DynaProperty descriptor = getDynaProperty(name);
   Object prop = dynaValues.get(name);
   if (prop == null) {
   throw new NullPointerException
  @@ -559,7 +553,7 @@
   
   
   /**
  - * Is an object of the source class assignable to the destination class?
  + * Indicates if an object of the source class is assignable to the destination 
class.
*
* @param dest Destination class
* @param source Source class
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail:

cvs commit: jakarta-struts/src/share/org/apache/struts/action ActionServlet.java ActionServletWrapper.java

2002-10-26 Thread rleland

rleland 2002/10/26 23:01:49

  Modified:src/share/org/apache/struts/action ActionServlet.java
ActionServletWrapper.java
  Log:
  Fixup javadoc
  
  Revision  ChangesPath
  1.123 +6 -4  
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.122
  retrieving revision 1.123
  diff -u -r1.122 -r1.123
  --- ActionServlet.java27 Oct 2002 05:36:47 -  1.122
  +++ ActionServlet.java27 Oct 2002 06:01:48 -  1.123
  @@ -1212,6 +1212,8 @@
* Initialize the servlet mapping under which our controller servlet
* is being accessed.  This will be used in the &html:form>
* tag to generate correct destination URLs for form submissions.
  + * @throws ServletException if error happens while scanning web.xml
  + * FIXME throws ServletException Never thrown by this base method
*/
   protected void initServlet() throws ServletException {
   
  
  
  
  1.6   +12 -8 
jakarta-struts/src/share/org/apache/struts/action/ActionServletWrapper.java
  
  Index: ActionServletWrapper.java
  ===
  RCS file: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/action/ActionServletWrapper.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- ActionServletWrapper.java 22 Sep 2002 05:46:52 -  1.5
  +++ ActionServletWrapper.java 27 Oct 2002 06:01:48 -  1.6
  @@ -100,7 +100,10 @@
   
   }
   
  -
  +/**
  + * Log message
  + * @param message
  + */
   public void log(String message) {
   
   servlet.log(message);
  @@ -109,6 +112,7 @@
   
   /**
* Set servlet to a MultipartRequestHandler.
  + * @param object The MultipartRequestHandler
* :FIXME: Should this be based on an "setServlet"
* interface or introspection for a setServlet method?
* Or, is it safer to just add the types we want as we want them?
  @@ -119,10 +123,10 @@
   
   
   /**
  - * Create object and set servlet property
  - *
  + * Create object and set servlet property.
  + * @param servlet ActionServlet to wrap
*/
  - public ActionServletWrapper (ActionServlet servlet) {
  + public ActionServletWrapper(ActionServlet servlet) {
   super();
   this.servlet = servlet;
   }
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail:

cvs commit: jakarta-struts/src/share/org/apache/struts/action Action.java

2002-10-26 Thread rleland

rleland 2002/10/26 22:56:59

  Modified:src/share/org/apache/struts/action Action.java
  Log:
  Use errors.isEmpty() instead of errors.empty().
  
  Revision  ChangesPath
  1.49  +6 -6  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.48
  retrieving revision 1.49
  diff -u -r1.48 -r1.49
  --- Action.java   14 Oct 2002 18:16:18 -  1.48
  +++ Action.java   27 Oct 2002 05:56:59 -  1.49
  @@ -722,7 +722,7 @@
 ActionErrors errors) {
   
   // Remove any error messages attribute if none are required
  -if ((errors == null) || errors.empty()) {
  +if ((errors == null) || errors.isEmpty()) {
   request.removeAttribute(ERROR_KEY);
   return;
   }
  @@ -747,7 +747,7 @@
   ActionMessages messages) {
   
   // Remove any messages attribute if none are required
  -if ((messages == null) || messages.empty()) {
  +if ((messages == null) || messages.isEmpty()) {
   request.removeAttribute(MESSAGE_KEY);
   return;
   }
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail:

cvs commit: jakarta-struts/src/share/org/apache/struts/action ActionServlet.java

2002-10-26 Thread rleland

rleland 2002/10/26 22:36:48

  Modified:src/share/org/apache/struts/action ActionServlet.java
  Log:
  Close stream to web.xml after reading it
  into digester. Remove unused imports
  
  Revision  ChangesPath
  1.122 +11 -14
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.121
  retrieving revision 1.122
  diff -u -r1.121 -r1.122
  --- ActionServlet.java18 Oct 2002 15:27:42 -  1.121
  +++ ActionServlet.java27 Oct 2002 05:36:47 -  1.122
  @@ -69,21 +69,16 @@
   import java.sql.SQLException;
   import java.util.ArrayList;
   import java.util.Enumeration;
  -import java.util.HashMap;
   import java.util.Iterator;
  -import java.util.Locale;
   import java.util.MissingResourceException;
  -import javax.servlet.RequestDispatcher;
   import javax.servlet.ServletException;
   import javax.servlet.UnavailableException;
   import javax.servlet.http.HttpServlet;
   import javax.servlet.http.HttpServletRequest;
   import javax.servlet.http.HttpServletResponse;
  -import javax.servlet.http.HttpSession;
   import javax.sql.DataSource;
   import org.apache.commons.beanutils.BeanUtils;
   import org.apache.commons.beanutils.ConvertUtils;
  -import org.apache.commons.beanutils.PropertyUtils;
   import org.apache.commons.beanutils.converters.BooleanConverter;
   import org.apache.commons.beanutils.converters.ByteConverter;
   import org.apache.commons.beanutils.converters.CharacterConverter;
  @@ -94,7 +89,6 @@
   import org.apache.commons.beanutils.converters.ShortConverter;
   import org.apache.commons.collections.FastHashMap;
   import org.apache.commons.digester.Digester;
  -import org.apache.commons.digester.Rule;
   import org.apache.commons.digester.RuleSet;
   import org.apache.commons.logging.Log;
   import org.apache.commons.logging.LogFactory;
  @@ -107,8 +101,6 @@
   import org.apache.struts.config.ForwardConfig;
   import org.apache.struts.config.MessageResourcesConfig;
   import org.apache.struts.config.PlugInConfig;
  -import org.apache.struts.taglib.html.Constants;
  -import org.apache.struts.upload.MultipartRequestWrapper;
   import org.apache.struts.util.GenericDataSource;
   import org.apache.struts.util.MessageResources;
   import org.apache.struts.util.MessageResourcesFactory;
  @@ -1258,8 +1250,13 @@
   } catch (Throwable e) {
   log.error(internal.getMessage("configWebXml"), e);
   } finally {
  -if (input != null)
  -input = null;
  +if (input != null) {
  +try {
  +input.close();
  +} catch (IOException e) {
  +;
  +}
  +}
   }
   
   // Record a servlet context attribute (if appropriate)
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail:

Validator 1.0 RC3 Available

2002-10-26 Thread James Turner

We've had to do a few intermediate RCs since RC1 was released last week 
(one to fix a DTD issue, one to close out an obscure but important bug)

The latest Validator release candidate (RC3) can be found at:

http://jakarta.apache.org/builds/jakarta-commons/release/commons-validator/v 
1.0_rc3/

The intent, baring any unusual problems, is to vote on this RC as the 1.0 
release on Halloween (Oct 31st).

Enjoy (and thanks for Martin Cooper for more RC magic)
James




--
To unsubscribe, e-mail:   
For additional commands, e-mail:

cvs commit: jakarta-struts build-all-clean.bat.sample

2002-10-26 Thread rleland

rleland 2002/10/26 21:02:00

  Modified:.build-all-clean.bat.sample
  Log:
  Fix problem pointed out by Martin Cooper
  
  Revision  ChangesPath
  1.3   +17 -13jakarta-struts/build-all-clean.bat.sample
  
  Index: build-all-clean.bat.sample
  ===
  RCS file: /home/cvs/jakarta-struts/build-all-clean.bat.sample,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- build-all-clean.bat.sample26 Oct 2002 05:38:07 -  1.2
  +++ build-all-clean.bat.sample27 Oct 2002 04:02:00 -  1.3
  @@ -1,23 +1,27 @@
   @echo on
  -
   rem This is an example "build-all-clean.bat" file, used to build struts from 
  -rem a clean commons. It uses Cygwin to remove build directories since 
  +rem a clean commons. 
  +rem What is needed is a good top level commons build.xml for ant/maven.
  +rem I know I could submit a patch.
  +rem
  +rem This bat file uses Cygwin to remove build directories since 
   rem commons doesn't have an ant clean target. (HINT for COMMONS COMITTERS!)
   rem Make any changes you need, and rename this file
  -rem to "build-all-clean.bat" and in the same directory that contains the Struts
  -rem "build.xml" file.
  +rem to "build-all-clean.bat" and place it in the same directory that 
  +rem contains the Struts "build.xml" file.
  +rem 
   rem assumes jakarta-commons, 
   rem jakarta-commons-sandbox,
   rem jakarta-struts-current
  -rem are checked out in the same directory.
  +rem are checked out of CVS in the same directory.
   rem Also assumes uses of 
  -rem   maven beta 7,
  +rem   maven beta 7 or above,
   rem   ant 1.5.1
   rem   cactus v 1.2 & v1.3
  -rem  Because the commons (resources) use an old version
  -rem  of cactus for units test, that maven doesn't precompile 
  -rem  anymore, you'll need to copy the cactus.jar into the 
  -rem  maven repository directoty. I filed a bug report for this.
  +rem  v 1.2 Because the commons (resources) use an old version
  +remof cactus for units test, that maven doesn't precompile 
  +remanymore. You'll need to copy the cactus.jar into the 
  +remmaven repository directory. I filed a bug report for this.
   rem  
   rem
   rem $Id$
  @@ -57,12 +61,12 @@
   cd ..\validator
   call ant clean dist
   
  -cd fileupload
  +cd ..\fileupload
   call maven
   
   cd ..\..\jakarta-commons-sandbox
   
  -cd ..\resources
  +cd resources
   call maven
   
   cd ..\services
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail:

cvs commit: jakarta-struts/doc/userGuide preface.xml

2002-10-26 Thread jmitchell

jmitchell2002/10/26 19:44:14

Modified:doc/userGuide preface.xml
Log:
Update to fix a few typos

Revision ChangesPath
1.9 +8 -8 jakarta-struts/doc/userGuide/preface.xml

Index: preface.xml
===
RCS file: /home/cvs/jakarta-struts/doc/userGuide/preface.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- preface.xml 31 Aug 2002 13:15:02 - 1.8
+++ preface.xml 27 Oct 2002 02:44:14 - 1.9
@@ -38,18 +38,18 @@
If you are familiar with Java, but not these
technologies,
the best overall starting point is
http://java.sun.com/webservices/docs/1.0/tutorial/index.html";>The
Java Web Services Tutorial.
-This is also available for download as a
-http://java.sun.com/webservices/docs/1.0/tutorial/doc/JavaWSTutorial.pdf";>PDF.
+This is also available for download in
+http://java.sun.com/webservices/docs/1.0/tutorial/doc/JavaWSTutorial.pdf";>PDF
format.

-If you've created web applications for other platforms, you may able to
follow along
+If you've created web applications for other platforms, you may be able to
follow along
and visit the other references as needed. The core technologies used by Struts
are
also used by most other Java web development products, so the background
information will be
useful in any Java project.

If you are not familiar with the Java language generally,
-then the best start starting point is
+then the best starting point is
http://java.sun.com/docs/books/tutorial/index.html";>The Java
Tutorial.
This overlaps with the Java Web Services Tutorial in some places, but the two
work well together.

@@ -64,7 +64,7 @@
a HTML document. The browser then formats and displays the document to its
user. HTTP is used to
transport more than HTML, but HTML is the lingua franca of the Web and web
applications.

-Some Java engineers working web applications write their own HTML. Others
leave that to the
+While building web applications, some Java developers will write their own
HTML. Others leave that responsibility to the
page designers.

For more about HTTP, HTML, and User Agents, see:
@@ -184,7 +184,7 @@
Java applications, including web applications, are often configured using
http://java.sun.com/j2se/1.4.1/docs/api/java/util/Properties.html";>Properties
files. Properties files are the basis for the
-http://java.sun.com/j2se/1.4.1/docs/api/java/util/ResourceBundle.html";>ResourceBundles
that Struts uses to provide messages resources
+http://java.sun.com/j2se/1.4.1/docs/api/java/util/ResourceBundle.html";>ResourceBundles
that Struts uses to provide message resources
to an application.

For more about Properties files, see:
@@ -211,7 +211,7 @@

Much of the HTTP Request/Response cycle nuts-and-bolts
are handled by Sun's
http://java.sun.com/products/servlet/";>Java Servlet platform. This
casts HTTP
-into an object-orientated form so that developers can better concentrate what
+into an object-orientated form so that developers can better concentrate on what
they need their application to do -- rather than the mechanics of HTTP.

Struts provides a ready-to-use servlet for your application. As a Struts
developer, you
@@ -334,7 +334,7 @@
parses the request URI (contextPath, servletPath, and pathInfo) are
available separately.
User Information - If you are using
- Container Managed Security, you can ask
+ Container Managed Security, you can ask for
the username of the authenticated user, retrieve a
Principal object representing the current user, and
whether the current user is authorized for a specified role.

--
To unsubscribe, e-mail:
For additional commands, e-mail:

cvs commit: jakarta-struts/doc/userGuide building_controller.xml

2002-10-26 Thread dgraham

dgraham 2002/10/26 19:29:03

  Modified:doc/userGuide building_controller.xml
  Log:
  fixed typo in exception handler docs
  
  Revision  ChangesPath
  1.39  +1 -1  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.38
  retrieving revision 1.39
  diff -u -r1.38 -r1.39
  --- building_controller.xml   27 Oct 2002 02:27:47 -  1.38
  +++ building_controller.xml   27 Oct 2002 02:29:02 -  1.39
  @@ -429,7 +429,7 @@
 You can override global exception handlers by defining a handler inside an 
action definition.
 
 
  -  A common use of ExceptionHandler's is to configure one for 
java.lang.Exception so it's called
  +  A common use of ExceptionHandlers is to configure one for java.lang.Exception 
so it's called
 for any exception and log the exception to some data store.
 
 
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail:

cvs commit: jakarta-struts/doc/userGuide building_controller.xml

2002-10-26 Thread dgraham

dgraham 2002/10/26 19:27:48

  Modified:doc/userGuide building_controller.xml
  Log:
  fixed exception handler docs
  
  Revision  ChangesPath
  1.38  +6 -5  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.37
  retrieving revision 1.38
  diff -u -r1.37 -r1.38
  --- building_controller.xml   20 Oct 2002 20:01:06 -  1.37
  +++ building_controller.xml   27 Oct 2002 02:27:47 -  1.38
  @@ -417,15 +417,16 @@
 Your execute method should process the Exception and return an ActionForward
 object to tell Struts where to forward to next.  Then you configure your 
 handler in struts-config.xml like this:
  -  
  - 
  - 
  - 
  -  
  + 
  + 
  + 
 
 That configuration says that com.yourcorp.ExceptionHandler.execute() will be 
called 
 when any IOException is thrown by an Action.  The key is a key from your 
message resources
 properties file that can be used to display an error message.
  +  
  +  
  +  You can override global exception handlers by defining a handler inside an 
action definition.
 
 
 A common use of ExceptionHandler's is to configure one for 
java.lang.Exception so it's called
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail:

36 matches

Mail list logo