cvs commit: jakarta-struts/src/share/org/apache/struts/taglib/logic IterateTag.java

[dgraham]

dgraham 2003/01/31 21:30:28

  Modified:src/share/org/apache/struts/taglib/html
OptionsCollectionTag.java OptionsTag.java
OptionTag.java
   src/share/org/apache/struts/taglib/logic IterateTag.java
  Log:
  Formatting and if statement cleanup, no code changes.
  
  Revision  ChangesPath
  1.9   +44 -66
jakarta-struts/src/share/org/apache/struts/taglib/html/OptionsCollectionTag.java
  
  Index: OptionsCollectionTag.java
  ===
  RCS file: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/OptionsCollectionTag.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- OptionsCollectionTag.java 1 Feb 2003 05:12:24 -   1.8
  +++ OptionsCollectionTag.java 1 Feb 2003 05:30:28 -   1.9
  @@ -77,7 +77,6 @@
   import org.apache.struts.util.RequestUtils;
   import org.apache.struts.util.ResponseUtils;
   
  -
   /**
* Tag for creating multiple <select> options from a collection. The
* collection may be part of the enclosing form, or may be independent of
  @@ -97,21 +96,16 @@
   
   public class OptionsCollectionTag extends TagSupport {
   
  -
   // - Instance Variables
   
  -
   /**
* The message resources for this package.
*/
   protected static MessageResources messages =
  -MessageResources.getMessageResources(
  -Constants.Package + ".LocalStrings");
  -
  +MessageResources.getMessageResources(Constants.Package + ".LocalStrings");
   
   // - Properties
   
  -
   /**
* Should the label values be filtered for HTML sensitive characters?
*/
  @@ -125,7 +119,6 @@
   this.filter = filter;
   }
   
  -
   /**
* The name of the bean property containing the label.
*/
  @@ -139,7 +132,6 @@
   this.label = label;
   }
   
  -
   /**
* The name of the bean containing the values collection.
*/
  @@ -153,7 +145,6 @@
   this.name = name;
   }
   
  -
   /**
* The name of the property to use to build the values collection.
*/
  @@ -167,7 +158,6 @@
   this.property = property;
   }
   
  -
   /**
* The style associated with this tag.
*/
  @@ -181,7 +171,6 @@
   this.style = style;
   }
   
  -
   /**
* The named style class associated with this tag.
*/
  @@ -195,7 +184,6 @@
   this.styleClass = styleClass;
   }
   
  -
   /**
* The name of the bean property containing the value.
*/
  @@ -209,10 +197,8 @@
   this.value = value;
   }
   
  -
   // - Public Methods
   
  -
   /**
* Process the start of this tag.
*
  @@ -221,23 +207,20 @@
   public int doStartTag() throws JspException {
   
   // Acquire the select tag we are associated with
  -SelectTag selectTag =
  -(SelectTag)pageContext.getAttribute(Constants.SELECT_KEY);
  +SelectTag selectTag = (SelectTag) 
pageContext.getAttribute(Constants.SELECT_KEY);
   
   if (selectTag == null) {
  -JspException e = new JspException(
  -messages.getMessage("optionsCollectionTag.select"));
  +JspException e = new 
JspException(messages.getMessage("optionsCollectionTag.select"));
   RequestUtils.saveException(pageContext, e);
   throw e;
   }
   
   // Acquire the collection containing our options
  -Object collection = RequestUtils.lookup(pageContext,
  -name, property, null);
  +Object collection = RequestUtils.lookup(pageContext, name, property, null);
   
   if (collection == null) {
  -JspException e = new JspException(
  -messages.getMessage("optionsCollectionTag.collection"));
  +JspException e =
  +new 
JspException(messages.getMessage("optionsCollectionTag.collection"));
   RequestUtils.saveException(pageContext, e);
   throw e;
   }
  @@ -261,20 +244,19 @@
   beanLabel = "";
   }
   } catch (IllegalAccessException e) {
  -JspException jspe = new JspException(
  -messages.getMessage("getter.access", label, bean));
  +JspException jspe =
  +new JspException(messages.getMessage("getter.access", label, 
bean));
   RequestUtils.saveException(pageContext, jspe);
   throw jspe;

cvs commit: jakarta-struts/src/share/org/apache/struts/taglib/logic IterateTag.java

[dgraham]

dgraham 2003/01/31 21:12:25

  Modified:src/share/org/apache/struts/taglib/html
OptionsCollectionTag.java OptionsTag.java
   src/share/org/apache/struts/taglib/logic IterateTag.java
  Log:
  Replaced IteratorAdaptor references with commons-collections' 
  IteratorUtils.asIterator(Enumeration)
  
  Revision  ChangesPath
  1.8   +10 -4 
jakarta-struts/src/share/org/apache/struts/taglib/html/OptionsCollectionTag.java
  
  Index: OptionsCollectionTag.java
  ===
  RCS file: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/OptionsCollectionTag.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- OptionsCollectionTag.java 4 Oct 2002 05:34:19 -   1.7
  +++ OptionsCollectionTag.java 1 Feb 2003 05:12:24 -   1.8
  @@ -1,9 +1,13 @@
   /*
  + * $Header$
  + * $Revision$
  + * $Date$
  + * 
* 
*
* The Apache Software License, Version 1.1
*
  - * Copyright (c) 2002 The Apache Software Foundation.  All rights
  + * Copyright (c) 2002-2003 The Apache Software Foundation.  All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
  @@ -63,10 +67,12 @@
   import java.util.Enumeration;
   import java.util.Iterator;
   import java.util.Map;
  +
   import javax.servlet.jsp.JspException;
   import javax.servlet.jsp.tagext.TagSupport;
  +
   import org.apache.commons.beanutils.PropertyUtils;
  -import org.apache.struts.util.IteratorAdapter;
  +import org.apache.commons.collections.IteratorUtils;
   import org.apache.struts.util.MessageResources;
   import org.apache.struts.util.RequestUtils;
   import org.apache.struts.util.ResponseUtils;
  @@ -399,7 +405,7 @@
   else if (collection instanceof Map)
   return (((Map)collection).entrySet().iterator());
   else if (collection instanceof Enumeration)
  -return(new IteratorAdapter((Enumeration)collection));
  +return IteratorUtils.asIterator((Enumeration)collection);
   else
   throw new JspException(
   messages.getMessage("optionsCollectionTag.iterator",
  
  
  
  1.21  +34 -24
jakarta-struts/src/share/org/apache/struts/taglib/html/OptionsTag.java
  
  Index: OptionsTag.java
  ===
  RCS file: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/OptionsTag.java,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- OptionsTag.java   16 Dec 2002 03:41:43 -  1.20
  +++ OptionsTag.java   1 Feb 2003 05:12:25 -   1.21
  @@ -1,9 +1,13 @@
   /*
  + * $Header$
  + * $Revision$
  + * $Date$
  + * 
* 
*
* The Apache Software License, Version 1.1
*
  - * Copyright (c) 1999-2001 The Apache Software Foundation.  All rights
  + * Copyright (c) 1999-2003 The Apache Software Foundation.  All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
  @@ -63,10 +67,12 @@
   import java.util.Enumeration;
   import java.util.Iterator;
   import java.util.Map;
  +
   import javax.servlet.jsp.JspException;
   import javax.servlet.jsp.tagext.TagSupport;
  +
   import org.apache.commons.beanutils.PropertyUtils;
  -import org.apache.struts.util.IteratorAdapter;
  +import org.apache.commons.collections.IteratorUtils;
   import org.apache.struts.util.MessageResources;
   import org.apache.struts.util.RequestUtils;
   import org.apache.struts.util.ResponseUtils;
  @@ -128,11 +134,11 @@
   protected String labelName = null;
   
   public String getLabelName() {
  - return labelName;
  +return labelName;
   }
   
   public void setLabelName(String labelName) {
  - this.labelName = labelName;
  +this.labelName = labelName;
   }
   
   /**
  @@ -141,11 +147,11 @@
   protected String labelProperty = null;
   
   public String getLabelProperty() {
  - return labelProperty;
  +return labelProperty;
   }
   
   public void setLabelProperty(String labelProperty) {
  - this.labelProperty = labelProperty;
  +this.labelProperty = labelProperty;
   }
   
   /**
  @@ -154,11 +160,11 @@
   protected String name=null;
   
   public String getName() {
  - return name;
  +return name;
   }
   
   public void setName(String name) {
  - this.name = name;
  +this.name = name;
   }
   
   
  @@ -168,11 +174,11 @@
   protected String property=null;
   
   public String getProperty() {
  - return property;
  +return property;
   }
   
   public void setProperty(String property) {
  -   

cvs commit: jakarta-struts/src/share/org/apache/struts/taglib/html MessagesTag.java

[dmkarr]

dmkarr  2003/01/29 22:22:01

  Modified:src/share/org/apache/struts/taglib/html MessagesTag.java
  Log:
  Changed "bundle" default from "Globals.MESSAGES_KEY" to "null".  This was only
  a problem when the correct MessageResources was in request scope, not in
  application scope, which happens when using sub-modules.  If changed to null,
  the call to RequestUtils.message() correctly gets the request-scope bundle
  instead of the application-scope bundle.
  
  Revision  ChangesPath
  1.8   +5 -5  
jakarta-struts/src/share/org/apache/struts/taglib/html/MessagesTag.java
  
  Index: MessagesTag.java
  ===
  RCS file: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/MessagesTag.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- MessagesTag.java  8 Dec 2002 06:54:51 -   1.7
  +++ MessagesTag.java  30 Jan 2003 06:22:01 -  1.8
  @@ -112,7 +112,7 @@
   /**
* The servlet context attribute key for our resources.
   */
  -protected String bundle = Globals.MESSAGES_KEY;
  +protected String bundle = null;
   
   /**
* The session attribute key for our locale.
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-struts/src/share/org/apache/struts/taglib/html BaseTag.java

[dgraham]

dgraham 2003/01/29 21:38:41

  Modified:src/share/org/apache/struts/taglib/html BaseTag.java
  Log:
  Missed one of the duplicated method calls...
  
  Revision  ChangesPath
  1.13  +5 -5  
jakarta-struts/src/share/org/apache/struts/taglib/html/BaseTag.java
  
  Index: BaseTag.java
  ===
  RCS file: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/BaseTag.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- BaseTag.java  30 Jan 2003 05:37:15 -  1.12
  +++ BaseTag.java  30 Jan 2003 05:38:41 -  1.13
  @@ -123,7 +123,7 @@
   int port = request.getServerPort();
   
   StringBuffer buf = new StringBuffer("

cvs commit: jakarta-struts/src/share/org/apache/struts/taglib/html BaseTag.java

[dgraham]

dgraham 2003/01/29 21:37:16

  Modified:src/share/org/apache/struts/taglib/html BaseTag.java
  Log:
  Cleaned up duplicated method calls.
  
  Revision  ChangesPath
  1.12  +12 -8 
jakarta-struts/src/share/org/apache/struts/taglib/html/BaseTag.java
  
  Index: BaseTag.java
  ===
  RCS file: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/BaseTag.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- BaseTag.java  17 Nov 2002 01:48:33 -  1.11
  +++ BaseTag.java  30 Jan 2003 05:37:15 -  1.12
  @@ -7,7 +7,7 @@
*
* The Apache Software License, Version 1.1
*
  - * Copyright (c) 1999-2001 The Apache Software Foundation.  All rights
  + * Copyright (c) 1999-2003 The Apache Software Foundation.  All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
  @@ -81,6 +81,7 @@
* used to call the ActionServlet.
*
* @author Luis Arias <[EMAIL PROTECTED]>
  + * @author David Graham
* @version $Revision$ $Date$
*/
   
  @@ -118,6 +119,9 @@
   public int doStartTag() throws JspException {
   HttpServletRequest request = (HttpServletRequest) pageContext.getRequest();
   String serverName = request.getServerName();
  +String scheme = request.getScheme();
  +int port = request.getServerPort();
  +
   StringBuffer buf = new StringBuffer("

cvs commit: jakarta-struts/src/share/org/apache/struts/taglib/html FormTag.java

[dgraham]

dgraham 2003/01/27 21:18:03

  Modified:src/share/org/apache/struts/taglib/html FormTag.java
  Log:
  Output hidden token field in XHTML if necessary.
  
  Revision  ChangesPath
  1.43  +13 -7 
jakarta-struts/src/share/org/apache/struts/taglib/html/FormTag.java
  
  Index: FormTag.java
  ===
  RCS file: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/FormTag.java,v
  retrieving revision 1.42
  retrieving revision 1.43
  diff -u -r1.42 -r1.43
  --- FormTag.java  5 Jan 2003 00:40:04 -   1.42
  +++ FormTag.java  28 Jan 2003 05:18:03 -  1.43
  @@ -7,7 +7,7 @@
*
* The Apache Software License, Version 1.1
*
  - * Copyright (c) 1999-2002 The Apache Software Foundation.  All rights
  + * Copyright (c) 1999-2003 The Apache Software Foundation.  All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
  @@ -62,6 +62,7 @@
   package org.apache.struts.taglib.html;
   
   import java.io.IOException;
  +
   import javax.servlet.http.HttpServletRequest;
   import javax.servlet.http.HttpServletResponse;
   import javax.servlet.http.HttpSession;
  @@ -69,6 +70,8 @@
   import javax.servlet.jsp.JspWriter;
   import javax.servlet.jsp.PageContext;
   import javax.servlet.jsp.tagext.TagSupport;
  +
  +import org.apache.struts.Globals;
   import org.apache.struts.action.ActionForm;
   import org.apache.struts.action.ActionMapping;
   import org.apache.struts.action.ActionServlet;
  @@ -77,7 +80,6 @@
   import org.apache.struts.util.MessageResources;
   import org.apache.struts.util.RequestUtils;
   import org.apache.struts.util.ResponseUtils;
  -import org.apache.struts.Globals;
   
   /**
* Custom tag that represents an input form, associated with a bean whose
  @@ -555,7 +557,11 @@
   results.append(Constants.TOKEN_KEY);
   results.append("\" value=\"");
   results.append(token);
  -results.append("\">");
  +if (this.isXhtml()) {
  +results.append("\" />");
  +} else {
  +results.append("\">");
  +}
   }
   }
   
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>

cvs commit: jakarta-struts/src/share/org/apache/struts/taglib/html JavascriptValidatorTag.java

[dgraham]

dgraham 2003/01/19 22:00:48

  Modified:src/share/org/apache/struts/taglib/html
JavascriptValidatorTag.java
  Log:
  Don't print html comments around script in xhtml mode.
  
  Revision  ChangesPath
  1.22  +9 -9  
jakarta-struts/src/share/org/apache/struts/taglib/html/JavascriptValidatorTag.java
  
  Index: JavascriptValidatorTag.java
  ===
  RCS file: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/JavascriptValidatorTag.java,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- JavascriptValidatorTag.java   17 Jan 2003 06:09:17 -  1.21
  +++ JavascriptValidatorTag.java   20 Jan 2003 06:00:48 -  1.22
  @@ -544,22 +544,22 @@
   sb.append("

cvs commit: jakarta-struts/src/share/org/apache/struts/taglib/html JavascriptValidatorTag.java

[dgraham]

dgraham 2003/01/16 22:09:17

  Modified:src/share/org/apache/struts/taglib/html
JavascriptValidatorTag.java
  Log:
  Added cdata attribute to javascript tag for xhtml.
  
  Revision  ChangesPath
  1.21  +37 -1 
jakarta-struts/src/share/org/apache/struts/taglib/html/JavascriptValidatorTag.java
  
  Index: JavascriptValidatorTag.java
  ===
  RCS file: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/JavascriptValidatorTag.java,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- JavascriptValidatorTag.java   16 Jan 2003 03:55:09 -  1.20
  +++ JavascriptValidatorTag.java   17 Jan 2003 06:09:17 -  1.21
  @@ -1,4 +1,10 @@
   /*
  + * $Header$
  + * $Revision$
  + * $Date$
  + *
  + * 
  + *
* The Apache Software License, Version 1.1
*
* Copyright (c) 1999-2003 The Apache Software Foundation.  All rights
  @@ -144,6 +150,11 @@
* The JavaScript methods will enclosed with html comments if this is set to 
"true".
*/
   protected String htmlComment = "true";
  +
  +/**
  + * Hide JavaScript methods in a CDATA section for XHTML when "true".
  + */
  +protected String cdata = "true";
   
   private String htmlBeginComment = "\n

cvs commit: jakarta-struts/src/share/org/apache/struts/taglib/html XhtmlTag.java

[dgraham]

dgraham 2003/01/16 21:26:22

  Modified:src/share/org/apache/struts/taglib/html XhtmlTag.java
  Log:
  *** keyword substitution change ***
  
  Revision  ChangesPath
  1.3   +0 -0  
jakarta-struts/src/share/org/apache/struts/taglib/html/XhtmlTag.java
  
  Index: XhtmlTag.java
  ===
  RCS file: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/XhtmlTag.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>

cvs commit: jakarta-struts/src/share/org/apache/struts/taglib/html XhtmlTag.java

[dgraham]

dgraham 2003/01/16 21:27:52

  Modified:src/share/org/apache/struts/taglib/html XhtmlTag.java
  Log:
  trying cvs keyword substitution...
  
  Revision  ChangesPath
  1.4   +3 -3  
jakarta-struts/src/share/org/apache/struts/taglib/html/XhtmlTag.java
  
  Index: XhtmlTag.java
  ===
  RCS file: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/XhtmlTag.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>

Re: cvs commit: jakarta-struts/src/share/org/apache/struts/taglib/htmlJavascriptValidatorTag.java

[Craig R. McClanahan]

On 16 Jan 2003 [EMAIL PROTECTED] wrote:

> Date: 16 Jan 2003 03:55:09 -
> From: [EMAIL PROTECTED]
> Reply-To: Struts Developers List <[EMAIL PROTECTED]>
> To: [EMAIL PROTECTED]
> Subject: cvs commit:
> jakarta-struts/src/share/org/apache/struts/taglib/html
> JavascriptValidatorTag.java
>
> dgraham 2003/01/15 19:55:09
>
>   Modified:src/share/org/apache/struts/taglib/html
> JavascriptValidatorTag.java
>   Log:
>   Removed generation of CDATA section for xhtml.  Using html comments works
>   better.
>

According to the XHTML spec this is a *really* bad idea.  Broken browsers
are no excuse for Struts to generate markup that violates the
recommendations of the standards.

Craig


--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>

cvs commit: jakarta-struts/src/share/org/apache/struts/taglib/html JavascriptValidatorTag.java

[dgraham]

dgraham 2003/01/15 19:55:09

  Modified:src/share/org/apache/struts/taglib/html
JavascriptValidatorTag.java
  Log:
  Removed generation of CDATA section for xhtml.  Using html comments works
  better.
  
  Revision  ChangesPath
  1.20  +4 -11 
jakarta-struts/src/share/org/apache/struts/taglib/html/JavascriptValidatorTag.java
  
  Index: JavascriptValidatorTag.java
  ===
  RCS file: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/JavascriptValidatorTag.java,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- JavascriptValidatorTag.java   8 Dec 2002 06:54:51 -   1.19
  +++ JavascriptValidatorTag.java   16 Jan 2003 03:55:09 -  1.20
  @@ -1,7 +1,7 @@
   /*
* The Apache Software License, Version 1.1
*
  - * Copyright (c) 1999 The Apache Software Foundation.  All rights
  + * Copyright (c) 1999-2003 The Apache Software Foundation.  All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
  @@ -528,12 +528,9 @@
   
   sb.append(this.getStartElement());
   
  -if (this.isXhtml()) {
  -sb.append("\r\n");
   }
   
   sb.append("\n\n");
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>

cvs commit: jakarta-struts/src/share/org/apache/struts/taglib/html XhtmlTag.java

[dgraham]

dgraham 2003/01/15 19:51:23

  Modified:src/share/org/apache/struts/taglib/html XhtmlTag.java
  Log:
  Added apache license to top of file, not sure about the keyword replacement
  though.
  
  Revision  ChangesPath
  1.2   +61 -0 
jakarta-struts/src/share/org/apache/struts/taglib/html/XhtmlTag.java
  
  Index: XhtmlTag.java
  ===
  RCS file: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/XhtmlTag.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- XhtmlTag.java 16 Nov 2002 07:27:18 -  1.1
  +++ XhtmlTag.java 16 Jan 2003 03:51:23 -  1.2
  @@ -1,3 +1,64 @@
  +/*
  + * $Header$
  + * $Revision$
  + * $Date$
  + *
  + * 
  + * 
  + * The Apache Software License, Version 1.1
  + *
  + * Copyright (c) 2003 The Apache Software Foundation.  All rights 
  + * reserved.
  + *
  + * Redistribution and use in source and binary forms, with or without
  + * modification, are permitted provided that the following conditions
  + * are met:
  + *
  + * 1. Redistributions of source code must retain the above copyright
  + *notice, this list of conditions and the following disclaimer. 
  + *
  + * 2. Redistributions in binary form must reproduce the above copyright
  + *notice, this list of conditions and the following disclaimer in
  + *the documentation and/or other materials provided with the
  + *distribution.
  + *
  + * 3. The end-user documentation included with the redistribution, if
  + *any, must include the following acknowlegement:  
  + *   "This product includes software developed by the 
  + *Apache Software Foundation (http://www.apache.org/)."
  + *Alternately, this acknowlegement may appear in the software itself,
  + *if and wherever such third-party acknowlegements normally appear.
  + *
  + * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software
  + *Foundation" must not be used to endorse or promote products derived
  + *from this software without prior written permission. For written 
  + *permission, please contact [EMAIL PROTECTED]
  + *
  + * 5. Products derived from this software may not be called "Apache"
  + *nor may "Apache" appear in their names without prior written
  + *permission of the Apache Group.
  + *
  + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
  + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  + * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
  + * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
  + * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
  + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
  + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  + * SUCH DAMAGE.
  + * 
  + *
  + * This software consists of voluntary contributions made by many
  + * individuals on behalf of the Apache Software Foundation.  For more
  + * information on the Apache Software Foundation, please see
  + * <http://www.apache.org/>.
  + *
  + */
  + 
   package org.apache.struts.taglib.html;
   
   import javax.servlet.jsp.JspException;
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>

cvs commit: jakarta-struts/src/share/org/apache/struts/taglib/bean StrutsTei.java

[dmkarr]

dmkarr  2003/01/12 12:27:54

  Modified:src/share/org/apache/struts/taglib/bean StrutsTei.java
  Log:
  Fixing #15927.
  
  Changing "getAttributeString()" to "getAttribute()" for "formBean", "forward",
  nd "mapping" attributes, because we only need to know whether they are set, not
  what they are set to.
  
  Revision  ChangesPath
  1.4   +7 -7  
jakarta-struts/src/share/org/apache/struts/taglib/bean/StrutsTei.java
  
  Index: StrutsTei.java
  ===
  RCS file: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/bean/StrutsTei.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- StrutsTei.java12 Feb 2001 01:26:57 -  1.3
  +++ StrutsTei.java12 Jan 2003 20:27:54 -  1.4
  @@ -85,11 +85,11 @@
   public VariableInfo[] getVariableInfo(TagData data) {
   
   String type = null;
  -if (data.getAttributeString("formBean") != null)
  +if (data.getAttribute("formBean") != null)
   type = "org.apache.struts.action.ActionFormBean";
  -else if (data.getAttributeString("forward") != null)
  +else if (data.getAttribute("forward") != null)
   type = "org.apache.struts.action.ActionForward";
  -else if (data.getAttributeString("mapping") != null)
  +else if (data.getAttribute("mapping") != null)
   type = "org.apache.struts.action.ActionMapping";
   else
   type = "java.lang.Object";
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>

cvs commit: jakarta-struts/src/share/org/apache/struts/taglib/html BaseHandlerTag.java

[turner]

turner  2003/01/04 16:50:08

  Modified:src/share/org/apache/struts/taglib/html BaseHandlerTag.java
  Log:
  Enable JSTL forEach and forToken support with indexed="true" HTML tags
  
  Revision  ChangesPath
  1.21  +64 -6 
jakarta-struts/src/share/org/apache/struts/taglib/html/BaseHandlerTag.java
  
  Index: BaseHandlerTag.java
  ===
  RCS file: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/BaseHandlerTag.java,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- BaseHandlerTag.java   8 Dec 2002 06:54:50 -   1.20
  +++ BaseHandlerTag.java   5 Jan 2003 00:50:08 -   1.21
  @@ -65,11 +65,14 @@
   
   import javax.servlet.jsp.JspException;
   import javax.servlet.jsp.tagext.BodyTagSupport;
  +import javax.servlet.jsp.tagext.Tag;
   
   import org.apache.struts.Globals;
   import org.apache.struts.taglib.logic.IterateTag;
   import org.apache.struts.util.MessageResources;
   import org.apache.struts.util.RequestUtils;
  +import java.lang.reflect.Method;
  +import java.lang.reflect.InvocationTargetException;
   
   /**
* Base class for tags that render form elements capable of including JavaScript
  @@ -78,6 +81,7 @@
* appropriate implementations of these.
*
* @author Don Clasen
  + * @author James Turner
* @version $Revision$ $Date$
*/
   
  @@ -570,6 +574,46 @@
   
   }
   
  +private Class loopTagSupportClass = null;
  +private Method loopTagSupportGetStatus = null;
  +private Class loopTagStatusClass = null;
  +private Method loopTagStatusGetIndex = null;
  +private boolean triedJstlInit = false;
  +private boolean triedJstlSuccess = false;
  +
  +private Integer getJstlLoopIndex () {
  + if (!triedJstlInit) {
  + triedJstlInit = true;
  + try {
  + loopTagSupportClass = 
  + Class.forName("javax.servlet.jsp.jstl.core.LoopTagSupport");
  + loopTagSupportGetStatus = 
  + loopTagSupportClass.getDeclaredMethod("getLoopStatus", null);
  + loopTagStatusClass =
  + Class.forName("javax.servlet.jsp.jstl.core.LoopTagStatus");
  + loopTagStatusGetIndex = 
  + loopTagStatusClass.getDeclaredMethod("getIndex", null);
  + triedJstlSuccess = true;
  + }
  + catch (ClassNotFoundException ex) {}
  + catch (NoSuchMethodException ex) {}
  + }
  + if (triedJstlSuccess) {
  + try {
  + Object loopTag = findAncestorWithClass(this, loopTagSupportClass);
  + if (loopTag == null)  return null;
  + Object status = loopTagSupportGetStatus.invoke(loopTag, null);
  + return (Integer) loopTagStatusGetIndex.invoke(status, null);
  + } 
  + catch (IllegalAccessException ex) {}
  + catch (IllegalArgumentException ex) {}
  + catch (InvocationTargetException ex) {}
  + catch (NullPointerException ex) {}
  + catch (ExceptionInInitializerError ex) {}
  + }
  + return null;
  +}
  +
   /**
*  Appends bean name with index in brackets for tags with
*  'true' value in 'indexed' attribute.
  @@ -577,9 +621,23 @@
*  @exception JspException if 'indexed' tag used outside of iterate tag.
*/
   protected void prepareIndex(StringBuffer handlers, String name) throws 
JspException {
  + int index = 0;
  + boolean found = false;
  +
   // look for outer iterate tag
   IterateTag iterateTag = (IterateTag) findAncestorWithClass(this, 
IterateTag.class);
  -if (iterateTag == null) {
  + // Look for JSTL loops
  + if (iterateTag == null) {
  + Integer i = getJstlLoopIndex();
  + if (i != null) {
  + index = i.intValue();
  + found = true;
  + }
  + } else {
  + index = iterateTag.getIndex();
  + found = true;
  + }
  +if (!found) {
   // this tag should only be nested in iteratetag, if it's not, throw 
exception
   JspException e = new 
JspException(messages.getMessage("indexed.noEnclosingIterate"));
   RequestUtils.saveException(pageContext, e);
  @@ -588,7 +646,7 @@
   if (name != null)
   handlers.append(name);
   handlers.append("[");
  -handlers.append(iterateTag.getIndex());
  +handlers.append(index);
   handlers.append("]");
   if (name != null)
   handlers.append(".");
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>

cvs commit: jakarta-struts/src/share/org/apache/struts/taglib/html BaseHandlerTag.java

[turner]

turner  2003/01/04 17:44:08

  Modified:src/share/org/apache/struts/taglib/html BaseHandlerTag.java
  Log:
  Couple of tweaks suggested by Martin C.
  
  Revision  ChangesPath
  1.23  +32 -12
jakarta-struts/src/share/org/apache/struts/taglib/html/BaseHandlerTag.java
  
  Index: BaseHandlerTag.java
  ===
  RCS file: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/BaseHandlerTag.java,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- BaseHandlerTag.java   5 Jan 2003 01:40:44 -   1.22
  +++ BaseHandlerTag.java   5 Jan 2003 01:44:08 -   1.23
  @@ -72,6 +72,8 @@
   import org.apache.struts.util.RequestUtils;
   import java.lang.reflect.Method;
   import java.lang.reflect.InvocationTargetException;
  +import org.apache.commons.logging.Log;
  +import org.apache.commons.logging.LogFactory;
   
   /**
* Base class for tags that render form elements capable of including JavaScript
  @@ -86,6 +88,11 @@
   
   public abstract class BaseHandlerTag extends BodyTagSupport {
   
  +/**
  + * Commons Logging instance.
  + */
  +private static Log log = LogFactory.getLog(BaseHandlerTag.class);
  +
   // - Instance Variables
   
   /**
  @@ -585,30 +592,43 @@
triedJstlInit = true;
try {
loopTagSupportClass = 
  - Class.forName("javax.servlet.jsp.jstl.core.LoopTagSupport");
  + 
RequestUtils.applicationClass("javax.servlet.jsp.jstl.core.LoopTagSupport");
loopTagSupportGetStatus = 
loopTagSupportClass.getDeclaredMethod("getLoopStatus", null);
loopTagStatusClass =
  - Class.forName("javax.servlet.jsp.jstl.core.LoopTagStatus");
  + 
RequestUtils.applicationClass("javax.servlet.jsp.jstl.core.LoopTagStatus");
loopTagStatusGetIndex = 
loopTagStatusClass.getDeclaredMethod("getIndex", null);
triedJstlSuccess = true;
}
  + // These just mean that JSTL isn't loaded, so ignore
catch (ClassNotFoundException ex) {}
catch (NoSuchMethodException ex) {}
}
if (triedJstlSuccess) {
try {
Object loopTag = findAncestorWithClass(this, loopTagSupportClass);
  - if (loopTag == null)  return null;
  + if (loopTag == null)  {
  + return null;
  + }
Object status = loopTagSupportGetStatus.invoke(loopTag, null);
return (Integer) loopTagStatusGetIndex.invoke(status, null);
} 
  - catch (IllegalAccessException ex) {}
  - catch (IllegalArgumentException ex) {}
  - catch (InvocationTargetException ex) {}
  - catch (NullPointerException ex) {}
  - catch (ExceptionInInitializerError ex) {}
  + catch (IllegalAccessException ex) {
  + log.error(ex.getMessage(), ex);
  + }
  + catch (IllegalArgumentException ex) {
  + log.error(ex.getMessage(), ex);
  + }
  + catch (InvocationTargetException ex) {
  + log.error(ex.getMessage(), ex);
  + }
  + catch (NullPointerException ex) {
  + log.error(ex.getMessage(), ex);
  + }
  + catch (ExceptionInInitializerError ex) {
  + log.error(ex.getMessage(), ex);
  + }
}
return null;
   }
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>

cvs commit: jakarta-struts/src/share/org/apache/struts/taglib/html BaseHandlerTag.java

[martinc]

martinc 2003/01/04 17:40:44

  Modified:src/share/org/apache/struts/taglib/html BaseHandlerTag.java
  Log:
  Ack! Fix one more (newly added!) unused import.
  
  Revision  ChangesPath
  1.22  +4 -5  
jakarta-struts/src/share/org/apache/struts/taglib/html/BaseHandlerTag.java
  
  Index: BaseHandlerTag.java
  ===
  RCS file: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/BaseHandlerTag.java,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- BaseHandlerTag.java   5 Jan 2003 00:50:08 -   1.21
  +++ BaseHandlerTag.java   5 Jan 2003 01:40:44 -   1.22
  @@ -65,7 +65,6 @@
   
   import javax.servlet.jsp.JspException;
   import javax.servlet.jsp.tagext.BodyTagSupport;
  -import javax.servlet.jsp.tagext.Tag;
   
   import org.apache.struts.Globals;
   import org.apache.struts.taglib.logic.IterateTag;
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>

cvs commit: jakarta-struts/src/share/org/apache/struts/taglib/logic MessagesPresentTag.java

[martinc]

martinc 2003/01/04 16:40:04

  Modified:src/share/org/apache/struts/config
ConfigHelperInterface.java
   src/share/org/apache/struts/taglib/bean MessageTag.java
   src/share/org/apache/struts/taglib/html FormTag.java
   src/share/org/apache/struts/taglib/logic
MessagesPresentTag.java
  Log:
  Fix duplicate imports and unused imports.
  
  Revision  ChangesPath
  1.5   +4 -7  
jakarta-struts/src/share/org/apache/struts/config/ConfigHelperInterface.java
  
  Index: ConfigHelperInterface.java
  ===
  RCS file: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/config/ConfigHelperInterface.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ConfigHelperInterface.java12 Nov 2002 03:56:09 -  1.4
  +++ ConfigHelperInterface.java5 Jan 2003 00:40:04 -   1.5
  @@ -80,9 +80,6 @@
   import org.apache.struts.upload.MultipartRequestWrapper;
   import org.apache.struts.util.MessageResources;
   
  -// since 1.1
  -import org.apache.struts.action.ActionMessages;
  -
   
   /**
* NOTE: THIS CLASS IS UNDER ACTIVE DEVELOPMENT.
  
  
  
  1.9   +4 -5  
jakarta-struts/src/share/org/apache/struts/taglib/bean/MessageTag.java
  
  Index: MessageTag.java
  ===
  RCS file: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/bean/MessageTag.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- MessageTag.java   12 Nov 2002 03:56:08 -  1.8
  +++ MessageTag.java   5 Jan 2003 00:40:04 -   1.9
  @@ -69,7 +69,6 @@
   import javax.servlet.jsp.tagext.TagSupport;
   
   import org.apache.struts.Globals;
  -import org.apache.struts.action.Action;
   import org.apache.struts.util.MessageResources;
   import org.apache.struts.util.RequestUtils;
   import org.apache.struts.util.ResponseUtils;
  
  
  
  1.42  +4 -5  
jakarta-struts/src/share/org/apache/struts/taglib/html/FormTag.java
  
  Index: FormTag.java
  ===
  RCS file: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/FormTag.java,v
  retrieving revision 1.41
  retrieving revision 1.42
  diff -u -r1.41 -r1.42
  --- FormTag.java  29 Dec 2002 17:00:15 -  1.41
  +++ FormTag.java  5 Jan 2003 00:40:04 -   1.42
  @@ -62,7 +62,6 @@
   package org.apache.struts.taglib.html;
   
   import java.io.IOException;
  -import java.util.StringTokenizer;
   import javax.servlet.http.HttpServletRequest;
   import javax.servlet.http.HttpServletResponse;
   import javax.servlet.http.HttpSession;
  
  
  
  1.6   +1 -2  
jakarta-struts/src/share/org/apache/struts/taglib/logic/MessagesPresentTag.java
  
  Index: MessagesPresentTag.java
  ===
  RCS file: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/logic/MessagesPresentTag.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- MessagesPresentTag.java   12 Nov 2002 03:56:10 -  1.5
  +++ MessagesPresentTag.java   5 Jan 2003 00:40:04 -   1.6
  @@ -61,7 +61,6 @@
   import javax.servlet.jsp.JspException;
   
   import org.apache.struts.Globals;
  -import org.apache.struts.action.Action;
   import org.apache.struts.action.ActionMessages;
   import org.apache.struts.util.RequestUtils;
   
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>

cvs commit: jakarta-struts/src/share/org/apache/struts/taglib/tiles InsertTag.java

[cedric]

cedric  2002/12/29 13:31:02

  Modified:src/share/org/apache/struts/taglib/tiles InsertTag.java
  Log:
  Call the TilesUtil.doInclude() method when an include is needed.
  
  Revision  ChangesPath
  1.9   +55 -32
jakarta-struts/src/share/org/apache/struts/taglib/tiles/InsertTag.java
  
  Index: InsertTag.java
  ===
  RCS file: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/tiles/InsertTag.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- InsertTag.java12 Dec 2002 21:23:29 -  1.8
  +++ InsertTag.java29 Dec 2002 21:31:02 -  1.9
  @@ -64,6 +64,7 @@
   import java.io.IOException;
   import java.io.PrintWriter;
   import java.util.Map;
  +import java.util.StringTokenizer;
   
   import javax.servlet.ServletException;
   import javax.servlet.http.HttpServletRequest;
  @@ -82,7 +83,8 @@
   import org.apache.struts.tiles.DefinitionAttribute;
   import org.apache.struts.tiles.DefinitionNameAttribute;
   import org.apache.struts.tiles.DefinitionsFactoryException;
  -import org.apache.struts.tiles.DefinitionsUtil;
  +//import org.apache.struts.tiles.DefinitionsUtil;
  +import org.apache.struts.tiles.TilesUtil;
   import org.apache.struts.tiles.DirectStringAttribute;
   import org.apache.struts.tiles.FactoryNotFoundException;
   import org.apache.struts.tiles.NoSuchDefinitionException;
  @@ -96,9 +98,7 @@
* @author Cedric Dumoulin
* @version $Revision$ $Date$
*/
  -public class InsertTag
  - extends DefinitionTagSupport
  - implements PutTagParent, ComponentConstants, PutListTagParent {
  +public class InsertTag extends DefinitionTagSupport implements PutTagParent, 
ComponentConstants, PutListTagParent {
   
/** Commons Logging instance. */
protected static Log log = LogFactory.getLog(InsertTag.class);
  @@ -553,28 +553,28 @@
 */
protected TagHandler processDefinitionName(String name) throws JspException {
   
  -try {
  -ComponentDefinition definition = DefinitionsUtil.getDefinition(name, 
pageContext);
  -if (definition == null) { // is it possible ?
  -throw new NoSuchDefinitionException();
  -}
  -return processDefinition(definition);
  -
  -} catch (NoSuchDefinitionException ex) {
  -throw new JspException(
  -"Error -  Tag Insert : Can't get definition '"
  -+ definitionName
  -+ "'. Check if this name exist in definitions factory.");
  -} catch (FactoryNotFoundException ex) { // factory not found.
  -throw new JspException(ex.getMessage());
  -} // end catch
  -catch (DefinitionsFactoryException ex) {
  -if (log.isDebugEnabled())
  -ex.printStackTrace();
  -// Save exception to be able to show it later
  -pageContext.setAttribute(Globals.EXCEPTION_KEY, ex, 
PageContext.REQUEST_SCOPE);
  -throw new JspException(ex.getMessage());
  -} // end catch
  +try {
  +ComponentDefinition definition = TilesUtil.getDefinition(name, 
(HttpServletRequest)pageContext.getRequest(),pageContext.getServletContext());
  +if (definition == null) { // is it possible ?
  +throw new NoSuchDefinitionException();
  +}
  +return processDefinition(definition);
  +
  +} catch (NoSuchDefinitionException ex) {
  +throw new JspException(
  +"Error -  Tag Insert : Can't get definition '"
  ++ definitionName
  ++ "'. Check if this name exist in definitions factory.");
  +} catch (FactoryNotFoundException ex) { // factory not found.
  +throw new JspException(ex.getMessage());
  +} // end catch
  +catch (DefinitionsFactoryException ex) {
  +if (log.isDebugEnabled())
  +ex.printStackTrace();
  +// Save exception to be able to show it later
  +pageContext.setAttribute(Globals.EXCEPTION_KEY, ex, 
PageContext.REQUEST_SCOPE);
  +throw new JspException(ex.getMessage());
  +} // end catch
   }
   
/**
  @@ -664,7 +664,7 @@
 */
public TagHandler processAsDefinitionOrURL(String name) throws JspException {
try {
  - ComponentDefinition definition = 
DefinitionsUtil.getDefinition(name, pageContext);
  + ComponentDefinition definition = TilesUtil.getDefinition(name, 
pageContext.getRequest(), pageContext.getServletContext());
if (definition != null)
return processDefinition(definition);
} catch (DefinitionsFactoryException ex) { // silently failed, because 
we can choose to not define a factory.
  @

cvs commit: jakarta-struts/src/share/org/apache/struts/taglib/html LinkTag.java FormTag.java

[husted]

husted  2002/12/29 09:00:16

  Modified:src/share/org/apache/struts/taglib/html LinkTag.java
FormTag.java
  Log:
  Apply patch for PR #13645 contributed by James Turner.
  
  Revision  ChangesPath
  1.28  +24 -7 
jakarta-struts/src/share/org/apache/struts/taglib/html/LinkTag.java
  
  Index: LinkTag.java
  ===
  RCS file: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/LinkTag.java,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- LinkTag.java  23 Sep 2002 05:13:43 -  1.27
  +++ LinkTag.java  29 Dec 2002 17:00:15 -  1.28
  @@ -76,6 +76,7 @@
* Generate a URL-encoded hyperlink to the specified URI.
*
* @author Craig R. McClanahan
  + * @author James Turner
* @version $Revision$ $Date$
*/
   
  @@ -187,9 +188,24 @@
   
   
   /**
  - * The single-parameter request parameter name to generate.
  + * The module-relative action (beginning with a slash) which will be
  + * called by this link
*/
  -protected String paramId = null;
  +protected String action = null;
  +
  +public String getAction() {
  +return (this.action);
  +}
  +
  +public void setAction(String action) {
  +this.action = action;
  +}
  +
  +
  +/**
  +  * The single-parameter request parameter name to generate.
  +  */
  + protected String paramId = null;
   
   public String getParamId() {
   return (this.paramId);
  @@ -417,6 +433,7 @@
   linkName = null;
   name = null;
   page = null;
  +action = null;
   paramId = null;
   paramName = null;
   paramProperty = null;
  @@ -476,7 +493,7 @@
   String url = null;
   try {
   url = RequestUtils.computeURL(pageContext, forward, href,
  -  page, params, anchor, false);
  +  page, action, params, anchor, false);
   } catch (MalformedURLException e) {
   RequestUtils.saveException(pageContext, e);
   throw new JspException
  
  
  
  1.41  +15 -95
jakarta-struts/src/share/org/apache/struts/taglib/html/FormTag.java
  
  Index: FormTag.java
  ===
  RCS file: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/FormTag.java,v
  retrieving revision 1.40
  retrieving revision 1.41
  diff -u -r1.40 -r1.41
  --- FormTag.java  13 Dec 2002 02:36:47 -  1.40
  +++ FormTag.java  29 Dec 2002 17:00:15 -  1.41
  @@ -86,6 +86,7 @@
*
* @author Craig R. McClanahan
* @author Martin Cooper
  + * @author James Turner
* @version $Revision$ $Date$
*/
   
  @@ -115,8 +116,8 @@
   
   /**
* The index in the focus field array to receive focus.  This only applies if 
the field
  - * given in the focus attribute is actually an array of fields.  This allows a 
specific 
  - * field in a radio button array to receive focus while still allowing indexed 
field 
  + * given in the focus attribute is actually an array of fields.  This allows a 
specific
  + * field in a radio button array to receive focus while still allowing indexed 
field
* names like "myRadioButtonField[1]" to be passed in the focus attribute.
* @since Struts 1.1
*/
  @@ -504,13 +505,13 @@
   results.append(" name=\"");
   results.append(beanName);
   results.append("\"");
  -results.append(" method=\"");
  -results.append(method == null ? "post" : method);
  -results.append("\" action=\"");
  -results.append(response.encodeURL(getActionMappingURL()));
  -results.append("\"");
  -if (styleClass != null) {
  -results.append(" class=\"");
  + results.append(" method=\"");
  + results.append(method == null ? "post" : method);
  + results.append("\" action=\"");
  + results.append(response.encodeURL(RequestUtils.getActionMappingURL(action, 
pageContext)));
  + results.append("\"");
  + if (styleClass != null) {
  + results.append(" class=\"");
   results.append(styleClass);
   results.append("\"");
   }
  @@ -695,87 +696,6 @@
   
   // -- Protected Methods
   
  -/**
  - * Return the form action converted into an action mapping path.  The
  - * value of the action property is manipulated as follows in
  - * computing the name of the requested mapping:
  -  

cvs commit: jakarta-struts/src/share/org/apache/struts/taglib/html CancelTag.java

[rleland]

rleland 2002/12/21 20:55:30

  Modified:src/share/org/apache/struts/taglib/html CancelTag.java
  Log:
  JDK 1.3 Does not have StringBuffer.indexOf()
  perform a costly toString() to compile under 1.3
  
  Revision  ChangesPath
  1.12  +5 -5  
jakarta-struts/src/share/org/apache/struts/taglib/html/CancelTag.java
  
  Index: CancelTag.java
  ===
  RCS file: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/CancelTag.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- CancelTag.java21 Dec 2002 04:13:40 -  1.11
  +++ CancelTag.java22 Dec 2002 04:55:30 -  1.12
  @@ -212,7 +212,7 @@
   results.append(prepareStyles());
   
   // if no onclick event was provided, put in the cancel script
  -if(results.indexOf("onclick=")==-1){
  +if(results.toString().indexOf("onclick=")==-1){
 results.append(" onclick=\"bCancel=true;\"");
   }
   
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>

cvs commit: jakarta-struts/src/share/org/apache/struts/taglib/html CancelTag.java

[dgraham]

dgraham 2002/12/20 20:13:41

  Modified:src/share/org/apache/struts/taglib/html CancelTag.java
  Log:
  Added onclick script to set bCancel to true.  Fixes PR #12470
  
  Revision  ChangesPath
  1.11  +10 -4 
jakarta-struts/src/share/org/apache/struts/taglib/html/CancelTag.java
  
  Index: CancelTag.java
  ===
  RCS file: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/CancelTag.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- CancelTag.java16 Nov 2002 06:05:21 -  1.10
  +++ CancelTag.java21 Dec 2002 04:13:40 -  1.11
  @@ -210,6 +210,12 @@
   results.append("\"");
   results.append(prepareEventHandlers());
   results.append(prepareStyles());
  +
  +// if no onclick event was provided, put in the cancel script
  +if(results.indexOf("onclick=")==-1){
  +  results.append(" onclick=\"bCancel=true;\"");
  +}
  +
   results.append(getElementClose());
   
   // Render this element to our writer
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>

cvs commit: jakarta-struts/src/share/org/apache/struts/taglib/logic IterateTag.java

[rleland]

rleland 2002/12/17 23:06:17

  Modified:src/share/org/apache/struts/taglib/logic IterateTag.java
  Log:
  Remove unused local variable as pointed out by PMD
  http://pmd.sourceforge.net/reports/struts_jakarta-struts.html
  
  Revision  ChangesPath
  1.18  +5 -5  
jakarta-struts/src/share/org/apache/struts/taglib/logic/IterateTag.java
  
  Index: IterateTag.java
  ===
  RCS file: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/logic/IterateTag.java,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- IterateTag.java   16 Dec 2002 03:41:43 -  1.17
  +++ IterateTag.java   18 Dec 2002 07:06:17 -  1.18
  @@ -377,7 +377,7 @@
// Skip the leading elements up to the starting offset
for (int i = 0; i < offsetValue; i++) {
if (iterator.hasNext()) {
  - Object element = iterator.next();
  + iterator.next();
}
}
   
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>

cvs commit: jakarta-struts/src/share/org/apache/struts/taglib/bean WriteTag.java

[rleland]

rleland 2002/12/17 23:03:35

  Modified:src/share/org/apache/struts/taglib/bean WriteTag.java
  Log:
  Remove unused local variable as pointed out by PMD
  http://pmd.sourceforge.net/reports/struts_jakarta-struts.html
  Also remove unused imports.
  
  Revision  ChangesPath
  1.22  +8 -11 
jakarta-struts/src/share/org/apache/struts/taglib/bean/WriteTag.java
  
  Index: WriteTag.java
  ===
  RCS file: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/bean/WriteTag.java,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- WriteTag.java 22 Sep 2002 06:32:46 -  1.21
  +++ WriteTag.java 18 Dec 2002 07:03:35 -  1.22
  @@ -62,21 +62,19 @@
   
   package org.apache.struts.taglib.bean;
   
  -import java.sql.Timestamp;
  -import java.sql.Date;
  -import java.sql.Time;
  +
   import java.util.Locale;
   import java.text.SimpleDateFormat;
   import java.math.BigDecimal;
   import java.math.BigInteger;
   import java.text.Format;
  -import java.text.DateFormat;
  +
   import java.text.DecimalFormat;
   import java.text.NumberFormat;
   import javax.servlet.jsp.JspException;
  -import javax.servlet.jsp.PageContext;
  +
   import javax.servlet.jsp.tagext.TagSupport;
  -import org.apache.commons.beanutils.PropertyUtils;
  +
   import org.apache.struts.util.MessageResources;
   import org.apache.struts.util.RequestUtils;
   import org.apache.struts.util.ResponseUtils;
  @@ -279,7 +277,6 @@
   public int doStartTag() throws JspException {
   
   // Look up the requested bean (if necessary)
  -Object bean = null;
   if (ignore) {
   if (RequestUtils.lookup(pageContext, name, scope) == null)
   return (SKIP_BODY);  // Nothing to output
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>

cvs commit: jakarta-struts/src/share/org/apache/struts/taglib/logic IterateTag.java

[craigmcc]

craigmcc2002/12/15 19:41:43

  Modified:src/share/org/apache/struts/taglib/html MultiboxTag.java
OptionsTag.java RadioTag.java SelectTag.java
TextareaTag.java
   src/share/org/apache/struts/taglib/logic IterateTag.java
  Log:
  Consistently use RequestUtils.lookup() instead of pageContext.findAttribute()
  to locate attribute values in any scope.
  
  PR: Bugzilla #15309
  Submitted by: Michael Han 
  
  Revision  ChangesPath
  1.18  +6 -5  
jakarta-struts/src/share/org/apache/struts/taglib/html/MultiboxTag.java
  
  Index: MultiboxTag.java
  ===
  RCS file: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/MultiboxTag.java,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- MultiboxTag.java  16 Nov 2002 06:05:22 -  1.17
  +++ MultiboxTag.java  16 Dec 2002 03:41:43 -  1.18
  @@ -69,6 +69,7 @@
   import org.apache.commons.beanutils.BeanUtils;
   import org.apache.struts.Globals;
   import org.apache.struts.util.MessageResources;
  +import org.apache.struts.util.RequestUtils;
   import org.apache.struts.util.ResponseUtils;
   
   /**
  @@ -229,7 +230,7 @@
   }
   results.append(ResponseUtils.filter(value));
   results.append("\"");
  -Object bean = pageContext.findAttribute(name);
  +Object bean = RequestUtils.lookup(pageContext, name, null);
   String values[] = null;
   if (bean == null)
   throw new JspException(messages.getMessage("getter.bean", name));
  
  
  
  1.20  +2 -1  
jakarta-struts/src/share/org/apache/struts/taglib/html/OptionsTag.java
  
  Index: OptionsTag.java
  ===
  RCS file: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/OptionsTag.java,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- OptionsTag.java   4 Oct 2002 05:34:19 -   1.19
  +++ OptionsTag.java   16 Dec 2002 03:41:43 -  1.20
  @@ -68,6 +68,7 @@
   import org.apache.commons.beanutils.PropertyUtils;
   import org.apache.struts.util.IteratorAdapter;
   import org.apache.struts.util.MessageResources;
  +import org.apache.struts.util.RequestUtils;
   import org.apache.struts.util.ResponseUtils;
   
   
  @@ -412,7 +413,7 @@
String beanName = name;
if (beanName == null)
beanName = Constants.BEAN_KEY;
  - Object bean = pageContext.findAttribute(beanName);
  +Object bean = RequestUtils.lookup(pageContext, beanName, null);
if (bean == null)
throw new JspException
(messages.getMessage("getter.bean", beanName));
  
  
  
  1.19  +7 -6  
jakarta-struts/src/share/org/apache/struts/taglib/html/RadioTag.java
  
  Index: RadioTag.java
  ===
  RCS file: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/RadioTag.java,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- RadioTag.java 16 Nov 2002 06:05:21 -  1.18
  +++ RadioTag.java 16 Dec 2002 03:41:43 -  1.19
  @@ -67,6 +67,7 @@
   import javax.servlet.jsp.JspException;
   import org.apache.commons.beanutils.BeanUtils;
   import org.apache.struts.util.MessageResources;
  +import org.apache.struts.util.RequestUtils;
   import org.apache.struts.util.ResponseUtils;
   
   
  @@ -223,7 +224,7 @@
   
   // Acquire the current value of the appropriate field
   Object current = null;
  -Object bean = pageContext.findAttribute(name);
  +Object bean = RequestUtils.lookup(pageContext, name, null);
   if (bean == null)
   throw new JspException
   (messages.getMessage("getter.bean", name));
  @@ -235,7 +236,7 @@
   
   // @since Struts 1.1
   if (idName != null) {
  -Object idBean = pageContext.findAttribute(idName);
  +Object idBean = RequestUtils.lookup(pageContext, idName, null);
   if (idBean == null)
  throw new JspException
   (messages.getMessage("getter.bean", idName));
  
  
  
  1.14  +5 -5  
jakarta-struts/src/share/org/apache/struts/taglib/html/SelectTag.java
  
  Index: SelectTag.java
  ===
  RCS file: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/SelectTag.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- SelectTag.java23 Sep 2002 05:13:43 -  1.13
  +++ SelectTag.java16 Dec 2002 03:41:43 -  1.14
  @@ -279,7 +279,7 @@
   match = new String[1];
   matc

cvs commit: jakarta-struts/src/share/org/apache/struts/taglib/html FormTag.java

[dgraham]

dgraham 2002/12/12 18:36:47

  Modified:src/share/org/apache/struts/taglib/html FormTag.java
  Log:
  formatting changes, no code changes.
  
  Revision  ChangesPath
  1.40  +22 -20
jakarta-struts/src/share/org/apache/struts/taglib/html/FormTag.java
  
  Index: FormTag.java
  ===
  RCS file: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/FormTag.java,v
  retrieving revision 1.39
  retrieving revision 1.40
  diff -u -r1.39 -r1.40
  --- FormTag.java  13 Dec 2002 02:26:24 -  1.39
  +++ FormTag.java  13 Dec 2002 02:36:47 -  1.40
  @@ -112,12 +112,13 @@
* The name of the field to receive focus, if any.
*/
   protected String focus = null;
  -
  +
   /**
* The index in the focus field array to receive focus.  This only applies if 
the field
* given in the focus attribute is actually an array of fields.  This allows a 
specific 
* field in a radio button array to receive focus while still allowing indexed 
field 
* names like "myRadioButtonField[1]" to be passed in the focus attribute.
  + * @since Struts 1.1
*/
   protected String focusIndex = null;
   
  @@ -624,31 +625,32 @@
   if (this.focus != null) {
   results.append("\r\n");
   results.append(this.getJsStartElement());
  -
  +
   // xhtml script content shouldn't use the browser hiding trick
   if (!this.isXhtml()) {
   results.append("  \r\n");
   }
  -
  +
   results.append("\r\n");
   }
   
  @@ -837,7 +839,7 @@
*/
   private String getJsStartElement() {
   String start = "

cvs commit: jakarta-struts/src/share/org/apache/struts/taglib/html FormTag.java

[dgraham]

dgraham 2002/12/12 18:26:24

  Modified:src/share/org/apache/struts/taglib/html FormTag.java
  Log:
  Fixed bug with setting focus to a specific index of a field array (radio group).
  This also fixes the issue with indexed field names.  I added the focusIndex
  attribute which indicates the index in the array to receive focus.
  Tested on Win2k: Netscape 4.77, Opera 6.05, IE 6.0
  See PR #15194 and #1586.
  
  Revision  ChangesPath
  1.39  +45 -37
jakarta-struts/src/share/org/apache/struts/taglib/html/FormTag.java
  
  Index: FormTag.java
  ===
  RCS file: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/FormTag.java,v
  retrieving revision 1.38
  retrieving revision 1.39
  diff -u -r1.38 -r1.39
  --- FormTag.java  28 Nov 2002 07:13:18 -  1.38
  +++ FormTag.java  13 Dec 2002 02:26:24 -  1.39
  @@ -112,6 +112,14 @@
* The name of the field to receive focus, if any.
*/
   protected String focus = null;
  +
  +/**
  + * The index in the focus field array to receive focus.  This only applies if 
the field
  + * given in the focus attribute is actually an array of fields.  This allows a 
specific 
  + * field in a radio button array to receive focus while still allowing indexed 
field 
  + * names like "myRadioButtonField[1]" to be passed in the focus attribute.
  + */
  +protected String focusIndex = null;
   
   /**
* The ActionMapping defining where we will be submitting this form
  @@ -613,16 +621,7 @@
   StringBuffer results = new StringBuffer("");
   
   // Render JavaScript to set the input focus if required
  -if (focus != null) {
  -String tempFocus = focus;
  -StringBuffer refocus = new StringBuffer("[");
  -if (tempFocus.indexOf("[") > 0) {
  -StringTokenizer st = new StringTokenizer(tempFocus, "[");
  -if (st.countTokens() == 2) {
  -tempFocus = st.nextToken();
  -refocus.append(st.nextToken());
  -}
  -}
  +if (this.focus != null) {
   results.append("\r\n");
   results.append(this.getJsStartElement());
   
  @@ -630,30 +629,21 @@
   if (!this.isXhtml()) {
   results.append("  \r\n");
  @@ -685,6 +675,7 @@
   moduleConfig = null;
   enctype = null;
   focus = null;
  +focusIndex = null;
   mapping = null;
   method = null;
   name = null;
  @@ -864,4 +855,21 @@
   
   return ("true".equalsIgnoreCase(xhtml));
   }
  +
  +/**
  + * Returns the focusIndex.
  + * @return String
  + */
  +public String getFocusIndex() {
  +return focusIndex;
  +}
  +
  +/**
  + * Sets the focusIndex.
  + * @param focusIndex The focusIndex to set
  + */
  +public void setFocusIndex(String focusIndex) {
  +this.focusIndex = focusIndex;
  +}
  +
   }
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>

cvs commit: jakarta-struts/src/share/org/apache/struts/taglib/tiles InsertTag.java

[ekbush]

ekbush  2002/12/12 13:23:30

  Modified:src/share/org/apache/struts/taglib/tiles InsertTag.java
  Log:
  Updated processException to log exceptions in a more "commons-logging"-like
  fashion.
  
  Revision  ChangesPath
  1.8   +6 -7  
jakarta-struts/src/share/org/apache/struts/taglib/tiles/InsertTag.java
  
  Index: InsertTag.java
  ===
  RCS file: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/tiles/InsertTag.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- InsertTag.java8 Dec 2002 06:54:51 -   1.7
  +++ InsertTag.java12 Dec 2002 21:23:29 -  1.8
  @@ -858,8 +858,7 @@
msg = ex.getMessage();
   
if (log.isDebugEnabled()) { // show full trace
  - log.debug(msg);
  - ex.printStackTrace();
  + log.debug(msg, ex);
pageContext.getOut().println(msg);
ex.printStackTrace(new 
PrintWriter(pageContext.getOut(), true));
} else { // show only message
  @@ -916,7 +915,7 @@
pageContext.getOut().print(value);
} catch (IOException ex) {
if (log.isDebugEnabled())
  - log.debug("Can't write string '" + value + "' 
: " + ex.getMessage());
  + log.debug("Can't write string '" + value + "' 
: ", ex);
pageContext.setAttribute(
ComponentConstants.EXCEPTION_KEY,
ex,
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>

cvs commit: jakarta-struts/src/share/org/apache/struts/taglib/tiles/util TagUtils.java

[rleland]

rleland 2002/12/07 22:54:52

  Modified:src/share/org/apache/struts/taglib/html BaseHandlerTag.java
ErrorsTag.java HtmlTag.java
JavascriptValidatorTag.java MessagesTag.java
OptionTag.java
   src/share/org/apache/struts/taglib/nested
NestedNameSupport.java NestedPropertyTag.java
NestedRootTag.java NestedWriteNestingTag.java
   src/share/org/apache/struts/taglib/nested/html
NestedLinkTag.java
   src/share/org/apache/struts/taglib/template GetTag.java
PutTag.java
   src/share/org/apache/struts/taglib/tiles
AttributeToScopeTag.java DefinitionTag.java
GetAttributeTag.java ImportAttributeTag.java
InsertTag.java PutListTag.java PutTag.java
UseAttributeTag.java
   src/share/org/apache/struts/taglib/tiles/ext TextTag.java
   src/share/org/apache/struts/taglib/tiles/util TagUtils.java
  Log:
  Npo functional change
  Fix JavaDoc and unused import statements.
  
  Revision  ChangesPath
  1.20  +4 -10 
jakarta-struts/src/share/org/apache/struts/taglib/html/BaseHandlerTag.java
  
  Index: BaseHandlerTag.java
  ===
  RCS file: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/BaseHandlerTag.java,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- BaseHandlerTag.java   16 Nov 2002 06:04:16 -  1.19
  +++ BaseHandlerTag.java   8 Dec 2002 06:54:50 -   1.20
  @@ -65,8 +65,6 @@
   
   import javax.servlet.jsp.JspException;
   import javax.servlet.jsp.tagext.BodyTagSupport;
  -import javax.servlet.jsp.tagext.Tag;
  -import javax.servlet.jsp.tagext.TagSupport;
   
   import org.apache.struts.Globals;
   import org.apache.struts.taglib.logic.IterateTag;
  @@ -774,8 +772,6 @@
   /**
* Allows HTML tags to find out if they're nested within an %lt;html:html> 
tag that
* has xhtml set to true.
  - * @param tag - Tags should pass themselves into the method as a starting point
  - * for finding the parent html tag.
* @return true if the tag is nested within an html tag with xhtml set to true, 
false
* otherwise.
* @since Struts 1.1
  @@ -801,8 +797,6 @@
   /**
* Returns the closing brace for an input element depending on xhtml status.  
The tag
* must be nested within an %lt;html:html> tag that has xhtml set to true.
  - * @param tag - Tags should pass themselves into the method as a starting point
  - * for finding the parent html tag.
* @return String - > if xhtml is false, /> if xhtml is true
* @since Struts 1.1
*/
  
  
  
  1.19  +4 -5  
jakarta-struts/src/share/org/apache/struts/taglib/html/ErrorsTag.java
  
  Index: ErrorsTag.java
  ===
  RCS file: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/ErrorsTag.java,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- ErrorsTag.java12 Nov 2002 03:47:42 -  1.18
  +++ ErrorsTag.java8 Dec 2002 06:54:51 -   1.19
  @@ -70,7 +70,6 @@
   import javax.servlet.jsp.tagext.TagSupport;
   
   import org.apache.struts.Globals;
  -import org.apache.struts.action.Action;
   import org.apache.struts.action.ActionError;
   import org.apache.struts.action.ActionErrors;
   import org.apache.struts.util.MessageResources;
  
  
  
  1.9   +4 -5  
jakarta-struts/src/share/org/apache/struts/taglib/html/HtmlTag.java
  
  Index: HtmlTag.java
  ===
  RCS file: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/HtmlTag.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- HtmlTag.java  20 Nov 2002 05:00:18 -  1.8
  +++ HtmlTag.java  8 Dec 2002 06:54:51 -   1.9
  @@ -69,7 +69,6 @@
   import javax.servlet.jsp.tagext.TagSupport;
   
   import org.apache.struts.Globals;
  -import org.apache.struts.action.Action;
   import org.apache.struts.util.MessageResources;
   import org.apache.struts.util.ResponseUtils;
   
  
  
  
  1.19  +1 -2  
jakarta-struts/src/share/org/apache/struts/taglib/html/JavascriptValidatorTag.java
  
  Index: JavascriptValidatorTag.java
  ===
  RCS file: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/JavascriptValidatorTag.java,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- JavascriptValidatorTag.java   21 Nov 2002 02:02:16 -  1.18
  +++ JavascriptValidatorTag.java

cvs commit: jakarta-struts/src/share/org/apache/struts/taglib/tiles UseAttributeTag.java

[martinc]

martinc 2002/12/05 23:58:40

  Modified:src/share/org/apache/struts/taglib/tiles
UseAttributeTag.java
  Log:
  Fix a problem with tag handler instance reuse - do not modify attribute
  values from within the tag handler.
  
  PR: 14366
  Submitted by: Anand
  
  Revision  ChangesPath
  1.6   +8 -8  
jakarta-struts/src/share/org/apache/struts/taglib/tiles/UseAttributeTag.java
  
  Index: UseAttributeTag.java
  ===
  RCS file: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/tiles/UseAttributeTag.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- UseAttributeTag.java  16 Nov 2002 04:46:05 -  1.5
  +++ UseAttributeTag.java  6 Dec 2002 07:58:39 -   1.6
  @@ -211,9 +211,9 @@
 public int doStartTag() throws JspException
   {
 // Do a local copy of id
  -String id=this.id;
  -if( id==null )
  -  id=attributeName;
  +String localId=this.id;
  +if( localId==null )
  +  localId=attributeName;
   
   ComponentContext compContext = (ComponentContext)pageContext.getAttribute( 
ComponentConstants.COMPONENT_CONTEXT, pageContext.REQUEST_SCOPE);
   if( compContext == null )
  @@ -231,10 +231,10 @@
 {
 scope = TagUtils.getScope( scopeName, PageContext.PAGE_SCOPE );
 if(scope!=ComponentConstants.COMPONENT_SCOPE)
  -pageContext.setAttribute(id, value, scope);
  +pageContext.setAttribute(localId, value, scope);
 }
else
  -  pageContext.setAttribute(id, value);
  +  pageContext.setAttribute(localId, value);
   
// Continue processing this page
   return SKIP_BODY;
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>

cvs commit: jakarta-struts/src/share/org/apache/struts/taglib/bean IncludeTag.java

[dgraham]

dgraham 2002/11/29 11:54:22

  Modified:src/share/org/apache/struts/taglib/bean IncludeTag.java
  Log:
  Formatted code.
  
  Revision  ChangesPath
  1.19  +49 -66
jakarta-struts/src/share/org/apache/struts/taglib/bean/IncludeTag.java
  
  Index: IncludeTag.java
  ===
  RCS file: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/bean/IncludeTag.java,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- IncludeTag.java   22 Sep 2002 06:32:45 -  1.18
  +++ IncludeTag.java   29 Nov 2002 19:54:22 -  1.19
  @@ -60,7 +60,6 @@
   
   package org.apache.struts.taglib.bean;
   
  -
   import java.io.BufferedInputStream;
   import java.io.InputStreamReader;
   import java.net.HttpURLConnection;
  @@ -74,7 +73,6 @@
   import org.apache.struts.util.MessageResources;
   import org.apache.struts.util.RequestUtils;
   
  -
   /**
* Define the contents of a specified intra-application request as a
* page scope attribute of type java.lang.String.  If the
  @@ -91,16 +89,13 @@
   
   public class IncludeTag extends TagSupport {
   
  -
   // - Properties
   
  -
   /**
* Buffer size to use when reading the input stream.
*/
   protected static final int BUFFER_SIZE = 256;
   
  -
   /**
* The anchor to be added to the end of the generated hyperlink.
*/
  @@ -114,7 +109,6 @@
   this.anchor = anchor;
   }
   
  -
   /**
* The name of the global ActionForward that contains a
* path to our requested resource.
  @@ -129,7 +123,6 @@
   this.forward = forward;
   }
   
  -
   /**
* The absolute URL to the resource to be included.
*/
  @@ -143,7 +136,6 @@
   this.href = href;
   }
   
  -
   /**
* The name of the scripting variable that will be exposed as a page
* scope attribute.
  @@ -158,14 +150,11 @@
   this.id = id;
   }
   
  -
   /**
* The message resources for this package.
*/
   protected static MessageResources messages =
  -MessageResources.getMessageResources
  -("org.apache.struts.taglib.bean.LocalStrings");
  -
  +
MessageResources.getMessageResources("org.apache.struts.taglib.bean.LocalStrings");
   
   /**
* Deprecated method to set the "name" attribute, which has been
  @@ -177,21 +166,19 @@
   this.page = name;
   }
   
  -
   /**
* The context-relative URI of the page or servlet to be included.
*/
   protected String page = null;
   
   public String getPage() {
  - return (this.page);
  +return (this.page);
   }
   
   public void setPage(String page) {
  - this.page = page;
  +this.page = page;
   }
   
  -
   /**
* Include transaction token (if any) in the hyperlink?
*/
  @@ -205,10 +192,8 @@
   this.transaction = transaction;
   }
   
  -
   // - Public Methods
   
  -
   /**
* Define the contents returned for the specified resource as a
* page scope attribute.
  @@ -217,91 +202,91 @@
*/
   public int doStartTag() throws JspException {
   
  - // Set up a URLConnection to read the requested resource
  -Map params = RequestUtils.computeParameters
  -(pageContext, null, null, null, null,
  - null, null, null, transaction); // FIXME -  attributes
  +// Set up a URLConnection to read the requested resource
  +Map params =
  +RequestUtils.computeParameters(
  +pageContext,
  +null,
  +null,
  +null,
  +null,
  +null,
  +null,
  +null,
  +transaction);
  +// FIXME -  attributes
   String urlString = null;
   URL url = null;
   try {
  -urlString = RequestUtils.computeURL(pageContext, forward, href,
  -page, params, anchor, false);
  +urlString =
  +RequestUtils.computeURL(pageContext, forward, href, page, params, 
anchor, false);
   if (urlString.indexOf(':') < 0) {
  -HttpServletRequest request = (HttpServletRequest)
  -pageContext.getRequest();
  +HttpServletRequest request = (HttpServletRequest) 
pageContext.getRequest();
   url = new URL(RequestUtils.requestURL(request), urlString);
   } else {
   url = new URL(urlString);
   }
   } catch (MalformedURLException e) {
   RequestUtils.saveExceptio

cvs commit: jakarta-struts/src/share/org/apache/struts/taglib/html FormTag.java

[rleland]

rleland 2002/11/27 23:13:18

  Modified:src/share/org/apache/struts/taglib/html FormTag.java
  Log:
  Bug#: 14054 Change Docs to read module and not application module
  
  Revision  ChangesPath
  1.38  +6 -7  
jakarta-struts/src/share/org/apache/struts/taglib/html/FormTag.java
  
  Index: FormTag.java
  ===
  RCS file: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/FormTag.java,v
  retrieving revision 1.37
  retrieving revision 1.38
  diff -u -r1.37 -r1.38
  --- FormTag.java  20 Nov 2002 05:36:50 -  1.37
  +++ FormTag.java  28 Nov 2002 07:13:18 -  1.38
  @@ -70,7 +70,6 @@
   import javax.servlet.jsp.JspWriter;
   import javax.servlet.jsp.PageContext;
   import javax.servlet.jsp.tagext.TagSupport;
  -import org.apache.struts.action.Action;
   import org.apache.struts.action.ActionForm;
   import org.apache.struts.action.ActionMapping;
   import org.apache.struts.action.ActionServlet;
  @@ -100,7 +99,7 @@
   protected String action = null;
   
   /**
  - * The application configuration for our module.
  + * The module configuration for our module.
*/
   protected ModuleConfig moduleConfig = null;
   
  @@ -793,7 +792,7 @@
*/
   protected void lookup() throws JspException {
   
  -// Look up the application module configuration information we need
  +// Look up the module configuration information we need
   moduleConfig = RequestUtils.getModuleConfig(pageContext);
   
   if (moduleConfig == null) {
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>

cvs commit: jakarta-struts/src/share/org/apache/struts/taglib/html ImgTag.java

[dgraham]

dgraham 2002/11/24 14:04:07

  Modified:src/share/org/apache/struts/taglib/html ImgTag.java
  Log:
  Formatted code.
  
  Revision  ChangesPath
  1.26  +19 -14
jakarta-struts/src/share/org/apache/struts/taglib/html/ImgTag.java
  
  Index: ImgTag.java
  ===
  RCS file: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/ImgTag.java,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- ImgTag.java   24 Nov 2002 22:01:53 -  1.25
  +++ ImgTag.java   24 Nov 2002 22:04:06 -  1.26
  @@ -586,18 +586,20 @@
*/
   protected String url(String url) throws JspException {
   
  -if (url == null)
  +if (url == null) {
   return (url);
  +}
   
   // Start with an unadorned URL as specified
   StringBuffer src = new StringBuffer(url);
   
   // Append a single-parameter name and value, if requested
   if ((paramId != null) && (paramName != null)) {
  -if (src.toString().indexOf('?') < 0)
  +if (src.toString().indexOf('?') < 0) {
   src.append('?');
  -else
  +} else {
   src.append('&');
  +}
   src.append(paramId);
   src.append('=');
   Object value = RequestUtils.lookup(pageContext, paramName, 
paramProperty, paramScope);
  @@ -611,8 +613,10 @@
   RequestUtils.saveException(pageContext, e);
   throw e;
   }
  -if (name == null)
  +
  +if (name == null) {
   return (src.toString());
  +}
   
   // Look up the map we will be using
   Object mapObject = RequestUtils.lookup(pageContext, name, property, scope);
  @@ -631,9 +635,9 @@
   String key = (String) keys.next();
   Object value = map.get(key);
   if (value == null) {
  -if (question)
  +if (question) {
   src.append('&');
  -else {
  +} else {
   src.append('?');
   question = true;
   }
  @@ -643,9 +647,9 @@
   } else if (value instanceof String[]) {
   String values[] = (String[]) value;
   for (int i = 0; i < values.length; i++) {
  -if (question)
  +if (question) {
   src.append('&');
  -else {
  +} else {
   src.append('?');
   question = true;
   }
  @@ -654,9 +658,10 @@
   src.append(RequestUtils.encodeURL(values[i]));
   }
   } else {
  -if (question)
  +
  +if (question) {
   src.append('&');
  -else {
  +} else {
   src.append('?');
   question = true;
   }
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>

cvs commit: jakarta-struts/src/share/org/apache/struts/taglib/html ImgTag.java

[dgraham]

dgraham 2002/11/24 14:01:53

  Modified:src/share/org/apache/struts/taglib/html ImgTag.java
  Log:
  Replaced references to URLEncoder.encode() with RequestUtils.encodeURL().
  
  Revision  ChangesPath
  1.25  +10 -9 
jakarta-struts/src/share/org/apache/struts/taglib/html/ImgTag.java
  
  Index: ImgTag.java
  ===
  RCS file: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/ImgTag.java,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- ImgTag.java   16 Nov 2002 06:05:21 -  1.24
  +++ ImgTag.java   24 Nov 2002 22:01:53 -  1.25
  @@ -61,17 +61,18 @@
   
   package org.apache.struts.taglib.html;
   
  -import java.net.URLEncoder;
   import java.util.Iterator;
   import java.util.Map;
  +
   import javax.servlet.http.HttpServletRequest;
   import javax.servlet.http.HttpServletResponse;
   import javax.servlet.jsp.JspException;
  +
  +import org.apache.struts.Globals;
   import org.apache.struts.config.ModuleConfig;
   import org.apache.struts.util.MessageResources;
   import org.apache.struts.util.RequestUtils;
   import org.apache.struts.util.ResponseUtils;
  -import org.apache.struts.Globals;
   
   /**
* Generate an IMG tag to the specified image URI.
  @@ -601,7 +602,7 @@
   src.append('=');
   Object value = RequestUtils.lookup(pageContext, paramName, 
paramProperty, paramScope);
   if (value != null)
  -src.append(URLEncoder.encode(value.toString()));
  +src.append(RequestUtils.encodeURL(value.toString()));
   }
   
   // Just return the URL if there is no bean to look up
  @@ -650,7 +651,7 @@
   }
   src.append(key);
   src.append('=');
  -src.append(URLEncoder.encode(values[i]));
  +src.append(RequestUtils.encodeURL(values[i]));
   }
   } else {
   if (question)
  @@ -661,7 +662,7 @@
   }
   src.append(key);
   src.append('=');
  -src.append(URLEncoder.encode(value.toString()));
  +src.append(RequestUtils.encodeURL(value.toString()));
   }
   }
   
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>

cvs commit: jakarta-struts/src/share/org/apache/struts/taglib/logic ForwardTag.java

[rleland]

rleland 2002/11/22 22:31:23

  Modified:src/share/org/apache/struts/taglib/logic ForwardTag.java
  Log:
  Bug 13613 Make Forward Tag Module aware.
  Reported and patched by
  [EMAIL PROTECTED] (Jim Bonanno)
  
  Thanks !
  
  Revision  ChangesPath
  1.13  +10 -4 
jakarta-struts/src/share/org/apache/struts/taglib/logic/ForwardTag.java
  
  Index: ForwardTag.java
  ===
  RCS file: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/logic/ForwardTag.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- ForwardTag.java   9 Nov 2002 16:30:02 -   1.12
  +++ ForwardTag.java   23 Nov 2002 06:31:23 -  1.13
  @@ -147,6 +147,12 @@
   
// Forward or redirect to the corresponding actual path
String path = forward.getPath();
  +// support modules
  +if (config != null) {
  +path = config.getPrefix() + path;
  +}
  +
  +
if (forward.getRedirect()) {
   HttpServletRequest request =
   (HttpServletRequest) pageContext.getRequest();
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>

cvs commit: jakarta-struts/src/share/org/apache/struts/taglib/html JavascriptValidatorTag.java

[dgraham]

dgraham 2002/11/20 18:02:16

  Modified:src/share/org/apache/struts/taglib/html
JavascriptValidatorTag.java
  Log:
  Throw a nicer NPE for Bugzilla PR# 14720.
  
  Revision  ChangesPath
  1.18  +11 -2 
jakarta-struts/src/share/org/apache/struts/taglib/html/JavascriptValidatorTag.java
  
  Index: JavascriptValidatorTag.java
  ===
  RCS file: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/JavascriptValidatorTag.java,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- JavascriptValidatorTag.java   20 Nov 2002 05:56:08 -  1.17
  +++ JavascriptValidatorTag.java   21 Nov 2002 02:02:16 -  1.18
  @@ -333,8 +333,17 @@
   
   // Create list of ValidatorActions based on lActionMethods
   for (Iterator i = lActionMethods.iterator(); i.hasNext();) {
  -ValidatorAction va = resources.getValidatorAction((String) 
i.next());
  +String depends = (String) i.next();
  +ValidatorAction va = resources.getValidatorAction(depends);
   
  +// throw nicer NPE for easier debugging
  +if (va == null) {
  +throw new NullPointerException(
  +"Depends string \""
  ++ depends
  ++ "\" was not found in validator-rules.xml.");
  +}   
  +
   String javascript = va.getJavascript();
   if (javascript != null && javascript.length() > 0) {
   lActions.add(va);
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>

cvs commit: jakarta-struts/src/share/org/apache/struts/taglib/html JavascriptValidatorTag.java

[dgraham]

dgraham 2002/11/19 21:56:08

  Modified:src/share/org/apache/struts/taglib/html
JavascriptValidatorTag.java
  Log:
  Enclose script in CDATA section when rendering as xhtml.  This prevents xml
  clients from misinterpreting script characters like < and &.
  
  Revision  ChangesPath
  1.17  +30 -7 
jakarta-struts/src/share/org/apache/struts/taglib/html/JavascriptValidatorTag.java
  
  Index: JavascriptValidatorTag.java
  ===
  RCS file: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/JavascriptValidatorTag.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- JavascriptValidatorTag.java   16 Nov 2002 06:05:21 -  1.16
  +++ JavascriptValidatorTag.java   20 Nov 2002 05:56:08 -  1.17
  @@ -510,13 +510,20 @@
   src = null;
   }
   
  +/**
  + * Returns the opening script element and some initial javascript.
  + */
   protected String getJavascriptBegin(String methods) {
   StringBuffer sb = new StringBuffer();
   String name =
   formName.substring(0, 1).toUpperCase() + formName.substring(1, 
formName.length());
   
   sb.append(this.getStartElement());
  -
  +
  +if (this.isXhtml()) {
  +sb.append("\r\n");
  +}
  +
   sb.append("\n\n");
   
   return sb.toString();
  @@ -632,10 +648,7 @@
   StringBuffer start = new StringBuffer("

cvs commit: jakarta-struts/src/share/org/apache/struts/taglib/html FormTag.java

[dgraham]

dgraham 2002/11/19 21:36:50

  Modified:src/share/org/apache/struts/taglib/html FormTag.java
  Log:
  Don't display browser hiding trick for javascript when form is xhtml.  XML 
  user agents are allowed to ignore theses "comments" and the W3C recommends
  not using this trick.  Presumably, any browser that works with XHTML also
  supports javascript.  Note that I didn't enclose the script in a CDATA section
  because it doesn't use < or &.
  
  Revision  ChangesPath
  1.37  +26 -12
jakarta-struts/src/share/org/apache/struts/taglib/html/FormTag.java
  
  Index: FormTag.java
  ===
  RCS file: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/FormTag.java,v
  retrieving revision 1.36
  retrieving revision 1.37
  diff -u -r1.36 -r1.37
  --- FormTag.java  17 Nov 2002 00:57:07 -  1.36
  +++ FormTag.java  20 Nov 2002 05:36:50 -  1.37
  @@ -626,7 +626,11 @@
   }
   results.append("\r\n");
   results.append(this.getJsStartElement());
  -results.append("  \r\n");
  + if (!this.isXhtml()) {
  +results.append("  // -->\r\n");
  +}
  +
   results.append("\r\n");
   }
   
  @@ -841,14 +847,22 @@
*/
   private String getJsStartElement() {
   String start = "

cvs commit: jakarta-struts/src/share/org/apache/struts/taglib/html HtmlTag.java

[dgraham]

dgraham 2002/11/19 21:00:19

  Modified:src/share/org/apache/struts/taglib/html HtmlTag.java
  Log:
  Fixed situation where xhtml wouldn't render without locale="true".  This
  required a change in a protected support method so I deprecated the
  existing one and created a modified new method.  The tag doesn't use the
  old version but other implementations may have overridden it.
  
  Revision  ChangesPath
  1.8   +72 -35
jakarta-struts/src/share/org/apache/struts/taglib/html/HtmlTag.java
  
  Index: HtmlTag.java
  ===
  RCS file: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/HtmlTag.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- HtmlTag.java  16 Nov 2002 06:05:21 -  1.7
  +++ HtmlTag.java  20 Nov 2002 05:00:18 -  1.8
  @@ -79,6 +79,7 @@
* there is a current Locale available in the user's session.
*
* @author Craig R. McClanahan
  + * @author David Graham
* @version $Revision$ $Date$
*/
   
  @@ -135,31 +136,33 @@
   StringBuffer sb = new StringBuffer(" 0)) {
  -sb.append(" lang=\"");
  -sb.append(lang);
  -sb.append("\"");
  -
  -if (this.xhtml) {
  -this.pageContext.setAttribute(
  -Globals.XHTML_KEY,
  -"true",
  -this.pageContext.PAGE_SCOPE);
  -
  -sb.append(" xml:lang=\"");
  -sb.append(lang);
  -sb.append("\"");
  -sb.append(" xmlns=\"http://www.w3.org/1999/xhtml\"";);
  -}
  -}
  +Locale currentLocale = this.getCurrentLocale();
  +String lang = currentLocale.getLanguage();
  +
  +// Does the locale have a language?
  +boolean validLanguage = ((lang != null) && (lang.length() > 0));
  +
  +if (this.xhtml) {
  +this.pageContext.setAttribute(Globals.XHTML_KEY, "true", 
this.pageContext.PAGE_SCOPE);
  +sb.append(" xmlns=\"http://www.w3.org/1999/xhtml\"";);
   }
  +
  +if ((this.locale || this.xhtml) && validLanguage) {
  +sb.append(" lang=\"");
  +sb.append(lang);
  +sb.append("\"");
  +}
  +
  +if (this.xhtml && validLanguage) {
  +sb.append(" xml:lang=\"");
  +sb.append(lang);
  +sb.append("\"");
  +}
  +
   sb.append(">");
   
   // Write out the beginning tag for this page
  -ResponseUtils.write(pageContext, sb.toString());
  +ResponseUtils.write(this.pageContext, sb.toString());
   
   // Evaluate the included content of this tag
   return (EVAL_BODY_INCLUDE);
  @@ -180,7 +183,6 @@
   
   }
   
  -
   /**
* Release any acquired resources.
*/
  @@ -199,31 +201,66 @@
* Return the current Locale for this request, creating a new one if
* necessary.  If there is no current Locale, and locale support is not
* requested, return null.
  + * @deprecated Use getCurrentLocale instead because it makes the display logic
  + * easier.
*/
   protected Locale currentLocale() {
   
   // Create a new session if necessary
   HttpSession session = pageContext.getSession();
  -if (locale && (session == null))
  +if (locale && (session == null)) {
   session =
   ((HttpServletRequest) pageContext.getRequest()).getSession();
  -if (session == null)
  -return (null);
  -
  +}
  +
   // Return any currently set Locale in our session
   Locale current = (Locale) session.getAttribute(Globals.LOCALE_KEY);
  -if (current != null)
  +if (current != null) {
   return (current);
  +}
   
   // Configure a new current Locale, if requested
  -if (!locale)
  +if (!locale) {
   return (null);
  +}
  +
  + // If client doesn't specify locale then default for server will be 
returned
   current = pageContext.getRequest().getLocale();
  -if (current != null)
  -session.setAttribute(Globals.LOCALE_KEY, current);
  +session.setAttribute(Globals.LOCALE_KEY, current);   
   return (current);
  -
   }
   
  +/**
  + * Return the current Locale for this request.  If there is no locale in the 
session and
  + * the loc

cvs commit: jakarta-struts/src/share/org/apache/struts/taglib/html BaseTag.java

[dgraham]

dgraham 2002/11/16 17:48:33

  Modified:doc/userGuide struts-html.xml
   src/share/org/apache/struts/taglib/html BaseTag.java
  Log:
  Added server attribute for BaseTag.
  PR: #5303
  
  Revision  ChangesPath
  1.37  +8 -0  jakarta-struts/doc/userGuide/struts-html.xml
  
  Index: struts-html.xml
  ===
  RCS file: /home/cvs/jakarta-struts/doc/userGuide/struts-html.xml,v
  retrieving revision 1.36
  retrieving revision 1.37
  diff -u -r1.36 -r1.37
  --- struts-html.xml   16 Nov 2002 07:28:01 -  1.36
  +++ struts-html.xml   17 Nov 2002 01:48:32 -  1.37
  @@ -61,6 +61,14 @@
 The window target for this base reference.
   
 
  +  
  +server
  +false
  +true
  +
  +  The server name to use instead of request.getServerName().
  +
  +  
   
   
   
  
  
  
  1.11  +34 -6 
jakarta-struts/src/share/org/apache/struts/taglib/html/BaseTag.java
  
  Index: BaseTag.java
  ===
  RCS file: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/BaseTag.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- BaseTag.java  16 Nov 2002 06:05:22 -  1.10
  +++ BaseTag.java  17 Nov 2002 01:48:33 -  1.11
  @@ -93,6 +93,11 @@
   MessageResources.getMessageResources(Constants.Package + ".LocalStrings");
   
   /**
  + * The server name to use instead of request.getServerName().
  + */
  +protected String server = null;
  +
  +/**
* The target window for this base reference.
*/
   protected String target = null;
  @@ -112,10 +117,16 @@
*/
   public int doStartTag() throws JspException {
   HttpServletRequest request = (HttpServletRequest) pageContext.getRequest();
  +String serverName = request.getServerName();
   StringBuffer buf = new StringBuffer("");
   } else {
  @@ -150,4 +161,21 @@
   }
   return EVAL_BODY_INCLUDE;
   }
  +
  +/**
  + * Returns the server.
  + * @return String
  + */
  +public String getServer() {
  +return server;
  +}
  +
  +/**
  + * Sets the server.
  + * @param server The server to set
  + */
  +public void setServer(String server) {
  +this.server = server;
  +}
  +
   }
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>

cvs commit: jakarta-struts/src/share/org/apache/struts/taglib/html FormTag.java

[dgraham]

dgraham 2002/11/16 16:57:07

  Modified:src/share/org/apache/struts/taglib/html FormTag.java
  Log:
  Removed commented section from last fix.
  
  Revision  ChangesPath
  1.36  +4 -13 
jakarta-struts/src/share/org/apache/struts/taglib/html/FormTag.java
  
  Index: FormTag.java
  ===
  RCS file: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/FormTag.java,v
  retrieving revision 1.35
  retrieving revision 1.36
  diff -u -r1.35 -r1.36
  --- FormTag.java  17 Nov 2002 00:56:19 -  1.35
  +++ FormTag.java  17 Nov 2002 00:57:07 -  1.36
  @@ -652,15 +652,6 @@
   results.append(" focusControl = focusControl[0];\r\n");
   results.append(" }\r\n");
   results.append(" focusControl.focus();\r\n");
  -//results.append("document.forms[\"");
  -//results.append(beanName);
  -//results.append("\"].elements[\"");
  -//results.append(tempFocus);
  -//results.append("\"]");
  -//if (refocus.length() > 1) {
  -//results.append(refocus.toString());
  -//}
  -//results.append(".focus();\r\n");
   
   results.append("  // -->\r\n");
   results.append("\r\n");
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>

cvs commit: jakarta-struts/src/share/org/apache/struts/taglib/html FormTag.java

[dgraham]

dgraham 2002/11/16 16:56:19

  Modified:src/share/org/apache/struts/taglib/html FormTag.java
  Log:
  Fixed focus js for element arrays.
  Bug #13854
  
  Revision  ChangesPath
  1.35  +25 -8 
jakarta-struts/src/share/org/apache/struts/taglib/html/FormTag.java
  
  Index: FormTag.java
  ===
  RCS file: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/FormTag.java,v
  retrieving revision 1.34
  retrieving revision 1.35
  diff -u -r1.34 -r1.35
  --- FormTag.java  16 Nov 2002 06:05:21 -  1.34
  +++ FormTag.java  17 Nov 2002 00:56:19 -  1.35
  @@ -627,7 +627,7 @@
   results.append("\r\n");
   results.append(this.getJsStartElement());
   results.append("  \r\n");
   results.append("\r\n");
   }
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>

cvs commit: jakarta-struts/src/share/org/apache/struts/taglib/html XhtmlTag.java

[dgraham]

dgraham 2002/11/15 23:27:18

  Added:   src/share/org/apache/struts/taglib/html XhtmlTag.java
  Log:
  Added XhtmlTag.
  
  Revision  ChangesPath
  1.1  
jakarta-struts/src/share/org/apache/struts/taglib/html/XhtmlTag.java
  
  Index: XhtmlTag.java
  ===
  package org.apache.struts.taglib.html;
  
  import javax.servlet.jsp.JspException;
  import javax.servlet.jsp.tagext.TagSupport;
  
  import org.apache.struts.Globals;
  
  /**
   * This tag tells all other html taglib tags to render themselves in xhtml.  It has 
no 
   * attributes; it's presence in a page turns on xhtml.
   * 
   * Example:
   * <html:xhtml/>
   * 
   * 
   * @author David Graham
   */
  public class XhtmlTag extends TagSupport {
  
  /**
   * Constructor for XhtmlTag.
   */
  public XhtmlTag() {
  super();
  }
  
  /**
   * @see javax.servlet.jsp.tagext.Tag#doEndTag()
   */
  public int doEndTag() throws JspException {
  this.pageContext.setAttribute(Globals.XHTML_KEY, "true", 
this.pageContext.PAGE_SCOPE);
  return EVAL_PAGE;
  }
  
  }
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>

cvs commit: jakarta-struts/src/share/org/apache/struts/taglib/bean DefineTei.java

[rleland]

rleland 2002/11/15 23:11:30

  Modified:src/share/org/apache/struts/taglib/bean DefineTei.java
  Log:
  Simplify Boolean statement:
  
  A  OR  NOT A and  B =
  A OR B
  
  Revision  ChangesPath
  1.9   +5 -5  
jakarta-struts/src/share/org/apache/struts/taglib/bean/DefineTei.java
  
  Index: DefineTei.java
  ===
  RCS file: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/bean/DefineTei.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- DefineTei.java4 Mar 2002 15:44:19 -   1.8
  +++ DefineTei.java16 Nov 2002 07:11:30 -  1.9
  @@ -88,7 +88,7 @@
   Object name = data.getAttribute("name");
   Object value = data.getAttribute("value");
   if (type == null) {
  -if ( (value!=null) || ( (value==null) && (name==null) ) )
  +if ( (value!=null) ||  (name==null) )
   type = "java.lang.String";
   else 
   type = "java.lang.Object";
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>

cvs commit: jakarta-struts/src/share/org/apache/struts/taglib/nested NestedPropertyHelper.java

[rleland]

rleland 2002/11/15 23:07:07

  Modified:src/share/org/apache/struts/taglib/nested
NestedPropertyHelper.java
  Log:
  Simplify code, if statement was always true.
  Clean up JavaDoc.
  
  Revision  ChangesPath
  1.11  +8 -10 
jakarta-struts/src/share/org/apache/struts/taglib/nested/NestedPropertyHelper.java
  
  Index: NestedPropertyHelper.java
  ===
  RCS file: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/nested/NestedPropertyHelper.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- NestedPropertyHelper.java 16 Nov 2002 04:30:03 -  1.10
  +++ NestedPropertyHelper.java 16 Nov 2002 07:07:07 -  1.11
  @@ -85,7 +85,7 @@
 
 /** Sets the passed reference to the session object, and returns any reference
  * that was already there
  -   * @param session User's session object
  +   * @param request User's request object
  * @param reference New reference to put into the session
  */
 public static final NestedReference setIncludeReference(HttpServletRequest 
request,
  @@ -124,11 +124,9 @@
   /* loop all parent tags until we get one that can be nested against  */
   do {
 namedTag = namedTag.getParent();
  -  if (parentTag == null) {
  -if (namedTag instanceof NestedParentSupport ||
  -namedTag instanceof FormTag) {
  -  parentTag = namedTag;
  -}
  +  if (namedTag instanceof NestedParentSupport ||
  +  namedTag instanceof FormTag) {
  +parentTag = namedTag;
 }
   } while (parentTag == null && namedTag != null);
   
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>

cvs commit: jakarta-struts/src/share/org/apache/struts/taglib/html ImageTag.java SubmitTag.java CancelTag.java JavascriptValidatorTag.java CheckboxTag.java FrameTag.java BaseFieldTag.java ResetTag.java FormTag.java ButtonTag.java ImgTag.java RadioTag.java HtmlTag.java BaseTag.java MultiboxTag.java

[dgraham]

dgraham 2002/11/15 22:05:22

  Modified:src/share/org/apache/struts/taglib/html ImageTag.java
SubmitTag.java CancelTag.java
JavascriptValidatorTag.java CheckboxTag.java
FrameTag.java BaseFieldTag.java ResetTag.java
FormTag.java ButtonTag.java ImgTag.java
RadioTag.java HtmlTag.java BaseTag.java
MultiboxTag.java
  Log:
  Updated xhtml implementation to work with jsp includes.
  
  Revision  ChangesPath
  1.25  +5 -5  
jakarta-struts/src/share/org/apache/struts/taglib/html/ImageTag.java
  
  Index: ImageTag.java
  ===
  RCS file: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/ImageTag.java,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- ImageTag.java 12 Nov 2002 03:47:42 -  1.24
  +++ ImageTag.java 16 Nov 2002 06:05:21 -  1.25
  @@ -261,7 +261,7 @@
   }
   results.append(prepareEventHandlers());
   results.append(prepareStyles());
  -results.append(getElementClose(this));
  +results.append(getElementClose());
   
   // Render this element to our writer
   ResponseUtils.write(pageContext, results.toString());
  
  
  
  1.16  +5 -5  
jakarta-struts/src/share/org/apache/struts/taglib/html/SubmitTag.java
  
  Index: SubmitTag.java
  ===
  RCS file: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/SubmitTag.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- SubmitTag.java12 Nov 2002 03:47:42 -  1.15
  +++ SubmitTag.java16 Nov 2002 06:05:21 -  1.16
  @@ -230,7 +230,7 @@
   results.append("\"");
   results.append(prepareEventHandlers());
   results.append(prepareStyles());
  -results.append(getElementClose(this));
  +results.append(getElementClose());
   
   // Render this element to our writer
   ResponseUtils.write(pageContext, results.toString());
  
  
  
  1.10  +5 -5  
jakarta-struts/src/share/org/apache/struts/taglib/html/CancelTag.java
  
  Index: CancelTag.java
  ===
  RCS file: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/CancelTag.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- CancelTag.java12 Nov 2002 03:47:42 -  1.9
  +++ CancelTag.java16 Nov 2002 06:05:21 -  1.10
  @@ -210,7 +210,7 @@
   results.append("\"");
   results.append(prepareEventHandlers());
   results.append(prepareStyles());
  -results.append(getElementClose(this));
  +results.append(getElementClose());
   
   // Render this element to our writer
   ResponseUtils.write(pageContext, results.toString());
  
  
  
  1.16  +5 -2  
jakarta-struts/src/share/org/apache/struts/taglib/html/JavascriptValidatorTag.java
  
  Index: JavascriptValidatorTag.java
  ===
  RCS file: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/JavascriptValidatorTag.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- JavascriptValidatorTag.java   12 Nov 2002 05:59:24 -  1.15
  +++ JavascriptValidatorTag.java   16 Nov 2002 06:05:21 -  1.16
  @@ -632,7 +632,10 @@
   StringBuffer start = new StringBuffer("");
  +String xhtml =
  +(String) this.pageContext.getAttribute(Globals.XHTML_KEY, 
this.pageContext.PAGE_SCOPE);
  +
  +if ("true".equalsIgnoreCase(xhtml)) {
  +buf.append(" />");
   } else {
   buf.append(">");
   }
  
  
  
  1.17  +5 -5  
jakarta-struts/src/share/org/apache/struts/taglib/html/MultiboxTag.java
  
  Index: MultiboxTag.java
  ===========
  RCS file: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/MultiboxTag.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- MultiboxTag.java  12 Nov 2002 03:47:42 -  1.16
  +++ MultiboxTag.java  16 Nov 2002 06:05:22 -  1.17
  @@ -253,7 +253,7 @@
   }
   results.append(prepareEventHandlers());
   results.append(prepareStyles());
  -results.append(getElementClose(this));
  +results.append(getElementClose());
   
   // Render this element to our response
   ResponseUtils.write(pageContext, results.toString());
  
  
  

--
To unsubscribe, e-mail: 

cvs commit: jakarta-struts/src/share/org/apache/struts/taglib/html BaseHandlerTag.java

[dgraham]

dgraham 2002/11/15 22:04:16

  Modified:src/share/org/apache/struts/taglib/html BaseHandlerTag.java
  Log:
  Changed isXhtml to look for page scoped constant instead of a parent 
   tag.
  
  Revision  ChangesPath
  1.19  +22 -12
jakarta-struts/src/share/org/apache/struts/taglib/html/BaseHandlerTag.java
  
  Index: BaseHandlerTag.java
  ===
  RCS file: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/BaseHandlerTag.java,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- BaseHandlerTag.java   12 Nov 2002 03:47:42 -  1.18
  +++ BaseHandlerTag.java   16 Nov 2002 06:04:16 -  1.19
  @@ -66,6 +66,7 @@
   import javax.servlet.jsp.JspException;
   import javax.servlet.jsp.tagext.BodyTagSupport;
   import javax.servlet.jsp.tagext.Tag;
  +import javax.servlet.jsp.tagext.TagSupport;
   
   import org.apache.struts.Globals;
   import org.apache.struts.taglib.logic.IterateTag;
  @@ -779,13 +780,22 @@
* otherwise.
* @since Struts 1.1
*/
  -protected static boolean isXhtml(Tag tag) {
  -HtmlTag htmlTag = (HtmlTag) findAncestorWithClass(tag, HtmlTag.class);
  -if (htmlTag == null) {
  +protected boolean isXhtml() {
  +String xhtml =
  +(String) this.pageContext.getAttribute(Globals.XHTML_KEY, 
this.pageContext.PAGE_SCOPE);
  +
  +if ("true".equalsIgnoreCase(xhtml)) {
  +return true;
  +} else {
   return false;
   }
  -
  -return htmlTag.getXhtml();
  +
  +//HtmlTag htmlTag = (HtmlTag) findAncestorWithClass(tag, HtmlTag.class);
  +//if (htmlTag == null) {
  +//return false;
  +//}
  +//
  +//return htmlTag.getXhtml();
   }
   
   /**
  @@ -796,9 +806,9 @@
* @return String - > if xhtml is false, /> if xhtml is true
* @since Struts 1.1
*/
  -protected String getElementClose(Tag tag) {
  -if (this.isXhtml(tag)) {
  -return "/>";
  +protected String getElementClose() {
  +if (this.isXhtml()) {
  +return " />";
   } else {
   return ">";
   }
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>

cvs commit: jakarta-struts/src/share/org/apache/struts/taglib/tiles AddTag.java AttributeToScopeTag.java ComponentConstants.java DefinitionTag.java DefinitionTagSupport.java GetAttributeTag.java GetTag.java ImportAttributeTag.java InitDefinitionsTag.java PutListTag.java UseAttributeTag.java

[jmitchell]

jmitchell2002/11/15 20:46:06

  Modified:src/share/org/apache/struts/taglib/tiles AddTag.java
AttributeToScopeTag.java ComponentConstants.java
DefinitionTag.java DefinitionTagSupport.java
GetAttributeTag.java GetTag.java
ImportAttributeTag.java InitDefinitionsTag.java
PutListTag.java UseAttributeTag.java
  Log:
  Cleaning up imports
  
  Revision  ChangesPath
  1.2   +3 -13 
jakarta-struts/src/share/org/apache/struts/taglib/tiles/AddTag.java
  
  Index: AddTag.java
  ===
  RCS file: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/tiles/AddTag.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- AddTag.java   25 Jun 2002 03:16:30 -  1.1
  +++ AddTag.java   16 Nov 2002 04:46:05 -  1.2
  @@ -62,17 +62,7 @@
   
   package org.apache.struts.taglib.tiles;
   
  -import org.apache.struts.tiles.ComponentContext;
  -
  -import org.apache.struts.taglib.tiles.util.TagUtils;
  -
  -import java.lang.reflect.InvocationTargetException;
  -import java.lang.IllegalAccessException;
  -
  -import java.io.IOException;
   import javax.servlet.jsp.JspException;
  -import javax.servlet.jsp.tagext.TagSupport;
  -import javax.servlet.ServletException;
   
 /**
  * Add an element to surrounding list tag.
  
  
  
  1.2   +6 -9  
jakarta-struts/src/share/org/apache/struts/taglib/tiles/AttributeToScopeTag.java
  
  Index: AttributeToScopeTag.java
  ===
  RCS file: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/tiles/AttributeToScopeTag.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- AttributeToScopeTag.java  25 Jun 2002 03:16:30 -  1.1
  +++ AttributeToScopeTag.java  16 Nov 2002 04:46:05 -  1.2
  @@ -62,15 +62,12 @@
   
   package org.apache.struts.taglib.tiles;
   
  -import org.apache.struts.tiles.ComponentContext;
  -import org.apache.struts.taglib.tiles.util.TagUtils;
  -
  -import java.io.IOException;
   import javax.servlet.jsp.JspException;
  -import javax.servlet.jsp.JspWriter;
   import javax.servlet.jsp.PageContext;
  -
   import javax.servlet.jsp.tagext.TagSupport;
  +
  +import org.apache.struts.taglib.tiles.util.TagUtils;
  +import org.apache.struts.tiles.ComponentContext;
   
   
   /**
  
  
  
  1.4   +3 -4  
jakarta-struts/src/share/org/apache/struts/taglib/tiles/ComponentConstants.java
  
  Index: ComponentConstants.java
  ===
  RCS file: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/tiles/ComponentConstants.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ComponentConstants.java   12 Nov 2002 03:56:09 -  1.3
  +++ ComponentConstants.java   16 Nov 2002 04:46:05 -  1.4
  @@ -62,7 +62,6 @@
   package org.apache.struts.taglib.tiles;
   
   import org.apache.struts.Globals;
  -import org.apache.struts.action.Action;
   
   /**
* Constant used by Tiles/Components.
  
  
  
  1.4   +7 -9  
jakarta-struts/src/share/org/apache/struts/taglib/tiles/DefinitionTag.java
  
  Index: DefinitionTag.java
  ===
  RCS file: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/tiles/DefinitionTag.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- DefinitionTag.java10 Oct 2002 16:32:27 -  1.3
  +++ DefinitionTag.java16 Nov 2002 04:46:05 -  1.4
  @@ -62,14 +62,12 @@
   
   package org.apache.struts.taglib.tiles;
   
  +import javax.servlet.jsp.JspException;
  +
   import org.apache.struts.taglib.tiles.util.TagUtils;
  -import org.apache.struts.tiles.ComponentDefinition;
   import org.apache.struts.tiles.AttributeDefinition;
  +import org.apache.struts.tiles.ComponentDefinition;
   import org.apache.struts.tiles.UntyppedAttribute;
  -import org.apache.commons.logging.Log;
  -import org.apache.commons.logging.LogFactory;
  -
  -import javax.servlet.jsp.JspException;
   
   /**
* This is the tag handler for <tiles:definition>, which defines
  
  
  
  1.2   +5 -6  
jakarta-struts/src/share/org/apache/struts/taglib/tiles/DefinitionTagSupport.java
  
  Index: DefinitionTagSupport.java
  ===
  RCS file: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/tiles/DefinitionTagSupport.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- DefinitionTagSupport.java 25 Jun 2002 03:16:30 -  1.1
  +++ DefinitionTagSupport.java 16 Nov 2002 04:46:05 -  1.2
  @@ -62,10 +62,9 @@
   
   p

cvs commit: jakarta-struts/src/share/org/apache/struts/taglib/tiles PutTag.java

[jmitchell]

jmitchell2002/11/15 20:42:51

  Modified:src/share/org/apache/struts/taglib/tiles PutTag.java
  Log:
  Cleaning up imports
  
  Revision  ChangesPath
  1.4   +9 -13 
jakarta-struts/src/share/org/apache/struts/taglib/tiles/PutTag.java
  
  Index: PutTag.java
  ===
  RCS file: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/tiles/PutTag.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- PutTag.java   26 Jul 2002 16:18:28 -  1.3
  +++ PutTag.java   16 Nov 2002 04:42:51 -  1.4
  @@ -62,20 +62,16 @@
   
   package org.apache.struts.taglib.tiles;
   
  -import org.apache.struts.tiles.ComponentContext;
  -import org.apache.struts.taglib.tiles.util.TagUtils;
  -import org.apache.struts.tiles.*;
  -
   import java.lang.reflect.InvocationTargetException;
  -import java.lang.IllegalAccessException;
  -import java.io.IOException;
   
   import javax.servlet.jsp.JspException;
  -import javax.servlet.jsp.JspTagException;
   import javax.servlet.jsp.tagext.BodyTagSupport;
  -import javax.servlet.jsp.PageContext;
  -import javax.servlet.ServletException;
  -import javax.servlet.http.HttpServletRequest;
  +
  +import org.apache.struts.taglib.tiles.util.TagUtils;
  +import org.apache.struts.tiles.AttributeDefinition;
  +import org.apache.struts.tiles.DefinitionNameAttribute;
  +import org.apache.struts.tiles.DirectStringAttribute;
  +import org.apache.struts.tiles.PathAttribute;
   
   
 /**
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>

cvs commit: jakarta-struts/src/share/org/apache/struts/taglib/nested/logic NestedEmptyTag.java NestedEqualTag.java NestedGreaterEqualTag.java NestedGreaterThanTag.java NestedIterateTag.java NestedIterateTei.java NestedLessEqualTag.java NestedLessThanTag.java NestedMatchTag.java NestedMessagesNotPresentTag.java NestedMessagesPresentTag.java NestedNotEmptyTag.java NestedNotEqualTag.java NestedNotMatchTag.java NestedNotPresentTag.java NestedPresentTag.java

[jmitchell]

jmitchell2002/11/15 20:41:29

  Modified:src/share/org/apache/struts/taglib/nested/logic
NestedEmptyTag.java NestedEqualTag.java
NestedGreaterEqualTag.java
NestedGreaterThanTag.java NestedIterateTag.java
NestedIterateTei.java NestedLessEqualTag.java
NestedLessThanTag.java NestedMatchTag.java
NestedMessagesNotPresentTag.java
NestedMessagesPresentTag.java
NestedNotEmptyTag.java NestedNotEqualTag.java
NestedNotMatchTag.java NestedNotPresentTag.java
NestedPresentTag.java
  Log:
  Cleaning up imports
  
  Revision  ChangesPath
  1.3   +8 -8  
jakarta-struts/src/share/org/apache/struts/taglib/nested/logic/NestedEmptyTag.java
  
  Index: NestedEmptyTag.java
  ===
  RCS file: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/nested/logic/NestedEmptyTag.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- NestedEmptyTag.java   22 Jan 2002 03:30:51 -  1.2
  +++ NestedEmptyTag.java   16 Nov 2002 04:41:28 -  1.3
  @@ -59,11 +59,11 @@
*/
   package org.apache.struts.taglib.nested.logic;
   
  -import javax.servlet.jsp.*;
  -import javax.servlet.jsp.tagext.*;
  -import org.apache.struts.taglib.nested.*;
  -import org.apache.struts.taglib.html.FormTag;
  +import javax.servlet.jsp.JspException;
  +
   import org.apache.struts.taglib.logic.EmptyTag;
  +import org.apache.struts.taglib.nested.NestedNameSupport;
  +import org.apache.struts.taglib.nested.NestedPropertyHelper;
   
   /**
* NestedEmptyTag.
  
  
  
  1.3   +9 -8  
jakarta-struts/src/share/org/apache/struts/taglib/nested/logic/NestedEqualTag.java
  
  Index: NestedEqualTag.java
  ===
  RCS file: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/nested/logic/NestedEqualTag.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- NestedEqualTag.java   22 Jan 2002 03:30:51 -  1.2
  +++ NestedEqualTag.java   16 Nov 2002 04:41:28 -  1.3
  @@ -59,11 +59,12 @@
*/
   package org.apache.struts.taglib.nested.logic;
   
  -import javax.servlet.jsp.*;
  -import javax.servlet.jsp.tagext.*;
  -import org.apache.struts.taglib.nested.*;
  -import org.apache.struts.taglib.html.FormTag;
  +import javax.servlet.jsp.JspException;
  +
   import org.apache.struts.taglib.logic.EqualTag;
  +import org.apache.struts.taglib.nested.NestedNameSupport;
  +import org.apache.struts.taglib.nested.NestedPropertyHelper;
  +import org.apache.struts.taglib.nested.NestedPropertySupport;
   
   /**
* NestedEqualTag.
  
  
  
  1.3   +8 -8  
jakarta-struts/src/share/org/apache/struts/taglib/nested/logic/NestedGreaterEqualTag.java
  
  Index: NestedGreaterEqualTag.java
  ===
  RCS file: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/nested/logic/NestedGreaterEqualTag.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- NestedGreaterEqualTag.java22 Jan 2002 03:30:51 -  1.2
  +++ NestedGreaterEqualTag.java16 Nov 2002 04:41:28 -  1.3
  @@ -59,11 +59,11 @@
*/
   package org.apache.struts.taglib.nested.logic;
   
  -import javax.servlet.jsp.*;
  -import javax.servlet.jsp.tagext.*;
  -import org.apache.struts.taglib.nested.*;
  -import org.apache.struts.taglib.html.FormTag;
  +import javax.servlet.jsp.JspException;
  +
   import org.apache.struts.taglib.logic.GreaterEqualTag;
  +import org.apache.struts.taglib.nested.NestedNameSupport;
  +import org.apache.struts.taglib.nested.NestedPropertyHelper;
   
   /**
* NestedGreaterEqualTag.
  
  
  
  1.3   +8 -8  
jakarta-struts/src/share/org/apache/struts/taglib/nested/logic/NestedGreaterThanTag.java
  
  Index: NestedGreaterThanTag.java
  ===
  RCS file: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/nested/logic/NestedGreaterThanTag.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- NestedGreaterThanTag.java 22 Jan 2002 03:30:51 -  1.2
  +++ NestedGreaterThanTag.java 16 Nov 2002 04:41:28 -  1.3
  @@ -59,11 +59,11 @@
*/
   package org.apache.struts.taglib.nested.logic;
   
  -import javax.servlet.jsp.*;
  -import javax.servlet.jsp.tagext.*;
  -import org.apache.struts.taglib.nested.*;
  -import org.apache.struts.taglib.html.FormTag;
  +import javax.servlet.jsp.JspException;
  +
   import org.apache.struts.taglib.logic.GreaterThanTag;
  +import org.apache.struts.taglib.nested.NestedNameSupport;
  +import

cvs commit: jakarta-struts/src/share/org/apache/struts/taglib/nested/html NestedCheckboxTag.java NestedErrorsTag.java NestedFileTag.java NestedFormTag.java NestedHiddenTag.java NestedImageTag.java NestedImgTag.java NestedLinkTag.java NestedMessagesTag.java NestedMultiboxTag.java NestedOptionsCollectionTag.java NestedOptionsTag.java NestedPasswordTag.java NestedRadioTag.java NestedSelectTag.java NestedSubmitTag.java NestedTextareaTag.java NestedTextTag.java

[jmitchell]

jmitchell2002/11/15 20:38:36

  Modified:src/share/org/apache/struts/taglib/nested/html
NestedCheckboxTag.java NestedErrorsTag.java
NestedFileTag.java NestedFormTag.java
NestedHiddenTag.java NestedImageTag.java
NestedImgTag.java NestedLinkTag.java
NestedMessagesTag.java NestedMultiboxTag.java
NestedOptionsCollectionTag.java
NestedOptionsTag.java NestedPasswordTag.java
NestedRadioTag.java NestedSelectTag.java
NestedSubmitTag.java NestedTextareaTag.java
NestedTextTag.java
  Log:
  Cleaning up imports
  
  Revision  ChangesPath
  1.4   +7 -9  
jakarta-struts/src/share/org/apache/struts/taglib/nested/html/NestedCheckboxTag.java
  
  Index: NestedCheckboxTag.java
  ===
  RCS file: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/nested/html/NestedCheckboxTag.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- NestedCheckboxTag.java29 Mar 2002 21:49:09 -  1.3
  +++ NestedCheckboxTag.java16 Nov 2002 04:38:36 -  1.4
  @@ -59,12 +59,10 @@
*/
   package org.apache.struts.taglib.nested.html;
   
  -import org.apache.struts.taglib.nested.NestedNameSupport;
  -import org.apache.struts.taglib.nested.NestedPropertyHelper;
  -import org.apache.struts.taglib.nested.NestedReference;
  -import javax.servlet.jsp.*;
  -import javax.servlet.jsp.tagext.*;
  +import javax.servlet.jsp.JspException;
  +
   import org.apache.struts.taglib.html.CheckboxTag;
  +import org.apache.struts.taglib.nested.NestedPropertyHelper;
   
   /**
* NestedCheckboxTag.
  
  
  
  1.4   +8 -9  
jakarta-struts/src/share/org/apache/struts/taglib/nested/html/NestedErrorsTag.java
  
  Index: NestedErrorsTag.java
  ===
  RCS file: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/nested/html/NestedErrorsTag.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- NestedErrorsTag.java  2 Apr 2002 04:53:38 -   1.3
  +++ NestedErrorsTag.java  16 Nov 2002 04:38:36 -  1.4
  @@ -59,12 +59,11 @@
*/
   package org.apache.struts.taglib.nested.html;
   
  -import org.apache.struts.taglib.nested.NestedPropertySupport;
  -import org.apache.struts.taglib.nested.NestedPropertyHelper;
  -import org.apache.struts.taglib.nested.NestedReference;
  -import javax.servlet.jsp.*;
  -import javax.servlet.jsp.tagext.*;
  +import javax.servlet.jsp.JspException;
  +
   import org.apache.struts.taglib.html.ErrorsTag;
  +import org.apache.struts.taglib.nested.NestedPropertyHelper;
  +import org.apache.struts.taglib.nested.NestedPropertySupport;
   
   /**
* NestedErrorsTag.
  
  
  
  1.2   +8 -9  
jakarta-struts/src/share/org/apache/struts/taglib/nested/html/NestedFileTag.java
  
  Index: NestedFileTag.java
  ===
  RCS file: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/nested/html/NestedFileTag.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- NestedFileTag.java12 Apr 2002 09:07:29 -  1.1
  +++ NestedFileTag.java16 Nov 2002 04:38:36 -  1.2
  @@ -59,12 +59,11 @@
*/
   package org.apache.struts.taglib.nested.html;
   
  -import org.apache.struts.taglib.nested.NestedPropertySupport;
  -import org.apache.struts.taglib.nested.NestedPropertyHelper;
  -import org.apache.struts.taglib.nested.NestedReference;
  -import javax.servlet.jsp.*;
  -import javax.servlet.jsp.tagext.*;
  +import javax.servlet.jsp.JspException;
  +
   import org.apache.struts.taglib.html.FileTag;
  +import org.apache.struts.taglib.nested.NestedPropertyHelper;
  +import org.apache.struts.taglib.nested.NestedPropertySupport;
   
   /**
* NestedFileTag.
  
  
  
  1.8   +8 -9  
jakarta-struts/src/share/org/apache/struts/taglib/nested/html/NestedFormTag.java
  
  Index: NestedFormTag.java
  ===
  RCS file: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/nested/html/NestedFormTag.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- NestedFormTag.java10 Sep 2002 16:07:59 -  1.7
  +++ NestedFormTag.java16 Nov 2002 04:38:36 -  1.8
  @@ -59,14 +59,13 @@
*/
   package org.apache.struts.taglib.nested.html;
   
  -import org.apache.struts.taglib.nested.NestedParentSupport;
  -import org.apache.struts.taglib.nested.NestedPropertyHelper;
  -import org.apache.struts.taglib.nested.NestedReference;
  -import javax.servlet.jsp.*;
  -import javax.servlet.jsp.tagext.*;
   import

cvs commit: jakarta-struts/src/share/org/apache/struts/taglib/nested NestedPropertyTag.java NestedRootTag.java NestedWriteNestingTag.java

[jmitchell]

jmitchell2002/11/15 20:32:38

  Modified:src/share/org/apache/struts/taglib/nested/bean
NestedDefineTag.java NestedMessageTag.java
NestedSizeTag.java NestedWriteTag.java
   src/share/org/apache/struts/taglib/nested
NestedPropertyTag.java NestedRootTag.java
NestedWriteNestingTag.java
  Log:
  Cleaning up imports
  
  Revision  ChangesPath
  1.3   +8 -7  
jakarta-struts/src/share/org/apache/struts/taglib/nested/bean/NestedDefineTag.java
  
  Index: NestedDefineTag.java
  ===
  RCS file: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/nested/bean/NestedDefineTag.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- NestedDefineTag.java  22 Jan 2002 03:30:50 -  1.2
  +++ NestedDefineTag.java  16 Nov 2002 04:32:38 -  1.3
  @@ -59,10 +59,11 @@
*/
   package org.apache.struts.taglib.nested.bean;
   
  -import org.apache.struts.taglib.nested.*;
  -import javax.servlet.jsp.*;
  -import javax.servlet.jsp.tagext.*;
  +import javax.servlet.jsp.JspException;
  +
   import org.apache.struts.taglib.bean.DefineTag;
  +import org.apache.struts.taglib.nested.NestedNameSupport;
  +import org.apache.struts.taglib.nested.NestedPropertyHelper;
   
   /**
* NestedDefineTag.
  
  
  
  1.2   +8 -7  
jakarta-struts/src/share/org/apache/struts/taglib/nested/bean/NestedMessageTag.java
  
  Index: NestedMessageTag.java
  ===
  RCS file: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/nested/bean/NestedMessageTag.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- NestedMessageTag.java 6 Apr 2002 18:57:44 -   1.1
  +++ NestedMessageTag.java 16 Nov 2002 04:32:38 -  1.2
  @@ -59,10 +59,11 @@
*/
   package org.apache.struts.taglib.nested.bean;
   
  -import org.apache.struts.taglib.nested.*;
  -import javax.servlet.jsp.*;
  -import javax.servlet.jsp.tagext.*;
  +import javax.servlet.jsp.JspException;
  +
   import org.apache.struts.taglib.bean.MessageTag;
  +import org.apache.struts.taglib.nested.NestedNameSupport;
  +import org.apache.struts.taglib.nested.NestedPropertyHelper;
   
   /**
* NestedWriteTag.
  
  
  
  1.3   +8 -7  
jakarta-struts/src/share/org/apache/struts/taglib/nested/bean/NestedSizeTag.java
  
  Index: NestedSizeTag.java
  ===
  RCS file: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/nested/bean/NestedSizeTag.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- NestedSizeTag.java22 Jan 2002 03:30:50 -  1.2
  +++ NestedSizeTag.java16 Nov 2002 04:32:38 -  1.3
  @@ -59,10 +59,11 @@
*/
   package org.apache.struts.taglib.nested.bean;
   
  -import org.apache.struts.taglib.nested.*;
  -import javax.servlet.jsp.*;
  -import javax.servlet.jsp.tagext.*;
  +import javax.servlet.jsp.JspException;
  +
   import org.apache.struts.taglib.bean.SizeTag;
  +import org.apache.struts.taglib.nested.NestedNameSupport;
  +import org.apache.struts.taglib.nested.NestedPropertyHelper;
   
   /**
* NestedSizeTag.
  
  
  
  1.3   +8 -7  
jakarta-struts/src/share/org/apache/struts/taglib/nested/bean/NestedWriteTag.java
  
  Index: NestedWriteTag.java
  ===
  RCS file: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/nested/bean/NestedWriteTag.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- NestedWriteTag.java   22 Jan 2002 03:30:50 -  1.2
  +++ NestedWriteTag.java   16 Nov 2002 04:32:38 -  1.3
  @@ -59,10 +59,11 @@
*/
   package org.apache.struts.taglib.nested.bean;
   
  -import org.apache.struts.taglib.nested.*;
  -import javax.servlet.jsp.*;
  -import javax.servlet.jsp.tagext.*;
  +import javax.servlet.jsp.JspException;
  +
   import org.apache.struts.taglib.bean.WriteTag;
  +import org.apache.struts.taglib.nested.NestedNameSupport;
  +import org.apache.struts.taglib.nested.NestedPropertyHelper;
   
   /**
* NestedWriteTag.
  
  
  
  1.5   +7 -7  
jakarta-struts/src/share/org/apache/struts/taglib/nested/NestedPropertyTag.java
  
  Index: NestedPropertyTag.java
  ===
  RCS file: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/nested/NestedPropertyTag.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- NestedPropertyTag.java10 Sep 2002 16:07:59 -  1.4
  +++ NestedPropertyTag.java16 Nov 2002 04:32:38 -  1.5
  @@ -59,11 +59,11 @@
*/
   package

cvs commit: jakarta-struts/src/share/org/apache/struts/taglib/nested NestedPropertyHelper.java

[jmitchell]

jmitchell2002/11/15 20:30:03

  Modified:src/share/org/apache/struts/taglib/nested
NestedPropertyHelper.java
  Log:
  Cleaning up imports
  
  Revision  ChangesPath
  1.10  +6 -8  
jakarta-struts/src/share/org/apache/struts/taglib/nested/NestedPropertyHelper.java
  
  Index: NestedPropertyHelper.java
  ===
  RCS file: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/nested/NestedPropertyHelper.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- NestedPropertyHelper.java 23 Oct 2002 17:11:42 -  1.9
  +++ NestedPropertyHelper.java 16 Nov 2002 04:30:03 -  1.10
  @@ -60,12 +60,10 @@
   package org.apache.struts.taglib.nested;
   
   import java.util.StringTokenizer;
  -import javax.servlet.jsp.*;
  -import javax.servlet.jsp.tagext.*;
  +
   import javax.servlet.http.HttpServletRequest;
  +import javax.servlet.jsp.tagext.Tag;
   
  -import org.apache.struts.taglib.nested.html.*;
  -import org.apache.struts.taglib.nested.logic.*;
   import org.apache.struts.taglib.html.FormTag;
   
   /** A simple helper class that does everything that needs to be done to get the
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>

cvs commit: jakarta-struts/src/share/org/apache/struts/taglib/html FrameTag.java ImgTag.java

[dgraham]

dgraham 2002/11/12 22:10:54

  Modified:src/share/org/apache/struts/taglib/html FrameTag.java
ImgTag.java
  Log:
  Added xhtml support by modifying how the elements are closed.
  
  Revision  ChangesPath
  1.7   +5 -5  
jakarta-struts/src/share/org/apache/struts/taglib/html/FrameTag.java
  
  Index: FrameTag.java
  ===
  RCS file: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/FrameTag.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- FrameTag.java 26 Oct 2002 15:08:16 -  1.6
  +++ FrameTag.java 13 Nov 2002 06:10:54 -  1.7
  @@ -243,7 +243,7 @@
   results.append("\"");
   }
   results.append(prepareStyles());
  -results.append(">");
  +results.append(getElementClose(this));
   ResponseUtils.write(pageContext,results.toString());
   
   // Skip the body of this tag
  
  
  
  1.23  +5 -5  
jakarta-struts/src/share/org/apache/struts/taglib/html/ImgTag.java
  
  Index: ImgTag.java
  ===
  RCS file: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/ImgTag.java,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- ImgTag.java   8 Nov 2002 05:39:24 -   1.22
  +++ ImgTag.java   13 Nov 2002 06:10:54 -  1.23
  @@ -465,7 +465,7 @@
   }
   results.append(prepareStyles());
   results.append(prepareEventHandlers());
  -results.append(">");
  +results.append(getElementClose(this));
   
   // Print this element to our output writer
   ResponseUtils.write(pageContext, results.toString());
  
  
  

--
To unsubscribe, e-mail:   <mailto:struts-dev-unsubscribe@;jakarta.apache.org>
For additional commands, e-mail: <mailto:struts-dev-help@;jakarta.apache.org>

cvs commit: jakarta-struts/src/share/org/apache/struts/taglib/html FormTag.java

[dgraham]

dgraham 2002/11/11 22:08:33

  Modified:src/share/org/apache/struts/taglib/html FormTag.java
  Log:
  Generates xhtml compliant javascript for focus if needed.
  
  Revision  ChangesPath
  1.33  +54 -118   
jakarta-struts/src/share/org/apache/struts/taglib/html/FormTag.java
  
  Index: FormTag.java
  ===
  RCS file: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/FormTag.java,v
  retrieving revision 1.32
  retrieving revision 1.33
  diff -u -r1.32 -r1.33
  --- FormTag.java  12 Nov 2002 03:47:42 -  1.32
  +++ FormTag.java  12 Nov 2002 06:08:33 -  1.33
  @@ -59,10 +59,8 @@
*
*/
   
  -
   package org.apache.struts.taglib.html;
   
  -
   import java.io.IOException;
   import java.util.StringTokenizer;
   import javax.servlet.http.HttpServletRequest;
  @@ -83,7 +81,6 @@
   import org.apache.struts.util.ResponseUtils;
   import org.apache.struts.Globals;
   
  -
   /**
* Custom tag that represents an input form, associated with a bean whose
* properties correspond to the various fields of the form.
  @@ -95,79 +92,65 @@
   
   public class FormTag extends TagSupport {
   
  -
   // - Instance Variables
   
  -
   /**
* The action URL to which this form should be submitted, if any.
*/
   protected String action = null;
   
  -
   /**
* The application configuration for our module.
*/
   protected ModuleConfig moduleConfig = null;
   
  -
   /**
* The content encoding to be used on a POST submit.
*/
   protected String enctype = null;
   
  -
   /**
* The name of the field to receive focus, if any.
*/
   protected String focus = null;
   
  -
   /**
* The ActionMapping defining where we will be submitting this form
*/
   protected ActionMapping mapping = null;
   
  -
   /**
* The message resources for this package.
*/
   protected static MessageResources messages =
  -MessageResources.getMessageResources(
  -Constants.Package + ".LocalStrings");
  -
  +MessageResources.getMessageResources(Constants.Package + ".LocalStrings");
   
   /**
* The request method used when submitting this form.
*/
   protected String method = null;
   
  -
   /**
* The attribute key under which our associated bean is stored.
*/
   protected String name = null;
   
  -
   /**
* The onReset event script.
*/
   protected String onreset = null;
   
  -
   /**
* The onSubmit event script.
*/
   protected String onsubmit = null;
   
  -
   /**
* The scope (request or session) under which our associated bean
* is stored.
*/
   protected String scope = null;
   
  -
   /**
* The ActionServlet instance we are associated with (so that we can
* initialize the servlet property on any form bean that
  @@ -175,37 +158,31 @@
*/
   protected ActionServlet servlet = null;
   
  -
   /**
* The style attribute associated with this tag.
*/
   protected String style = null;
   
  -
   /**
* The style class associated with this tag.
*/
   protected String styleClass = null;
   
  -
   /**
* The identifier associated with this tag.
*/
   protected String styleId = null;
   
  -
   /**
* The window target.
*/
   protected String target = null;
   
  -
   /**
* The Java class name of the bean to be created, if necessary.
*/
   protected String type = null;
   
  -
   /**
* The name of the form bean to (create and) use. This is either the same
* as the 'name' attribute, if that was specified, or is obtained from the
  @@ -213,7 +190,6 @@
*/
   protected String beanName = null;
   
  -
   /**
* The scope of the form bean to (create and) use. This is either the same
* as the 'scope' attribute, if that was specified, or is obtained from the
  @@ -221,7 +197,6 @@
*/
   protected String beanScope = null;
   
  -
   /**
* The type of the form bean to (create and) use. This is either the same
* as the 'type' attribute, if that was specified, or is obtained from the
  @@ -229,10 +204,8 @@
*/
   protected String beanType = null;
   
  -
   // - Properties
   
  -
   /**
* Return the name of the form bean corresponding to this tag. There is
* no corresponding setter method; this method exists so that the nested
  @@ -245,7 +218,6 @@
   
   }
   
  -
   /**
* Return the action URL to which thi

cvs commit: jakarta-struts/src/share/org/apache/struts/taglib/html JavascriptValidatorTag.java

[dgraham]

dgraham 2002/11/11 21:59:24

  Modified:src/share/org/apache/struts/taglib/html
JavascriptValidatorTag.java
  Log:
  Fixed bug with extra >.
  
  Revision  ChangesPath
  1.15  +7 -8  
jakarta-struts/src/share/org/apache/struts/taglib/html/JavascriptValidatorTag.java
  
  Index: JavascriptValidatorTag.java
  ===
  RCS file: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/JavascriptValidatorTag.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- JavascriptValidatorTag.java   12 Nov 2002 03:47:42 -  1.14
  +++ JavascriptValidatorTag.java   12 Nov 2002 05:59:24 -  1.15
  @@ -517,12 +517,6 @@
   
   sb.append(this.getStartElement());
   
  -if (src != null) {
  -sb.append(" src=\"" + src + "\"> \n");
  -} else {
  -sb.append("> \n");
  -}
  -
   if ("true".equals(htmlComment))
   sb.append(htmlBeginComment);
   sb.append("\n var bCancel = false; \n\n");
  @@ -641,7 +635,12 @@
   if (!BaseHandlerTag.isXhtml(this)) {
   start.append(" language=\"Javascript1.1\"");
   }
  -start.append(">");
  +
  +if (this.src != null) {
  +start.append(" src=\"" + src + "\"");
  +}
  +
  +start.append("> \n");
   return start.toString();
   }
   
  
  
  

--
To unsubscribe, e-mail:   <mailto:struts-dev-unsubscribe@;jakarta.apache.org>
For additional commands, e-mail: <mailto:struts-dev-help@;jakarta.apache.org>

cvs commit: jakarta-struts/src/share/org/apache/struts/taglib/html CancelTag.java SubmitTag.java CheckboxTag.java ResetTag.java ButtonTag.java FormTag.java RadioTag.java HtmlTag.java BaseTag.java MessagesTag.java OptionTag.java ImageTag.java BaseHandlerTag.java ErrorsTag.java JavascriptValidatorTag.java BaseFieldTag.java MultiboxTag.java

[dgraham]

dgraham 2002/11/11 19:47:42

  Modified:src/share/org/apache/struts/taglib/html CancelTag.java
SubmitTag.java CheckboxTag.java ResetTag.java
ButtonTag.java FormTag.java RadioTag.java
HtmlTag.java BaseTag.java MessagesTag.java
OptionTag.java ImageTag.java BaseHandlerTag.java
ErrorsTag.java JavascriptValidatorTag.java
BaseFieldTag.java MultiboxTag.java
  Log:
  Added xhtml support with 2 simple helper methods added to BaseHandlerTag.
  The html taglib now outputs xhtml when nested inside an 
  tag.
  
  Revision  ChangesPath
  1.9   +5 -5  
jakarta-struts/src/share/org/apache/struts/taglib/html/CancelTag.java
  
  Index: CancelTag.java
  ===
  RCS file: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/CancelTag.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- CancelTag.java26 Oct 2002 15:08:16 -  1.8
  +++ CancelTag.java12 Nov 2002 03:47:42 -  1.9
  @@ -210,7 +210,7 @@
   results.append("\"");
   results.append(prepareEventHandlers());
   results.append(prepareStyles());
  -results.append(">");
  +results.append(getElementClose(this));
   
   // Render this element to our writer
   ResponseUtils.write(pageContext, results.toString());
  
  
  
  1.15  +5 -5  
jakarta-struts/src/share/org/apache/struts/taglib/html/SubmitTag.java
  
  Index: SubmitTag.java
  ===
  RCS file: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/SubmitTag.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- SubmitTag.java26 Oct 2002 15:08:16 -  1.14
  +++ SubmitTag.java12 Nov 2002 03:47:42 -  1.15
  @@ -230,7 +230,7 @@
   results.append("\"");
   results.append(prepareEventHandlers());
   results.append(prepareStyles());
  -results.append(">");
  +results.append(getElementClose(this));
   
   // Render this element to our writer
   ResponseUtils.write(pageContext, results.toString());
  
  
  
  1.16  +5 -5  
jakarta-struts/src/share/org/apache/struts/taglib/html/CheckboxTag.java
  
  Index: CheckboxTag.java
  ===
  RCS file: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/CheckboxTag.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- CheckboxTag.java  26 Oct 2002 15:08:16 -  1.15
  +++ CheckboxTag.java  12 Nov 2002 03:47:42 -  1.16
  @@ -218,7 +218,7 @@
   results.append(" checked=\"checked\"");
   results.append(prepareEventHandlers());
   results.append(prepareStyles());
  -results.append(">");
  +results.append(getElementClose(this));
   
   // Print this field to our output writer
   ResponseUtils.write(pageContext, results.toString());
  
  
  
  1.10  +5 -5  
jakarta-struts/src/share/org/apache/struts/taglib/html/ResetTag.java
  
  Index: ResetTag.java
  =======
  RCS file: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/ResetTag.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- ResetTag.java 26 Oct 2002 15:08:16 -  1.9
  +++ ResetTag.java 12 Nov 2002 03:47:42 -  1.10
  @@ -225,7 +225,7 @@
results.append("\"");
results.append(prepareEventHandlers());
results.append(prepareStyles());
  - results.append(">");
  + results.append(getElementClose(this));
   
// Render this element to our writer
   ResponseUtils.write(pageContext, results.toString());
  
  
  
  1.13  +5 -5  
jakarta-struts/src/share/org/apache/struts/taglib/html/ButtonTag.java
  
  Index: ButtonTag.java
  =======
  RCS file: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/ButtonTag.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- ButtonTag.java26 Oct 2002 15:08:16 -  1.12
  +++ ButtonTag.java12 Nov 2002 03:47:42 -  1.13
  @@ -207,7 +207,7 @@
   results.append("\"");
   results.append(prepareEventHandlers());
   results.append(prepareStyles());
  -results.append(">");
  +results.append(getElementClose(this));
   
   // Render this element to our writer
   

cvs commit: jakarta-struts/src/share/org/apache/struts/taglib/html JavascriptValidatorTag.java

[rleland]

rleland 2002/11/07 21:45:58

  Modified:src/share/org/apache/struts/taglib/html
JavascriptValidatorTag.java
  Log:
  Bug 14054
  Checked in More ApplicationConfig->ModuleConfig
  
  Revision  ChangesPath
  1.13  +3 -3  
jakarta-struts/src/share/org/apache/struts/taglib/html/JavascriptValidatorTag.java
  
  Index: JavascriptValidatorTag.java
  ===
  RCS file: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/JavascriptValidatorTag.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- JavascriptValidatorTag.java   1 Nov 2002 20:57:16 -   1.12
  +++ JavascriptValidatorTag.java   8 Nov 2002 05:45:58 -   1.13
  @@ -80,7 +80,7 @@
   import org.apache.struts.util.MessageResources;
   import org.apache.struts.validator.Resources;
   import org.apache.struts.util.RequestUtils;
  -import org.apache.struts.config.ApplicationConfig;
  +import org.apache.struts.config.ModuleConfig;
   
   
   /**
  @@ -292,7 +292,7 @@
   public int doStartTag() throws JspException {
   StringBuffer results = new StringBuffer();
   
  -ApplicationConfig config = RequestUtils.getModuleConfig(pageContext);
  +ModuleConfig config = RequestUtils.getModuleConfig(pageContext);
   ValidatorResources resources = (ValidatorResources)
   pageContext.getAttribute(ValidatorPlugIn.VALIDATOR_KEY +
   config.getPrefix(), PageContext.APPLICATION_SCOPE);
  
  
  

--
To unsubscribe, e-mail:   <mailto:struts-dev-unsubscribe@;jakarta.apache.org>
For additional commands, e-mail: <mailto:struts-dev-help@;jakarta.apache.org>

cvs commit: jakarta-struts/src/share/org/apache/struts/taglib/html HtmlTag.java

[dgraham]

dgraham 2002/11/06 17:43:34

  Modified:src/share/org/apache/struts/taglib/html HtmlTag.java
  Log:
  Added xmlns attribute to  if xhtml is set to true.  This conforms to the 
  w3 xhtml standard.
  
  Revision  ChangesPath
  1.5   +5 -4  
jakarta-struts/src/share/org/apache/struts/taglib/html/HtmlTag.java
  
  Index: HtmlTag.java
  ===
  RCS file: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/HtmlTag.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- HtmlTag.java  23 Sep 2002 05:13:43 -  1.4
  +++ HtmlTag.java  7 Nov 2002 01:43:34 -   1.5
  @@ -144,6 +144,7 @@
   sb.append(" xml:lang=\"");
   sb.append(lang);
   sb.append("\"");
  +sb.append(" xmlns=\"http://www.w3.org/1999/xhtml\"";);
   }
   }
   }
  
  
  

--
To unsubscribe, e-mail:   <mailto:struts-dev-unsubscribe@;jakarta.apache.org>
For additional commands, e-mail: <mailto:struts-dev-help@;jakarta.apache.org>

cvs commit: jakarta-struts/src/share/org/apache/struts/taglib/tiles/util TagUtils.java

[cedric]

cedric  2002/11/05 06:14:07

  Modified:src/share/org/apache/struts/taglib/tiles/util TagUtils.java
  Log:
  Use TilesUtil instead of DefinitionsUtil
  
  Revision  ChangesPath
  1.2   +8 -8  
jakarta-struts/src/share/org/apache/struts/taglib/tiles/util/TagUtils.java
  
  Index: TagUtils.java
  ===
  RCS file: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/tiles/util/TagUtils.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- TagUtils.java 25 Jun 2002 03:17:19 -  1.1
  +++ TagUtils.java 5 Nov 2002 14:14:06 -   1.2
  @@ -67,7 +67,7 @@
   import org.apache.struts.taglib.tiles.ComponentConstants;
   import org.apache.struts.tiles.ComponentContext;
   import org.apache.struts.tiles.ComponentDefinition;
  -import org.apache.struts.tiles.DefinitionsUtil;
  +import org.apache.struts.tiles.TilesUtil;
   import org.apache.struts.tiles.NoSuchDefinitionException;
   import org.apache.struts.tiles.FactoryNotFoundException;
   import org.apache.struts.tiles.DefinitionsFactoryException;
  @@ -156,10 +156,10 @@
*  propety cannot be found
*/
   public static Object getProperty(Object bean, String name)
  -   throws IllegalAccessException, InvocationTargetException,
  -  NoSuchMethodException
  +throws IllegalAccessException, InvocationTargetException,
  +   NoSuchMethodException
{
  -return (PropertyUtils.getProperty(bean, name));
  + return (PropertyUtils.getProperty(bean, name));
}
   
   
  @@ -358,7 +358,7 @@
   {
   try
 {
  -  return  DefinitionsUtil.getDefinition(name, pageContext);
  +  return  TilesUtil.getDefinition(name, pageContext.getRequest(), 
pageContext.getServletContext() );
 }
catch( NoSuchDefinitionException ex )
   {
  
  
  

--
To unsubscribe, e-mail:   <mailto:struts-dev-unsubscribe@;jakarta.apache.org>
For additional commands, e-mail: <mailto:struts-dev-help@;jakarta.apache.org>

cvs commit: jakarta-struts/src/share/org/apache/struts/taglib/tiles InitDefinitionsTag.java

[cedric]

cedric  2002/11/05 06:13:43

  Modified:src/share/org/apache/struts/taglib/tiles
InitDefinitionsTag.java
  Log:
  Use TilesUtil instead of DefinitionsUtil
  
  Revision  ChangesPath
  1.3   +6 -6  
jakarta-struts/src/share/org/apache/struts/taglib/tiles/InitDefinitionsTag.java
  
  Index: InitDefinitionsTag.java
  ===
  RCS file: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/tiles/InitDefinitionsTag.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- InitDefinitionsTag.java   11 Jul 2002 16:44:24 -  1.2
  +++ InitDefinitionsTag.java   5 Nov 2002 14:13:43 -   1.3
  @@ -62,7 +62,7 @@
   
   package org.apache.struts.taglib.tiles;
   
  -import org.apache.struts.tiles.DefinitionsUtil;
  +import org.apache.struts.tiles.TilesUtil;
   import org.apache.struts.tiles.DefinitionsFactory;
   import org.apache.struts.tiles.DefinitionsFactoryConfig;
   import org.apache.struts.tiles.DefinitionsFactoryException;
  @@ -121,7 +121,7 @@
*/
 public int doStartTag() throws JspException
 {
  -  DefinitionsFactory factory = 
DefinitionsUtil.getDefinitionsFactory(pageContext.getServletContext());
  +  DefinitionsFactory factory = 
TilesUtil.getDefinitionsFactory(pageContext.getRequest(),pageContext.getServletContext());
 if(factory != null )
   return SKIP_BODY;
   
  @@ -131,7 +131,7 @@
   
 try
   {
  -factory = 
DefinitionsUtil.createDefinitionsFactory(pageContext.getServletContext(), 
factoryConfig);
  +factory = TilesUtil.createDefinitionsFactory(pageContext.getServletContext(), 
factoryConfig);
   }
  catch( DefinitionsFactoryException ex )
 {
  
  
  

--
To unsubscribe, e-mail:   <mailto:struts-dev-unsubscribe@;jakarta.apache.org>
For additional commands, e-mail: <mailto:struts-dev-help@;jakarta.apache.org>

cvs commit: jakarta-struts/src/share/org/apache/struts/taglib/html ImageTag.java

[dmkarr]

dmkarr  2002/11/03 16:34:38

  Modified:contrib/struts-el/doc/userGuide struts-html-el.xml
   doc/userGuide struts-html.xml
   src/share/org/apache/struts/taglib/html ImageTag.java
  Log:
  Fixed ordering of call to "prepareIndex()" and emitting of property value.  The
  property value had to be before the call, but it was after.
  
  After looking at all the places this method is called, I've realized this
  method and the calls to it should be refactored so the method decides whether
  the place the array brackets before or after the property name.  This is
  entirely determined by whether the "name" parameter is null, so the method
  already has this information.
  
  PR: 12959
  
  Revision  ChangesPath
  1.7   +4 -4  
jakarta-struts/contrib/struts-el/doc/userGuide/struts-html-el.xml
  
  Index: struts-html-el.xml
  ===
  RCS file: 
/home/cvs/jakarta-struts/contrib/struts-el/doc/userGuide/struts-html-el.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- struts-html-el.xml27 Oct 2002 20:29:42 -  1.6
  +++ struts-html-el.xml4 Nov 2002 00:34:37 -   1.7
  @@ -2127,10 +2127,10 @@
   false
   false
   
  -Valid only inside of logic:iterate tag.
  -If yes then name of the html tag will be rendered as
  -"id[34].propertyName". Number in brackets will be generated
  -for every iteration and taken from ancestor logic:iterate tag.
  +Valid only inside of logic:iterate tag.  If true
  +then name of the html tag will be rendered as
  +"propertyName[34]". Number in brackets will be generated for
  +every iteration and taken from ancestor logic:iterate tag.
   
   
   
  
  
  
  1.34  +12 -12jakarta-struts/doc/userGuide/struts-html.xml
  
  Index: struts-html.xml
  ===
  RCS file: /home/cvs/jakarta-struts/doc/userGuide/struts-html.xml,v
  retrieving revision 1.33
  retrieving revision 1.34
  diff -u -r1.33 -r1.34
  --- struts-html.xml   3 Nov 2002 04:24:50 -   1.33
  +++ struts-html.xml   4 Nov 2002 00:34:37 -   1.34
  @@ -124,10 +124,10 @@
   false
   true
   
  -Valid only inside of logic:iterate tag.
  -If true then name of the html tag will be rendered as
  -"propertyName[34]". Number in brackets will be generated
  -for every iteration and taken from ancestor logic:iterate tag.
  +Valid only inside of logic:iterate tag.  If true
  +then name of the html tag will be rendered as
  +"propertyName[34]". Number in brackets will be generated for
  +every iteration and taken from ancestor logic:iterate tag.
   
   
   
  @@ -2342,10 +2342,10 @@
   false
   true
   
  -Valid only inside of logic:iterate tag.
  -If true then name of the html tag will be rendered as
  -"id[34].propertyName". Number in brackets will be generated
  -for every iteration and taken from ancestor logic:iterate tag.
  +Valid only inside of logic:iterate tag.  If true
  +then name of the html tag will be rendered as
  +"propertyName[34]". Number in brackets will be generated for
  +every iteration and taken from ancestor logic:iterate tag.
   
   
   
  @@ -6028,10 +6028,10 @@
   false
   true
   
  -Valid only inside of logic:iterate tag.
  -If true then name of the html tag will be rendered as
  -"propertyName[34]". Number in brackets will be generated
  -for every iteration and taken from ancestor logic:iterate tag.
  +Valid only inside of logic:iterate tag.  If true
  +then name of the html tag will be rendered as
  +"propertyName[34]". Number in brackets will be generated for
  +every iteration and taken from ancestor logic:iterate tag.
       
   
   
  
  
  
  1.22  +13 -9 
jakarta-struts/src/share/org/apache/struts/taglib/html/ImageTag.java
  
  Index: ImageTag.java
  =======
  RCS file: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/ImageTag.java,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- ImageTag.java 26 Oct 2002 1

Re: [FRIDAY] Re: Struts taglib

[V. Cekvenich]

> Don't forget about backwards compatibility ... :-)

Of course this could take years.


As you said, and I silently applauded:
bean and logic tags could be deprecated to jstl
html tag could be deprecated in future to faces tag

That leaves action mappings.
Those relay should make it to a future servlet spec. (Model 2 is 
important and proven)

I think dynabeans should go into a JavaBean spec.

Similar to how log4j worked out.

Musing: Afterward, start clean. Maybe an innovative light framework that 
explores XML browser capabilities with Flash/SVG  that talks async. msgs 
via SOAP-like to COM+ or Dynabeans. (There might be a way to write a 
dynabean in C#) Thats Model 2.

.V








Craig R. McClanahan wrote:

On Fri, 1 Nov 2002, V. Cekvenich wrote:



"An architect is done not when he has nothing more to add, but when he
has nothing left to remove".



OK, so lets remove all the restrooms from all the public buildings.
That functionality has all been factored out into the commons anyway
(i.e. nearly everyone's home already has one), so we don't need them here.

Such a conclusion would come as a rude shock to those in need of such
facilities, who make the assumption "well, it was right through that door
yesterday ...".

Don't forget about backwards compatibility ... :-)

Craig





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

Re: cvs commit: jakarta-struts/src/share/org/apache/struts/taglib/htmlImgTag.java

[Rob Leland]

[EMAIL PROTECTED] wrote:


dgraham 2002/11/01 16:28:12

  Modified:src/share/org/apache/struts/taglib/html ImgTag.java
  Log:
  deprecated lowsrc attribute, removed todo to add support for IE 
specific events,

  ran code formatter.


I would rather we hold off on reformatting the code right now, including
placing '{''}' around one line blocks, which I like to do myself.
It makes it had to diff between versions, especially when we do the
ApplicationConfig rename.

Here is a good CVS resource

http://www.chips.chalmers.se/Chips/dokumentation/procedurer/config_mgmt/#edit

There are free scripts for CVS that automatically reformat the code when 
they are checked into CVS. That would be good to get on line after 1.1 
rolls out.
CVSROOT/cvswrappers,v
http://216.239.33.100/search?q=cache:KuFeN0go4cYC:docs.umdl.umich.edu/dlps/workflow/cvs-man.xml+cvs+reformat+checkin&hl=en&ie=UTF-8



--
To unsubscribe, e-mail:   <mailto:struts-dev-unsubscribe@;jakarta.apache.org>
For additional commands, e-mail: <mailto:struts-dev-help@;jakarta.apache.org>

cvs commit: jakarta-struts/src/share/org/apache/struts/taglib/html ImgTag.java

[dgraham]

dgraham 2002/11/01 16:28:12

  Modified:src/share/org/apache/struts/taglib/html ImgTag.java
  Log:
  deprecated lowsrc attribute, removed todo to add support for IE specific events,
  ran code formatter.
  
  Revision  ChangesPath
  1.21  +87 -132   
jakarta-struts/src/share/org/apache/struts/taglib/html/ImgTag.java
  
  Index: ImgTag.java
  ===
  RCS file: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/ImgTag.java,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- ImgTag.java   26 Oct 2002 15:08:16 -  1.20
  +++ ImgTag.java   2 Nov 2002 00:28:12 -   1.21
  @@ -59,10 +59,8 @@
*
*/
   
  -
   package org.apache.struts.taglib.html;
   
  -
   import java.net.URLEncoder;
   import java.util.Iterator;
   import java.util.Map;
  @@ -75,18 +73,13 @@
   import org.apache.struts.util.RequestUtils;
   import org.apache.struts.util.ResponseUtils;
   
  -
   /**
* Generate an IMG tag to the specified image URI.
* 
* TODO:
* 
  - *   make the alt, src, and
  + *   Make the alt, src, and
*   lowsrc settable from properties (for i18n)
  - *   handle onLoad, onAbort, and
  - *   onError events (my JavaScript book is very old,
  - *   there may be more unsupported events in the past couple of IE
  - *   versions)
* 
*
* @author Michael Westbay
  @@ -96,10 +89,8 @@
   
   public class ImgTag extends BaseHandlerTag {
   
  -
   // - Properties
   
  -
   /**
* The property to specify where to align the image.
*/
  @@ -113,7 +104,6 @@
   this.align = align;
   }
   
  -
   /**
* The border size around the image.
*/
  @@ -127,7 +117,6 @@
   this.border = border;
   }
   
  -
   /**
* The image height.
*/
  @@ -141,7 +130,6 @@
   this.height = height;
   }
   
  -
   /**
* The horizontal spacing around the image.
*/
  @@ -155,7 +143,6 @@
   this.hspace = hspace;
   }
   
  -
   /**
* The image name for named images.
*/
  @@ -169,7 +156,6 @@
   this.imageName = imageName;
   }
   
  -
   /**
* Server-side image map declaration.
*/
  @@ -183,27 +169,30 @@
   this.ismap = ismap;
   }
   
  -
   /**
* The low resolution image source URI.
  + * @deprecated This is not defined in the HTML 4.01 spec and will be removed in 
a
  + * future version of Struts.
*/
   protected String lowsrc = null;
   
  +/**
  + * @deprecated This is not defined in the HTML 4.01 spec and will be removed in 
a
  + * future version of Struts.
  + */
   public String getLowsrc() {
  -return (this.lowsrc);
  +return (this.lowsrc);
   }
   
   public void setLowsrc(String lowsrc) {
  -this.lowsrc = lowsrc;
  +this.lowsrc = lowsrc;
   }
   
  -
   /**
* The message resources for this package.
*/
   protected static MessageResources messages =
  - MessageResources.getMessageResources(Constants.Package + ".LocalStrings");
  -
  +MessageResources.getMessageResources(Constants.Package + ".LocalStrings");
   
   /**
* The JSP bean name for query parameters.
  @@ -211,14 +200,13 @@
   protected String name = null;
   
   public String getName() {
  -return (this.name);
  +return (this.name);
   }
   
   public void setName(String name) {
  -this.name = name;
  +this.name = name;
   }
   
  -
   /**
* The module-relative path, starting with a slash character, of the
* image to be displayed by this rendered tag.
  @@ -233,7 +221,6 @@
   this.page = page;
   }
   
  -
   /**
* The message resources key under which we should look up the
* page attribute for this generated tag, if any.
  @@ -248,7 +235,6 @@
   this.pageKey = pageKey;
   }
   
  -
   /**
* In situations where an image is dynamically generated (such as to create
* a chart graph), this specifies the single-parameter request parameter
  @@ -264,7 +250,6 @@
   this.paramId = paramId;
   }
   
  -
   /**
* The single-parameter JSP bean name.
*/
  @@ -278,7 +263,6 @@
   this.paramName = paramName;
   }
   
  -
   /**
* The single-parameter JSP bean property.
*/
  @@ -292,7 +276,6 @@
   this.paramProperty = paramProperty;
   }
   
  -
   /**
* The single-parameter JSP bean scope.
*/
  @@ -306,21 +289,19 @@
   this.paramScope = paramScope;
   }
   
  -
   /**
* The JSP bean property name for query parameters.
*/
   protected St

RE: [FRIDAY] Re: Struts taglib

[Clovis Yutaka Harada]

hummm Gamma ?

-Original Message-
From: Edgar Dollin [mailto:edgar@;blue-moose.net]
Sent: Friday, November 01, 2002 4:26 PM
To: 'Struts Developers List'
Subject: RE: [FRIDAY] Re: Struts taglib


Who said building architecture has deep parallels to computer science anyway
;-)?

-Original Message-
From: Craig R. McClanahan [mailto:craigmcc@;apache.org]
Sent: Friday, November 01, 2002 11:52 AM
To: Struts Developers List
Subject: [FRIDAY] Re: Struts taglib




On Fri, 1 Nov 2002, V. Cekvenich wrote:

> "An architect is done not when he has nothing more to add, but when he
> has nothing left to remove".

OK, so lets remove all the restrooms from all the public buildings.
That functionality has all been factored out into the commons anyway
(i.e. nearly everyone's home already has one), so we don't need them here.

Such a conclusion would come as a rude shock to those in need of such
facilities, who make the assumption "well, it was right through that door
yesterday ...".

Don't forget about backwards compatibility ... :-)

Craig


--
To unsubscribe, e-mail:   <mailto:struts-dev-unsubscribe@;jakarta.apache.org>
For additional commands, e-mail: <mailto:struts-dev-help@;jakarta.apache.org>

--
To unsubscribe, e-mail:   <mailto:struts-dev-unsubscribe@;jakarta.apache.org>
For additional commands, e-mail: <mailto:struts-dev-help@;jakarta.apache.org>



--
To unsubscribe, e-mail:   <mailto:struts-dev-unsubscribe@;jakarta.apache.org>
For additional commands, e-mail: <mailto:struts-dev-help@;jakarta.apache.org>

cvs commit: jakarta-struts/src/share/org/apache/struts/taglib/html JavascriptValidatorTag.java

[ekbush]

ekbush  2002/11/01 12:57:16

  Modified:src/share/org/apache/struts/taglib/html
JavascriptValidatorTag.java
  Log:
  Validator was always looking at resources for the default module.  Changed
  lookup so that it is module-relative.
  
  Patch provided by: [EMAIL PROTECTED] (Brian Ely)
  
  PR: 14167
  
  Revision  ChangesPath
  1.12  +3 -2  
jakarta-struts/src/share/org/apache/struts/taglib/html/JavascriptValidatorTag.java
  
  Index: JavascriptValidatorTag.java
  ===
  RCS file: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/JavascriptValidatorTag.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- JavascriptValidatorTag.java   30 Oct 2002 02:31:10 -  1.11
  +++ JavascriptValidatorTag.java   1 Nov 2002 20:57:16 -   1.12
  @@ -312,7 +312,8 @@
   if (form != null) {
   if ("true".equals(dynamicJavascript)) {
   MessageResources messages = (MessageResources)
  -pageContext.getAttribute(bundle, 
PageContext.APPLICATION_SCOPE);
  +pageContext.getAttribute(bundle + config.getPrefix(),
  + PageContext.APPLICATION_SCOPE);
   
   List lActions = new ArrayList();
   List lActionMethods = new ArrayList();
  
  
  

--
To unsubscribe, e-mail:   <mailto:struts-dev-unsubscribe@;jakarta.apache.org>
For additional commands, e-mail: <mailto:struts-dev-help@;jakarta.apache.org>

RE: [FRIDAY] Re: Struts taglib

[Edgar Dollin]

Who said building architecture has deep parallels to computer science anyway
;-)?

-Original Message-
From: Craig R. McClanahan [mailto:craigmcc@;apache.org]
Sent: Friday, November 01, 2002 11:52 AM
To: Struts Developers List
Subject: [FRIDAY] Re: Struts taglib




On Fri, 1 Nov 2002, V. Cekvenich wrote:

> "An architect is done not when he has nothing more to add, but when he
> has nothing left to remove".

OK, so lets remove all the restrooms from all the public buildings.
That functionality has all been factored out into the commons anyway
(i.e. nearly everyone's home already has one), so we don't need them here.

Such a conclusion would come as a rude shock to those in need of such
facilities, who make the assumption "well, it was right through that door
yesterday ...".

Don't forget about backwards compatibility ... :-)

Craig


--
To unsubscribe, e-mail:   <mailto:struts-dev-unsubscribe@;jakarta.apache.org>
For additional commands, e-mail: <mailto:struts-dev-help@;jakarta.apache.org>

--
To unsubscribe, e-mail:   <mailto:struts-dev-unsubscribe@;jakarta.apache.org>
For additional commands, e-mail: <mailto:struts-dev-help@;jakarta.apache.org>

[FRIDAY] Re: Struts taglib

[Craig R. McClanahan]

On Fri, 1 Nov 2002, V. Cekvenich wrote:

> "An architect is done not when he has nothing more to add, but when he
> has nothing left to remove".

OK, so lets remove all the restrooms from all the public buildings.
That functionality has all been factored out into the commons anyway
(i.e. nearly everyone's home already has one), so we don't need them here.

Such a conclusion would come as a rude shock to those in need of such
facilities, who make the assumption "well, it was right through that door
yesterday ...".

Don't forget about backwards compatibility ... :-)

Craig


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

Re: Struts taglib

[Ted Husted]

Moving forward, the dogma that I would like to observe is "follow 
the use-case". 

Everything in Struts was put there because somebody needed for 
something. So, I'm starting to get back to basics and think in 
terms of the use-cases that Struts solves. 

The benefit there is that you can look for places where use-cases 
overlap and so you can share functionality between them. The net 
result is that you can simplify the overall feature set.

I've done some very preliminary work on this here:

http://husted.com/struts/usecases.html

but so far these are really just Sunday morning musings.

One simplification that I still want to try and slip in for 1.1 is 
to support "action=" from the html:link tag. Some of us have been 
documenting our links as forwards, but I find its much simplier to 
do that with actions, especially now that we strongly recommend 
putting an action in front of any dynamic page.

-Ted.

11/1/2002 6:18:56 AM, "V. Cekvenich" <[EMAIL PROTECTED]> 
wrote:

>More "religion"?
>
>"An architect is done not when he has nothing more to add, but 
when he 
>has nothing left to remove".
>I heard this on a PBS show related to buildings, but I spent my 
2nd 7 
>years in SD (Software Development) trying to simplify (much 
harder to 
>simplify.
>Anyway, my initial attraction to Struts is that it gets out of 
the way, 
>unlike other frameworks I use.
>
>I just wanted to use above quote.
>
>.V
>
>Ted Husted wrote:
>> 10/31/2002 4:52:50 PM, "Craig R. McClanahan" 
<[EMAIL PROTECTED]> 
>> wrote:
>> 
>>>but on the whole we should be able to let people freely choose 
>>>their view-tier technology just like we currently let them 
choose 
>>>their model-tier technology.  To me, the core value add of 
Struts
>>>has always been the controller, and there's lots
>>>we can do in that space.
>> 
>> 
>> +1
>> 
>> -Ted.
>
>
>
>
>--
>To unsubscribe, e-mail:   
>For additional commands, e-mail: 
>
>




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

Re: Struts taglib

[V. Cekvenich]

More "religion"?

"An architect is done not when he has nothing more to add, but when he 
has nothing left to remove".
I heard this on a PBS show related to buildings, but I spent my 2nd 7 
years in SD (Software Development) trying to simplify (much harder to 
simplify.
Anyway, my initial attraction to Struts is that it gets out of the way, 
unlike other frameworks I use.

I just wanted to use above quote.

.V

Ted Husted wrote:
10/31/2002 4:52:50 PM, "Craig R. McClanahan" <[EMAIL PROTECTED]> 
wrote:

but on the whole we should be able to let people freely choose 
their view-tier technology just like we currently let them choose 
their model-tier technology.  To me, the core value add of Struts
has always been the controller, and there's lots
we can do in that space.


+1

-Ted.





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

Re: Struts taglib

[David Graham]

I didn't find it too hard to tell what tags matched.  I haven't found a need 
for many of the tags anyways.  I mostly use jstl's forEach, if, out, and 
message tags and the struts html tags.  The struts counterparts are pretty 
easy to guess.

David




From: Alan P Sexton <[EMAIL PROTECTED]>
Reply-To: "Struts Developers List" <[EMAIL PROTECTED]>
To: "Struts Developers List" <[EMAIL PROTECTED]>
Subject: Re: Struts taglib
Date: Thu, 31 Oct 2002 23:16:04 +


Currently I am using the tiles, bean, html, and logic taglibs, and am about
to start using nested. If these will eventually be phased out then I am
very happy to move to other taglibs. It would be very nice if there was
some kind of documentation on how the current libraries match with the
alternatives: e.g. which struts tags are replaceable with current
JSTL tags and which are not. This would help me and others like me, in
making the transition early and avoiding the pain of more major work
later by replacing as many tag uses as possible now.

Any comments?

Alan

Craig R. McClanahan writes:
 >
 > * For my own efforts, I'm going to de-emphasize improvements
 >   and enhancements to the Struts tag libraries at all, and
 >   encourage people to use the standardized successors (JSTL
 >   now, and JSF when it's done).  We should definitely do bugfixes
 >   on the existing libraries after 1.1, but I don't see a good
 >   reason to invest the necessary effort to disconnect
 >   them when standarized (as well as more powerful) solutions
 >   exist.  Other committers might see this differently, of course.
 >
 > * There is very little code in RequestUtils that is not
 >   Struts-specific, so it wouldn't make a particularly good
 >   candidate for commons.  You might recall that several
 >   Commons packages did originally come from Struts (beanutils,
 >   digester, resources, validator), so the factoring of what was
 >   horizontally reusable is, IMHO, pretty much done.
 >
 >   We're also, of course, incorporating commons packages that were
 >   originated by others but are useful to us (collections, dbcp/pool,
 >   fileupload, logging) as well, rather than reinventing those wheels.
 >
 > My personal efforts on the future of Struts are going to be focused on
 > enhancing the fundamental architecture of the controller, and looking 
at
 > things like hierarchical modules, more general command patterns for
 > Actions, scriptable multi-request dialogs, and things like that.
 >
 >
 > Craig

--
To unsubscribe, e-mail:   
<mailto:struts-dev-unsubscribe@;jakarta.apache.org>
For additional commands, e-mail: 
<mailto:struts-dev-help@;jakarta.apache.org>


_
Internet access plans that fit your lifestyle -- join MSN. 
http://resourcecenter.msn.com/access/plans/default.asp


--
To unsubscribe, e-mail:   <mailto:struts-dev-unsubscribe@;jakarta.apache.org>
For additional commands, e-mail: <mailto:struts-dev-help@;jakarta.apache.org>

Re: Struts taglib

[Craig R. McClanahan]

On Thu, 31 Oct 2002, Alan P Sexton wrote:

> Date: Thu, 31 Oct 2002 23:16:04 +
> From: Alan P Sexton <[EMAIL PROTECTED]>
> Reply-To: Struts Developers List <[EMAIL PROTECTED]>
> To: Struts Developers List <[EMAIL PROTECTED]>
> Subject: Re: Struts taglib
>
>
> Currently I am using the tiles, bean, html, and logic taglibs, and am about
> to start using nested. If these will eventually be phased out

"Phased out" is probably too strong -- especially in a Struts 1.x roadmap.
I'd be surprised if we even formally deprecated them.

> then I am
> very happy to move to other taglibs. It would be very nice if there was
> some kind of documentation on how the current libraries match with the
> alternatives: e.g. which struts tags are replaceable with current
> JSTL tags and which are not. This would help me and others like me, in
> making the transition early and avoiding the pain of more major work
> later by replacing as many tag uses as possible now.
>

For JSTL, I think the docs for the struts-el library that David Karr has
initiated cover the mapping pretty well.  This library was deliberately
designed to ease the transition by mapping (pretty much) one-to-one with
existing Struts tags, showing either the replacements in JSTL or providing
an enhancement to the existing Struts tags to support JSTL's expression
language.  It's available in the "contrib" directory in recent nightly
builds.  I would encourage you to start experimenting with these tags, and
the JSTL tags, right now -- assuming, of course, you are on a Servlet 2.3
/ JSP 1.2 container, which is a JSTL prerequisite.

For JSF, the final form of the set of available JSF components hasn't been
finalized yet, so there's no formal mapping.  You can pretty much assume
there will be components (and corresponding tags if you're using JSP) for
a form and all the individual input fields, plus components for more
complex things like lists, datagrids, and/or tree controls.

It's too early to know what the precise mapping will be, but you can
assume that a Struts app would choose either the struts-html OR JavaServer
Faces component tags on any given page.  As I've announced previously,
there will be a nice integration layer that lets you migrate existing
apps, one page at a time.

> Any comments?
>
> Alan

Craig


--
To unsubscribe, e-mail:   <mailto:struts-dev-unsubscribe@;jakarta.apache.org>
For additional commands, e-mail: <mailto:struts-dev-help@;jakarta.apache.org>

Re: Struts taglib

[Ted Husted]

10/31/2002 6:16:04 PM, Alan P Sexton <[EMAIL PROTECTED]> 
wrote:
>Currently I am using the tiles, bean, html, and logic taglibs, 
>and am aboutto start using nested. If these will eventually be 
>phased out then I am very happy to move to other taglibs. It
>would be very nice if there was
>some kind of documentation on how the current libraries match
>with the alternatives: e.g. which struts tags are replaceable
>with current JSTL tags and which are not. This would help me and
>others like me, in making the transition early and avoiding the 
>pain of more major work later by replacing as many tag uses as 
>possible now.
>
>Any comments?

Struts is a workingman's framework, and all anyone is saying is 
that they will be working in other areas. If someone stepped up 
and wanted to do more work on the tags, no one is going to stop 
them. Everything depends on what contributors choose to 
contribute. 

If you are making the early transition and wish to contribute a 
document like this, I'm sure we be happy to roll it into the 
documentation. But someone who is doing this themselves needs to 
start the ball rolling.

-Ted.



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

Re: Struts taglib

[Alan P Sexton]

Currently I am using the tiles, bean, html, and logic taglibs, and am about
to start using nested. If these will eventually be phased out then I am
very happy to move to other taglibs. It would be very nice if there was
some kind of documentation on how the current libraries match with the
alternatives: e.g. which struts tags are replaceable with current
JSTL tags and which are not. This would help me and others like me, in
making the transition early and avoiding the pain of more major work
later by replacing as many tag uses as possible now.

Any comments?

Alan

Craig R. McClanahan writes:
 > 
 > * For my own efforts, I'm going to de-emphasize improvements
 >   and enhancements to the Struts tag libraries at all, and
 >   encourage people to use the standardized successors (JSTL
 >   now, and JSF when it's done).  We should definitely do bugfixes
 >   on the existing libraries after 1.1, but I don't see a good
 >   reason to invest the necessary effort to disconnect
 >   them when standarized (as well as more powerful) solutions
 >   exist.  Other committers might see this differently, of course.
 > 
 > * There is very little code in RequestUtils that is not
 >   Struts-specific, so it wouldn't make a particularly good
 >   candidate for commons.  You might recall that several
 >   Commons packages did originally come from Struts (beanutils,
 >   digester, resources, validator), so the factoring of what was
 >   horizontally reusable is, IMHO, pretty much done.
 > 
 >   We're also, of course, incorporating commons packages that were
 >   originated by others but are useful to us (collections, dbcp/pool,
 >   fileupload, logging) as well, rather than reinventing those wheels.
 > 
 > My personal efforts on the future of Struts are going to be focused on
 > enhancing the fundamental architecture of the controller, and looking at
 > things like hierarchical modules, more general command patterns for
 > Actions, scriptable multi-request dialogs, and things like that.
 > 
 > 
 > Craig

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

Re: Struts taglib

[Ted Husted]

10/31/2002 4:52:50 PM, "Craig R. McClanahan" <[EMAIL PROTECTED]> 
wrote:
>but on the whole we should be able to let people freely choose 
>their view-tier technology just like we currently let them choose 
>their model-tier technology.  To me, the core value add of Struts
>has always been the controller, and there's lots
>we can do in that space.

+1

-Ted.




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

Re: Struts taglib

[Craig R. McClanahan]

On Thu, 31 Oct 2002, David Graham wrote:

> Date: Thu, 31 Oct 2002 14:49:54 -0700
> From: David Graham <[EMAIL PROTECTED]>
> Reply-To: Struts Developers List <[EMAIL PROTECTED]>
> To: [EMAIL PROTECTED]
> Subject: Re: Struts taglib
>
> I agree with Craig.  We shouldn't put any more effort into the taglibs than
> we need to.  I am concerned about enhancing a few of the tags like errors
> and messages because they are struts specific and very useful.
>

Likewise, there will end up needing to be a few JavaServer Faces
components that are Struts specific (such as a form component that adds
the extra Struts features related to the form bean), but on the whole we
should be able to let people freely choose their view-tier technology just
like we currently let them choose their model-tier technology.  To me, the
core value add of Struts has always been the controller, and there's lots
we can do in that space.

> David

Craig


--
To unsubscribe, e-mail:   <mailto:struts-dev-unsubscribe@;jakarta.apache.org>
For additional commands, e-mail: <mailto:struts-dev-help@;jakarta.apache.org>

Re: Struts taglib

[David Graham]

I agree with Craig.  We shouldn't put any more effort into the taglibs than 
we need to.  I am concerned about enhancing a few of the tags like errors 
and messages because they are struts specific and very useful.

David



From: "Craig R. McClanahan" <[EMAIL PROTECTED]>
Reply-To: "Struts Developers List" <[EMAIL PROTECTED]>
To: Struts Developers List <[EMAIL PROTECTED]>
Subject: Re: Struts taglib
Date: Thu, 31 Oct 2002 13:45:20 -0800 (PST)



On Thu, 31 Oct 2002, [utf-8] Etienne Labonté wrote:

> Date: Thu, 31 Oct 2002 15:50:35 -0500
> From: "[utf-8] Etienne Labonté" <[EMAIL PROTECTED]>
> Reply-To: Struts Developers List <[EMAIL PROTECTED]>
> To: "Struts Developers List (E-mail)" <[EMAIL PROTECTED]>
> Subject: Struts taglib
>
> Hi,
>
> Are there any plans to untie taglibs from Struts in a future version? In
> many cases I see this wouldn't be too much to ask. Such as in
> org.apache.struts.taglib.bean.MessageTag where there is a dependency on
> org.apache.struts.action.Action only for a few constants. While we are 
at
> it, are there also plans to move org.apache.struts.util.RequestUtils and
> friends to the Commons project?
>

There isn't any simple answer to that set of questions, but here are my
thoughts:

* For my own efforts, I'm going to de-emphasize improvements
  and enhancements to the Struts tag libraries at all, and
  encourage people to use the standardized successors (JSTL
  now, and JSF when it's done).  We should definitely do bugfixes
  on the existing libraries after 1.1, but I don't see a good
  reason to invest the necessary effort to disconnect
  them when standarized (as well as more powerful) solutions
  exist.  Other committers might see this differently, of course.

* There is very little code in RequestUtils that is not
  Struts-specific, so it wouldn't make a particularly good
  candidate for commons.  You might recall that several
  Commons packages did originally come from Struts (beanutils,
  digester, resources, validator), so the factoring of what was
  horizontally reusable is, IMHO, pretty much done.

  We're also, of course, incorporating commons packages that were
  originated by others but are useful to us (collections, dbcp/pool,
  fileupload, logging) as well, rather than reinventing those wheels.

My personal efforts on the future of Struts are going to be focused on
enhancing the fundamental architecture of the controller, and looking at
things like hierarchical modules, more general command patterns for
Actions, scriptable multi-request dialogs, and things like that.

> Yours,
>
> Etienne
>

Craig



--
To unsubscribe, e-mail:   
<mailto:struts-dev-unsubscribe@;jakarta.apache.org>
For additional commands, e-mail: 
<mailto:struts-dev-help@;jakarta.apache.org>


_
Surf the Web without missing calls! Get MSN Broadband.  
http://resourcecenter.msn.com/access/plans/freeactivation.asp


--
To unsubscribe, e-mail:   <mailto:struts-dev-unsubscribe@;jakarta.apache.org>
For additional commands, e-mail: <mailto:struts-dev-help@;jakarta.apache.org>

Re: Struts taglib

[Craig R. McClanahan]

On Thu, 31 Oct 2002, [utf-8] Etienne Labonté wrote:

> Date: Thu, 31 Oct 2002 15:50:35 -0500
> From: "[utf-8] Etienne Labonté" <[EMAIL PROTECTED]>
> Reply-To: Struts Developers List <[EMAIL PROTECTED]>
> To: "Struts Developers List (E-mail)" <[EMAIL PROTECTED]>
> Subject: Struts taglib
>
> Hi,
>
> Are there any plans to untie taglibs from Struts in a future version? In
> many cases I see this wouldn't be too much to ask. Such as in
> org.apache.struts.taglib.bean.MessageTag where there is a dependency on
> org.apache.struts.action.Action only for a few constants. While we are at
> it, are there also plans to move org.apache.struts.util.RequestUtils and
> friends to the Commons project?
>

There isn't any simple answer to that set of questions, but here are my
thoughts:

* For my own efforts, I'm going to de-emphasize improvements
  and enhancements to the Struts tag libraries at all, and
  encourage people to use the standardized successors (JSTL
  now, and JSF when it's done).  We should definitely do bugfixes
  on the existing libraries after 1.1, but I don't see a good
  reason to invest the necessary effort to disconnect
  them when standarized (as well as more powerful) solutions
  exist.  Other committers might see this differently, of course.

* There is very little code in RequestUtils that is not
  Struts-specific, so it wouldn't make a particularly good
  candidate for commons.  You might recall that several
  Commons packages did originally come from Struts (beanutils,
  digester, resources, validator), so the factoring of what was
  horizontally reusable is, IMHO, pretty much done.

  We're also, of course, incorporating commons packages that were
  originated by others but are useful to us (collections, dbcp/pool,
  fileupload, logging) as well, rather than reinventing those wheels.

My personal efforts on the future of Struts are going to be focused on
enhancing the fundamental architecture of the controller, and looking at
things like hierarchical modules, more general command patterns for
Actions, scriptable multi-request dialogs, and things like that.

> Yours,
>
> Etienne
>

Craig



--
To unsubscribe, e-mail:   <mailto:struts-dev-unsubscribe@;jakarta.apache.org>
For additional commands, e-mail: <mailto:struts-dev-help@;jakarta.apache.org>

Struts taglib

[Etienne Labonté]

Hi,

Are there any plans to untie taglibs from Struts in a future version? In
many cases I see this wouldn't be too much to ask. Such as in
org.apache.struts.taglib.bean.MessageTag where there is a dependency on
org.apache.struts.action.Action only for a few constants. While we are at
it, are there also plans to move org.apache.struts.util.RequestUtils and
friends to the Commons project?

Yours,

Etienne

cvs commit: jakarta-struts/src/share/org/apache/struts/taglib/template InsertTag.java

[rleland]

rleland 2002/10/29 18:31:39

  Modified:src/share/org/apache/struts/taglib/template InsertTag.java
  Log:
  use method getModuleConfig instead of getApplicationConfig to
  used internally to class
  
  Revision  ChangesPath
  1.14  +5 -5  
jakarta-struts/src/share/org/apache/struts/taglib/template/InsertTag.java
  
  Index: InsertTag.java
  ===
  RCS file: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/template/InsertTag.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- InsertTag.java25 Oct 2002 23:54:53 -  1.13
  +++ InsertTag.java30 Oct 2002 02:31:38 -  1.14
  @@ -153,7 +153,7 @@
  public int doEndTag() throws JspException {
   
 String prefix = "";
  -  ApplicationConfig config = RequestUtils.getApplicationConfig(pageContext);
  +  ApplicationConfig config = RequestUtils.getModuleConfig(pageContext);
 if (config != null) {
 prefix = config.getPrefix();
 }
  
  
  

--
To unsubscribe, e-mail:   <mailto:struts-dev-unsubscribe@;jakarta.apache.org>
For additional commands, e-mail: <mailto:struts-dev-help@;jakarta.apache.org>

cvs commit: jakarta-struts/src/share/org/apache/struts/taglib/logic ForwardTag.java

[rleland]

rleland 2002/10/29 18:31:23

  Modified:src/share/org/apache/struts/taglib/logic ForwardTag.java
  Log:
  use method getModuleConfig instead of getApplicationConfig to
  used internally to class
  
  Revision  ChangesPath
  1.11  +5 -5  
jakarta-struts/src/share/org/apache/struts/taglib/logic/ForwardTag.java
  
  Index: ForwardTag.java
  ===
  RCS file: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/logic/ForwardTag.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- ForwardTag.java   14 Oct 2002 18:16:18 -  1.10
  +++ ForwardTag.java   30 Oct 2002 02:31:23 -  1.11
  @@ -136,7 +136,7 @@
   
// Look up the desired ActionForward entry
ActionForward forward = null;
  -ApplicationConfig config = RequestUtils.getApplicationConfig(pageContext);
  +ApplicationConfig config = RequestUtils.getModuleConfig(pageContext);
if (config != null)
forward = (ActionForward) config.findForwardConfig(name);
if (forward == null) {
  
  
  

--
To unsubscribe, e-mail:   <mailto:struts-dev-unsubscribe@;jakarta.apache.org>
For additional commands, e-mail: <mailto:struts-dev-help@;jakarta.apache.org>

cvs commit: jakarta-struts/src/share/org/apache/struts/taglib/html FormTag.java JavascriptValidatorTag.java

[rleland]

rleland 2002/10/29 18:31:11

  Modified:src/share/org/apache/struts/taglib/html FormTag.java
JavascriptValidatorTag.java
  Log:
  use method getModuleConfig instead of getApplicationConfig to
  used internally to class
  
  Revision  ChangesPath
  1.30  +5 -5  
jakarta-struts/src/share/org/apache/struts/taglib/html/FormTag.java
  
  Index: FormTag.java
  ===
  RCS file: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/FormTag.java,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- FormTag.java  26 Oct 2002 00:05:02 -  1.29
  +++ FormTag.java  30 Oct 2002 02:31:10 -  1.30
  @@ -848,7 +848,7 @@
   protected void lookup() throws JspException {
   
   // Look up the application module configuration information we need
  -appConfig = RequestUtils.getApplicationConfig(pageContext);
  +appConfig = RequestUtils.getModuleConfig(pageContext);
   
   if (appConfig == null) {
   JspException e = new JspException
  
  
  
  1.11  +2 -2  
jakarta-struts/src/share/org/apache/struts/taglib/html/JavascriptValidatorTag.java
  
  Index: JavascriptValidatorTag.java
  ===
  RCS file: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/JavascriptValidatorTag.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- JavascriptValidatorTag.java   24 Oct 2002 06:20:33 -  1.10
  +++ JavascriptValidatorTag.java   30 Oct 2002 02:31:10 -  1.11
  @@ -292,7 +292,7 @@
   public int doStartTag() throws JspException {
   StringBuffer results = new StringBuffer();
   
  -ApplicationConfig config = RequestUtils.getApplicationConfig(pageContext);
  +ApplicationConfig config = RequestUtils.getModuleConfig(pageContext);
   ValidatorResources resources = (ValidatorResources)
   pageContext.getAttribute(ValidatorPlugIn.VALIDATOR_KEY +
   config.getPrefix(), PageContext.APPLICATION_SCOPE);
  
  
  

--
To unsubscribe, e-mail:   <mailto:struts-dev-unsubscribe@;jakarta.apache.org>
For additional commands, e-mail: <mailto:struts-dev-help@;jakarta.apache.org>

cvs commit: jakarta-struts/src/share/org/apache/struts/taglib/bean StrutsTag.java

[rleland]

rleland 2002/10/29 18:30:51

  Modified:src/share/org/apache/struts/taglib/bean StrutsTag.java
  Log:
  use method getModuleConfig instead of getApplicationConfig to
  used internally to class
  
  Revision  ChangesPath
  1.12  +5 -5  
jakarta-struts/src/share/org/apache/struts/taglib/bean/StrutsTag.java
  
  Index: StrutsTag.java
  ===
  RCS file: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/bean/StrutsTag.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- StrutsTag.java14 Oct 2002 18:16:18 -  1.11
  +++ StrutsTag.java30 Oct 2002 02:30:51 -  1.12
  @@ -177,7 +177,7 @@
   }
   
   // Retrieve our application module configuration information
  -ApplicationConfig config = RequestUtils.getApplicationConfig(pageContext);
  +ApplicationConfig config = RequestUtils.getModuleConfig(pageContext);
   
   // Retrieve the requested object to be exposed
   Object object = null;
  
  
  

--
To unsubscribe, e-mail:   <mailto:struts-dev-unsubscribe@;jakarta.apache.org>
For additional commands, e-mail: <mailto:struts-dev-help@;jakarta.apache.org>

cvs commit: jakarta-struts/src/share/org/apache/struts/taglib/html package.html

[jmitchell]

jmitchell2002/10/28 22:08:15

  Modified:src/share/org/apache/struts/taglib/html package.html
  Log:
  Update links.
  
  Revision  ChangesPath
  1.19  +3 -3  
jakarta-struts/src/share/org/apache/struts/taglib/html/package.html
  
  Index: package.html
  ===
  RCS file: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/package.html,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- package.html  29 Oct 2002 04:31:07 -  1.18
  +++ package.html  29 Oct 2002 06:08:14 -  1.19
  @@ -85,9 +85,9 @@

   
   The Struts form tag outputs a standard HTML form tag, and
  -also   links the input form with a JavaBean subclassed from the Struts ActionForm
  -object   (see Javadoc
  - ). Each field in   the form should correspond to a property of the form's
  +also links the input form with a JavaBean subclassed from the Struts
  +ActionFormobject.
  +Each field in   the form should correspond to a property of the form's
   bean. When a field and   property correspond, the bean is first used to populate
   the form, and then to   store the user's input when the form is submitted
   to the controller servlet.
  
  
  

--
To unsubscribe, e-mail:   <mailto:struts-dev-unsubscribe@;jakarta.apache.org>
For additional commands, e-mail: <mailto:struts-dev-help@;jakarta.apache.org>

cvs commit: jakarta-struts/src/share/org/apache/struts/taglib/template package.html

[jmitchell]

jmitchell2002/10/28 21:31:39

  Modified:src/share/org/apache/struts/taglib/template package.html
  Log:
  Update links.
  
  Revision  ChangesPath
  1.4   +3 -3  
jakarta-struts/src/share/org/apache/struts/taglib/template/package.html
  
  Index: package.html
  ===
  RCS file: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/template/package.html,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- package.html  25 Oct 2002 23:54:53 -  1.3
  +++ package.html  29 Oct 2002 05:31:39 -  1.4
  @@ -43,15 +43,15 @@


   
  -   get
  +   get
- Retrieves content from a request scope bean, for use in the template
   layout.
  -   insert
  +   insert
- Retrieves (or includes) the specified template file, and then
   inserts the specified content into the template's layout. By changing the
   layout defined in the template file, any other file that inserts the template
   will automatically use the new layout.
  -   put
  +   put
- Creates a request scope bean that specifies the content to be
   used by the get tag. Content can be printed directly or included from a JSP
   or HTML fil
  
  
  

--
To unsubscribe, e-mail:   <mailto:struts-dev-unsubscribe@;jakarta.apache.org>
For additional commands, e-mail: <mailto:struts-dev-help@;jakarta.apache.org>

cvs commit: jakarta-struts/src/share/org/apache/struts/taglib/nested/logic/doc-files nested-logic.jpg

[rleland]

rleland 2002/10/28 20:58:02

  Modified:src/share/org/apache/struts/taglib/nested/logic/doc-files
nested-logic.jpg
  Log:
  Update UML for nested logic taglib
  
  Revision  ChangesPath
  1.3   +600 -626  
jakarta-struts/src/share/org/apache/struts/taglib/nested/logic/doc-files/nested-logic.jpg
  
<>
  
  

--
To unsubscribe, e-mail:   <mailto:struts-dev-unsubscribe@;jakarta.apache.org>
For additional commands, e-mail: <mailto:struts-dev-help@;jakarta.apache.org>

cvs commit: jakarta-struts/src/share/org/apache/struts/taglib/nested/html/doc-files nested-html.jpg

[rleland]

rleland 2002/10/28 20:38:22

  Modified:src/share/org/apache/struts/taglib/nested/html/doc-files
nested-html.jpg
  Log:
  Update UML for nested html taglib
  
  Revision  ChangesPath
  1.3   +555 -775  
jakarta-struts/src/share/org/apache/struts/taglib/nested/html/doc-files/nested-html.jpg
  
<>
  
  

--
To unsubscribe, e-mail:   <mailto:struts-dev-unsubscribe@;jakarta.apache.org>
For additional commands, e-mail: <mailto:struts-dev-help@;jakarta.apache.org>

cvs commit: jakarta-struts/src/share/org/apache/struts/taglib/html package.html

[jmitchell]

jmitchell2002/10/28 20:31:07

  Modified:src/share/org/apache/struts/taglib/html package.html
  Log:
  Fixed bad links to userGuide from API docs.
  
  Thanks Alan.
  
  Revision  ChangesPath
  1.18  +12 -12
jakarta-struts/src/share/org/apache/struts/taglib/html/package.html
  
  Index: package.html
  ===
  RCS file: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/package.html,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- package.html  28 Oct 2002 02:12:53 -  1.17
  +++ package.html  29 Oct 2002 04:31:07 -  1.18
  @@ -321,7 +321,7 @@
   
    
   
  -See the HTML Tags Reference
  +See the HTML Tags 
Reference
   for detailed information about the available tags in this tag library,
   and the   complete list of valid attributes for each tag.
   
  @@ -438,7 +438,7 @@

   
   
  -base
  +base
  
   
   
  @@ -469,13 +469,13 @@
   it   easy to write "session-aware" hyperlink references:
   
   
  -link
  +link
 - Renders an HTML anchor or hyperlink.
  -rewrite
  +rewrite
 - Renders a request URI, but without creating the <a> hyperlink.
   This tag is useful when you want to generate a string constant for use
   by a JavaScript procedure.
  -img
  +img
 - Renders an HTML <img> element with the image at the specified
   URL.
   
  @@ -676,7 +676,7 @@
   
 
   
  -See the HTML Tags Reference
  +See the HTML Tags 
Reference
   for the complete list of valid attributes for each tag.. 
   
   Internationalization
  @@ -685,26 +685,26 @@
   Internationalization is automatically supported by the HTML tags where
   appropriate. 
   
  -Errors
  +Errors
 - By default,   the text for your messages will be returned by the default
   message resource,   which will select the appropriate language for the user.
   You may also specify   another message resource using the bundle
 attribute.
   
  -HTML
  +HTML
 - Renders an HTML   element with language attributes extracted from the
   user's current Locale object,   if there is one. 
   
  -image
  -  and img
  +image
  +  and img
   - Can optionally retrieve the value for its binary source and alt text
   from   the message resource, so that different images and/or text can be provided
   for   different locales. See the tag's altKey,  srcKey
  -, and   bundle attributes in the 
  +, and   bundle attributes in the 
HTML   Tags Reference
.
   
  -Messages
  +Messages
 - By default,   the text for your messages will be returned by the default
   message resource,   which will select the appropriate language for the user.
   You may also specify   another message resource using the bundle
  
  
  

--
To unsubscribe, e-mail:   <mailto:struts-dev-unsubscribe@;jakarta.apache.org>
For additional commands, e-mail: <mailto:struts-dev-help@;jakarta.apache.org>

cvs commit: jakarta-struts/src/share/org/apache/struts/taglib/logic package.html

[jmitchell]

jmitchell2002/10/28 20:30:17

  Modified:src/share/org/apache/struts/taglib/logic package.html
  Log:
  Fixed bad links to userGuide from API docs.
  
  Thanks Alan.
  
  Revision  ChangesPath
  1.13  +11 -11
jakarta-struts/src/share/org/apache/struts/taglib/logic/package.html
  
  Index: package.html
  ===
  RCS file: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/logic/package.html,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- package.html  25 Jun 2002 01:30:40 -  1.12
  +++ package.html  29 Oct 2002 04:30:17 -  1.13
  @@ -39,14 +39,14 @@
   body   of the tag if the comparison evaluates to true. 

   
  -   equal,
  - notEqual
  +   equal,
  + notEqual
  
  -   greaterEqual
  -, lessEqual
  +   greaterEqual
  +, lessEqual
   
  -   greaterThan
  -, lessThan
  +   greaterThan
  +, lessThan
   

   
  @@ -55,8 +55,8 @@
 inside of other Strings

   
  -   match
  -, notMatch
  +   match
  +, notMatch
   

   
  @@ -65,9 +65,9 @@
   the location   of the presentation page

   
  -   forward
  +   forward
 
  -   redirect
  +   redirect
 

   
  @@ -75,7 +75,7 @@
   Collection Utilities -The purpose of these tags is to handle 
Collections

   
  -   iterate
  +   iterate


   
  
  
  

--
To unsubscribe, e-mail:   <mailto:struts-dev-unsubscribe@;jakarta.apache.org>
For additional commands, e-mail: <mailto:struts-dev-help@;jakarta.apache.org>

cvs commit: jakarta-struts/src/share/org/apache/struts/taglib/nested/bean/doc-files nested-bean.jpg

[rleland]

rleland 2002/10/28 20:30:04

  Modified:src/share/org/apache/struts/taglib/nested/bean/doc-files
nested-bean.jpg
  Log:
  Update UML for nested bean taglib
  
  Revision  ChangesPath
  1.3   +120 -174  
jakarta-struts/src/share/org/apache/struts/taglib/nested/bean/doc-files/nested-bean.jpg
  
<>
  
  

--
To unsubscribe, e-mail:   <mailto:struts-dev-unsubscribe@;jakarta.apache.org>
For additional commands, e-mail: <mailto:struts-dev-help@;jakarta.apache.org>

cvs commit: jakarta-struts/src/share/org/apache/struts/taglib/bean package.html

[jmitchell]

jmitchell2002/10/28 20:20:02

  Modified:src/share/org/apache/struts/taglib/bean package.html
  Log:
  Fixed bad links to userGuide from API docs.
  
  Thanks Alan.
  
  Revision  ChangesPath
  1.5   +3 -3  
jakarta-struts/src/share/org/apache/struts/taglib/bean/package.html
  
  Index: package.html
  ===
  RCS file: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/bean/package.html,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- package.html  28 Oct 2002 02:14:32 -  1.4
  +++ package.html  29 Oct 2002 04:20:02 -  1.5
  @@ -51,7 +51,7 @@

   
 
  -See the Bean Tags Reference
  +See the Bean Tags 
Reference
for detailed information about the available tags in this tag library, and
   the valid attributes for each tag.
   
  @@ -303,7 +303,7 @@
   Struts offers a variety of bean creation tags that copy existing beans
   (or bean properties) from the environment within which this page is running,
   and the request that is currently being processed.  Not all of the attributes 
  -for each tag are illustrated in the examples below - see the 
  +for each tag are illustrated in the examples below - see the 
   Bean Tags Reference
for more information.  Any bean created by these tags exists only in page 
   scope, for the remainder of the current page.
  @@ -394,7 +394,7 @@
   you (as an application scope bean) by the Struts controller servlet, using
   the Locale must recently stored in the user's session.  These defaults can
   be overridden by setting values for the "bundle" and "locale" attributes,
  -as described in the 
  +as described in the 
   Bean Tags Reference
   . 
   <bean:message key="label.Cancel"/><bean:message 
key="message.hello" arg0='<%= user.getFullName() %>'/>
  
  
  

--
To unsubscribe, e-mail:   <mailto:struts-dev-unsubscribe@;jakarta.apache.org>
For additional commands, e-mail: <mailto:struts-dev-help@;jakarta.apache.org>

cvs commit: jakarta-struts/src/share/org/apache/struts/taglib/nested/doc-files nestedUML.jpg

[rleland]

rleland 2002/10/28 20:14:49

  Modified:src/share/org/apache/struts/taglib/nested/doc-files
nestedUML.jpg
  Log:
  Update UML for nested taglib
  
  Revision  ChangesPath
  1.2   +406 -846  
jakarta-struts/src/share/org/apache/struts/taglib/nested/doc-files/nestedUML.jpg
  
<>
  
  

--
To unsubscribe, e-mail:   <mailto:struts-dev-unsubscribe@;jakarta.apache.org>
For additional commands, e-mail: <mailto:struts-dev-help@;jakarta.apache.org>

cvs commit: jakarta-struts/src/share/org/apache/struts/taglib/logic/doc-files logicUML.jpg

[rleland]

rleland 2002/10/28 19:54:10

  Modified:src/share/org/apache/struts/taglib/logic/doc-files
logicUML.jpg
  Log:
  Update UML for logic taglib
  
  Revision  ChangesPath
  1.2   +415 -242  
jakarta-struts/src/share/org/apache/struts/taglib/logic/doc-files/logicUML.jpg
  
<>
  
  

--
To unsubscribe, e-mail:   <mailto:struts-dev-unsubscribe@;jakarta.apache.org>
For additional commands, e-mail: <mailto:struts-dev-help@;jakarta.apache.org>

cvs commit: jakarta-struts/src/share/org/apache/struts/taglib/html/doc-files htmlUML.jpg

[rleland]

rleland 2002/10/28 19:31:14

  Modified:src/share/org/apache/struts/taglib/html/doc-files
htmlUML.jpg
  Log:
  Update UML for html taglib
  
  Revision  ChangesPath
  1.2   +436 -351  
jakarta-struts/src/share/org/apache/struts/taglib/html/doc-files/htmlUML.jpg
  
<>
  
  

--
To unsubscribe, e-mail:   <mailto:struts-dev-unsubscribe@;jakarta.apache.org>
For additional commands, e-mail: <mailto:struts-dev-help@;jakarta.apache.org>

cvs commit: jakarta-struts/src/share/org/apache/struts/taglib/bean/doc-files beanUML.jpg

[rleland]

rleland 2002/10/28 19:24:18

  Modified:src/share/org/apache/struts/taglib/bean/doc-files
beanUML.jpg
  Log:
  Update UML for bean taglib
  
  Revision  ChangesPath
  1.4   +331 -248  
jakarta-struts/src/share/org/apache/struts/taglib/bean/doc-files/beanUML.jpg
  
<>
  
  

--
To unsubscribe, e-mail:   <mailto:struts-dev-unsubscribe@;jakarta.apache.org>
For additional commands, e-mail: <mailto:struts-dev-help@;jakarta.apache.org>

cvs commit: jakarta-struts/src/share/org/apache/struts/taglib/tiles InsertTag.java

[dgraham]

dgraham 2002/10/27 21:15:48

  Modified:src/share/org/apache/struts/taglib/tiles InsertTag.java
  Log:
  ran code formatter to fix crazy indentations
  
  Revision  ChangesPath
  1.5   +834 -901  
jakarta-struts/src/share/org/apache/struts/taglib/tiles/InsertTag.java
  
  Index: InsertTag.java
  ===
  RCS file: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/tiles/InsertTag.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- InsertTag.java10 Oct 2002 16:32:27 -  1.4
  +++ InsertTag.java28 Oct 2002 05:15:48 -  1.5
  @@ -59,7 +59,6 @@
*
*/
   
  -
   package org.apache.struts.taglib.tiles;
   
   import org.apache.struts.tiles.ComponentContext;
  @@ -99,900 +98,834 @@
* @author Cedric Dumoulin
* @version $Revision$ $Date$
*/
  -public class InsertTag extends DefinitionTagSupport implements PutTagParent, 
ComponentConstants, PutListTagParent
  -{
  -/** Commons Logging instance. */
  -  protected static Log log = LogFactory.getLog(InsertTag.class);
  -
  -/* JSP Tag attributes */
  -/** Flush attribute value */
  -  protected boolean flush = true;
  -
  -/** Name to insert */
  -  protected String name = null;
  -/** Name of attribute from which to read page name to include */
  -  protected String attribute = null;
  -/** Name of bean used as entity to include */
  -  protected String beanName = null;
  -/** Name of bean property, if any */
  -  protected String beanProperty = null;
  -/** Scope of bean, if any */
  -  protected String beanScope = null;
  -
  -/**
  - * Are errors ignored. This is the property for attribute 'ignore'.
  - * Default value is false, which throw an exception.
  - * Only 'attribute not found' errors are ignored.
  - */
  -  protected boolean isErrorIgnored = false;
  -/** Name of component instance to include */
  -  protected String definitionName = null;
  -
  -/* Internal properties */
  -/**
  - * Does the end tag need to be processed.
  - * Default value is true. Boolean set in case of ignored errors.
  - */
  -  protected boolean processEndTag = true;
  -/** Current component context */
  -  protected ComponentContext cachedCurrentContext;
  -/** Finale handler of tag methods */
  -  protected TagHandler tagHandler = null;
  -
  -/** Trick to allows inner classes to access pageContext */
  -  protected PageContext pageContext = null;
  -
  - /**
  -  * Reset member values for reuse. This method calls super.release(),
  -  * which invokes TagSupport.release(), which typically does nothing.
  -  */
  -public void release() {
  -
  -super.release();
  -attribute = null;
  -beanName = null;
  -beanProperty = null;
  -beanScope = null;
  -
  -definitionName = null;
  -flush = true;
  -name = null;
  -page = null;
  -role = null;
  -isErrorIgnored = false;
  -}
  -
  - /**
  -  * Reset internal member values for reuse.
  -  */
  -protected void releaseInternal()
  -  {
  -  cachedCurrentContext = null;
  -  processEndTag = true;
  -// pageContext = null;  // orion doesn't set it between two tags
  -  tagHandler = null;
  -  }
  -
  -/**
  - * Set the current page context.
  - * Called by the page implementation prior to doStartTag().
  - * 
  - * Needed to allow inner classes to access pageContext.
  - */
  -  public void setPageContext(PageContext pc)
  -  {
  -  this.pageContext = pc;
  -  super.setPageContext(pc);
  -  }
  -
  -/**
  - * Get the pageContext property
  - */
  -  public PageContext getPageContext()
  -  {
  -  return pageContext;
  -  }
  -
  -/**
  - * Set property.
  - */
  -  public void setName(String value){
  -this.name = value;
  -  }
  -
  -/**
  - * Get the property.
  - */
  -  public String getName()
  -  {
  -  return name;
  -  }
  -
  -/**
  - * Set property
  - */
  -  public void setComponent(String name){
  -this.page = name;
  -  }
  -
  -/**
  - * Set property
  - * @deprecated Use setDefinition() instead.
  - */
  -  public void setInstance(String name){
  -this.definitionName = name;
  -  }
  -
  -/**
  - * Set property
  - */
  -  public void setDefinition(String name){
  -this.definitionName = name;
  -  }
  -
  -/**
  - * Get the property.
  - */
  -  public String getDefinitionName()
  -  {
  -  return definitionName;
  -  }
  -
  -/**
  - * Set property
  - */
  -  public void setAttribute(String value){
  -this.attribute = value;
  -  }
  -
  -/**
  - * Set property.
  - */
  -

cvs commit: jakarta-struts/src/share/org/apache/struts/taglib/bean package.html

[jmitchell]

jmitchell2002/10/27 18:14:32

  Modified:src/share/org/apache/struts/taglib/bean package.html
  Log:
  Update link to commons PropertyUtils.
  
  Revision  ChangesPath
  1.4   +1 -1  
jakarta-struts/src/share/org/apache/struts/taglib/bean/package.html
  
  Index: package.html
  ===
  RCS file: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/bean/package.html,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- package.html  24 Mar 2002 07:14:44 -  1.3
  +++ package.html  28 Oct 2002 02:14:32 -  1.4
  @@ -156,7 +156,7 @@
   accessed by these references have properties of the appropriate names and 
   types.  Otherwise, JSP runtime exceptions will be thrown.
 
  -See the JavaDocs for PropertyUtils
  +See the JavaDocs for http://jakarta.apache.org/commons/beanutils/api/org/apache/commons/beanutils/PropertyUtils.html";>PropertyUtils
for more detailed information about the mechanisms that Struts uses to access 
   properties in a general way, through Java reflection APIs.
 
  
  
  

--
To unsubscribe, e-mail:   <mailto:struts-dev-unsubscribe@;jakarta.apache.org>
For additional commands, e-mail: <mailto:struts-dev-help@;jakarta.apache.org>

cvs commit: jakarta-struts/src/share/org/apache/struts/taglib/html package.html

[jmitchell]

jmitchell2002/10/27 18:12:54

  Modified:src/share/org/apache/struts/taglib/html package.html
  Log:
  Update links.
  
  Revision  ChangesPath
  1.17  +16 -16
jakarta-struts/src/share/org/apache/struts/taglib/html/package.html
  
  Index: package.html
  ===
  RCS file: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/package.html,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- package.html  10 Oct 2002 03:13:41 -  1.16
  +++ package.html  28 Oct 2002 02:12:53 -  1.17
  @@ -44,37 +44,37 @@

   
   
  -  button
  +  button
  
  -  cancel
  +  cancel
  
  -  checkboxes
  +  checkboxes
  
  -  file
  +  file
  
  -  hidden
  +  hidden
  
  -  image
  +  image
  
  -  multibox
  +  multibox
  
  -  password
  +  password
 input fields
  -  radio
  +  radio
 buttons
  -  reset
  +  reset
 buttons
  -  select
  +  select
 lists with embedded
  -  option
  +  option
  
  -  options
  +  options
  
  -  submit
  +  submit
 buttons
  -  text
  +  text
 input fields
  -  textareas
  +  textareas
  
   
   
  
  
  

--
To unsubscribe, e-mail:   <mailto:struts-dev-unsubscribe@;jakarta.apache.org>
For additional commands, e-mail: <mailto:struts-dev-help@;jakarta.apache.org>

cvs commit: jakarta-struts/src/share/org/apache/struts/taglib/tiles ComponentConstants.java

[dgraham]

dgraham 2002/10/26 17:29:53

  Modified:src/share/org/apache/struts/taglib/tiles
ComponentConstants.java
  Log:
  changed COMPONENT_CONTEXT variable to specify full package to avoid
  collisions with application variables.
  Fixes bug #13853
  
  Revision  ChangesPath
  1.2   +4 -4  
jakarta-struts/src/share/org/apache/struts/taglib/tiles/ComponentConstants.java
  
  Index: ComponentConstants.java
  ===
  RCS file: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/tiles/ComponentConstants.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ComponentConstants.java   25 Jun 2002 03:16:30 -  1.1
  +++ ComponentConstants.java   27 Oct 2002 00:29:53 -  1.2
  @@ -72,7 +72,7 @@
   public interface ComponentConstants {
   
   /** Name used to store Tile/Component context */
  -  public static final String COMPONENT_CONTEXT = "CompContext";
  +  public static final String COMPONENT_CONTEXT = 
"org.apache.struts.taglib.tiles.CompContext";
   
 public static final intCOMPONENT_SCOPE = 8;
 public static final String LOCALE_KEY = Action.LOCALE_KEY;
  
  
  

--
To unsubscribe, e-mail:   <mailto:struts-dev-unsubscribe@;jakarta.apache.org>
For additional commands, e-mail: <mailto:struts-dev-help@;jakarta.apache.org>