The tree is tagged for Beta 1

[Martin Cooper]

FYI, the CVS tree has been tagged for the Beta 1 release. It may be a day,
or perhaps more, until I can push the official notice out, which is why I'm
letting struts-dev know in advance.

--
Martin Cooper



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

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

[arron]

arron   02/03/13 05:13:28

  Modified:src/share/org/apache/struts/taglib/nested
NestedPropertyHelper.java NestedPropertyTag.java
NestedRootTag.java
   src/share/org/apache/struts/taglib/nested/html
NestedFormTag.java
   src/share/org/apache/struts/taglib/nested/logic
NestedIterateTag.java
  Added:   src/share/org/apache/struts/taglib/nested
NestedReference.java
  Log:
  Allowing the details of a nested structure to be maintained through to a dynamicly 
included JSP.
  
  Revision  ChangesPath
  1.6   +35 -6 
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.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- NestedPropertyHelper.java 12 Feb 2002 07:01:57 -  1.5
  +++ NestedPropertyHelper.java 13 Mar 2002 13:13:28 -  1.6
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/nested/NestedPropertyHelper.java,v
 1.5 2002/02/12 07:01:57 arron Exp $
  - * $Revision: 1.5 $
  - * $Date: 2002/02/12 07:01:57 $
  + * $Header: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/nested/NestedPropertyHelper.java,v
 1.6 2002/03/13 13:13:28 arron Exp $
  + * $Revision: 1.6 $
  + * $Date: 2002/03/13 13:13:28 $
* 
*
* The Apache Software License, Version 1.1
  @@ -62,6 +62,7 @@
   import java.util.StringTokenizer;
   import javax.servlet.jsp.*;
   import javax.servlet.jsp.tagext.*;
  +import javax.servlet.http.HttpSession;
   import org.apache.struts.taglib.nested.html.*;
   import org.apache.struts.taglib.nested.logic.*;
   import org.apache.struts.taglib.html.FormTag;
  @@ -76,10 +77,35 @@
*
* @author Arron Bates
* @since Struts 1.1
  - * @version $Revision: 1.5 $ $Date: 2002/02/12 07:01:57 $
  + * @version $Revision: 1.6 $ $Date: 2002/03/13 13:13:28 $
*/ 
   public class NestedPropertyHelper {
 
  +  /* key that the tags can rely on to set the details against */
  +  public static final String NESTED_INCLUDES_KEY = "";
  +  
  +  /** Sets the passed reference to the session object, and returns any reference
  +   * that was already there
  +   * @param session User's session object
  +   * @param reference New reference to put into the session
  +   */
  +  public static final NestedReference setIncludeReference(HttpSession session,
  +  NestedReference reference) {
  +/* get the old one if any */
  +NestedReference nr = (NestedReference)
  +session.getAttribute(NESTED_INCLUDES_KEY);
  +if (reference != null) {
  +  /* put in the new one */
  +  session.setAttribute(NESTED_INCLUDES_KEY, reference);
  +} else {
  +  /* null target, just remove it */
  +  session.removeAttribute(NESTED_INCLUDES_KEY);
  +}
  +/* return the old */
  +return nr;
  +  }
  +  
  +  
 
 /** 
  * The working horse method.
  @@ -128,8 +154,7 @@
 public static String getNestedProperty(String property, Tag parentTag) {
   
   /* if we're just under a root tag no work required */
  -if ((parentTag instanceof NestedRootTag)
  -|| (parentTag instanceof FormTag)) {
  +if (parentTag instanceof FormTag) {
 /* don't forget to take care of the relative properties */
 if (property.indexOf('/') == -1) {
   return property;
  @@ -151,6 +176,10 @@
 property = getRelativeProperty(property,nestedParent.getNestedProperty());
   }
   
  +/* Some properties may be at the start of their hierarchy */
  +if (property.startsWith(".")) {
  +  return property.substring(1, property.length());
  +}
   return property;
 }
 
  
  
  
  1.3   +21 -4 
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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- NestedPropertyTag.java22 Jan 2002 03:30:50 -  1.2
  +++ NestedPropertyTag.java13 Mar 2002 13:13:28 -  1.3
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/nested/NestedPropertyTag.java,v
 1.2 2002/01/22 03:30:50 arron Exp $
  - * $Revision: 1.2 $
  - * $Date: 2002/01/22 03:30:50 $
  + * $Header: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/nested/NestedPropertyTag.java,v
 1.3 2002/03/13 13:13:28 a

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

[arron]

arron   02/03/13 05:15:37

  Modified:doc/userGuide struts-nested.xml
  Log:
  Docco on dynamic includes and the use of the root tag.
  
  Revision  ChangesPath
  1.3   +16 -1 jakarta-struts/doc/userGuide/struts-nested.xml
  
  Index: struts-nested.xml
  ===
  RCS file: /home/cvs/jakarta-struts/doc/userGuide/struts-nested.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- struts-nested.xml 24 Feb 2002 17:19:39 -  1.2
  +++ struts-nested.xml 13 Mar 2002 13:15:37 -  1.3
  @@ -131,10 +131,25 @@
   means). For example you can load a bean for use with the
   jsp:useBean tag.
 
  +  
  +The tag can also be used without specifying the name
  +attribute, but this is only in the case that the current JSP is a
  +dynamic include specified in another file. You will not be able to run
  +the tag without a name unless this inclusion is in place. Otherwise
  +the nested tags will not have the bean and property references that they
  +need to provide their logic.
  +  
  +  
  +Note: The acess to a bean via the name
  +attribute takes priority over looking for the reference from other
  +parent tags. So if a name is specified, a bean will have to be there
  +waiting for it. It was made this way so that you could use separate
  +beans within a JSP that itself is an inclusion into another.
  +  
   
   
 name
  -  true
  +  false
 true
 
   The name of the bean by which all child nested tags will derive their
  
  
  

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

[Patch] DynaActionFormClass.

[Porter, Roy]

>From introspect method in DynaActionFormClass

 if (DynaActionForm.class.isAssignableFrom(beanClass)) {

this should be 

 if (!DynaActionForm.class.isAssignableFrom(beanClass)) {

I raised this a couple of weeks ago (the whole line was the other way round
then). I was ignored  

It was raised again by somebody else last week, but there's still a problem
with the latest version on CVS, i.e. the ! is missing.

Can somebody please put this right ?


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

FormTag problem with VisualAge

[Porter, Roy]

Whenever I get a new copy of the Struts Source, I have to go in and make the
following change to the FormTag java code:


>From doEndTag:

Remove:
pageContext.removeAttribute(Constants.BEAN_KEY,
PageContext.REQUEST_SCOPE);
pageContext.removeAttribute(Constants.FORM_KEY,
PageContext.REQUEST_SCOPE);
Add: 
pageContext.getRequest().removeAttribute(Constants.BEAN_KEY);
pageContext.getRequest().removeAttribute(Constants.FORM_KEY);

I realise this is probably only affecting VisualAge (& possibly WebSphere
?), but could this change be made to the base code ?

Roy.

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

Humorous error when running nightly build of struts-example

[Matt Raible]

java.lang.IllegalArgumentException: Class
'org.apache.struts.action.DynaActionForm' is not a subclas
s of 'org.apache.struts.action.DynaActionForm'

I couldn't resist sharing this.

Matt


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

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

[craigmcc]

craigmcc02/03/13 10:10:40

  Modified:src/share/org/apache/struts/action DynaActionFormClass.java
  Log:
  Correct the state of the "instance of" test -- Martin, you'll want to include
  this in the b1 tag.  I botched it in fixing a bug report that had the
  previous test backwards anyway :-(.
  
  Revision  ChangesPath
  1.5   +5 -5  
jakarta-struts/src/share/org/apache/struts/action/DynaActionFormClass.java
  
  Index: DynaActionFormClass.java
  ===
  RCS file: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/action/DynaActionFormClass.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- DynaActionFormClass.java  10 Mar 2002 01:55:49 -  1.4
  +++ DynaActionFormClass.java  13 Mar 2002 18:10:40 -  1.5
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/action/DynaActionFormClass.java,v 
1.4 2002/03/10 01:55:49 craigmcc Exp $
  - * $Revision: 1.4 $
  - * $Date: 2002/03/10 01:55:49 $
  + * $Header: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/action/DynaActionFormClass.java,v 
1.5 2002/03/13 18:10:40 craigmcc Exp $
  + * $Revision: 1.5 $
  + * $Date: 2002/03/13 18:10:40 $
*
* 
*
  @@ -83,7 +83,7 @@
* to consult this documentation.
*
* @author Craig McClanahan
  - * @version $Revision: 1.4 $ $Date: 2002/03/10 01:55:49 $
  + * @version $Revision: 1.5 $ $Date: 2002/03/13 18:10:40 $
* @since Struts 1.1
*/
   
  @@ -323,7 +323,7 @@
   ("Cannot instantiate ActionFormBean class '" +
config.getType() + "': " + t);
   }
  -if (DynaActionForm.class.isAssignableFrom(beanClass)) {
  +if (!DynaActionForm.class.isAssignableFrom(beanClass)) {
   throw new IllegalArgumentException
   ("Class '" + config.getType() + "' is not a subclass of " +
"'org.apache.struts.action.DynaActionForm'");
  
  
  

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

Re: [Patch] DynaActionFormClass.

[Craig R. McClanahan]

Yarg, I botched this when fixing a Bugzilla bug against the old
"assignable from" test that didn't really allow subclassing.

I just checked in this fix.  Martin, you'll really want to update the
beta1 tag to include it -- otherwise DynaActionForms (including the login
page of the struts example) won't work.

This is also the cause of the humorous self-contradictory error message
that Matt pointed out.

Craig

On Wed, 13 Mar 2002, Porter, Roy wrote:

> Date: Wed, 13 Mar 2002 15:12:51 -
> From: "Porter, Roy" <[EMAIL PROTECTED]>
> Reply-To: Struts Developers List <[EMAIL PROTECTED]>
> To: 'Struts Developers List' <[EMAIL PROTECTED]>
> Subject: [Patch] DynaActionFormClass.
>
> >From introspect method in DynaActionFormClass
>
>  if (DynaActionForm.class.isAssignableFrom(beanClass)) {
>
> this should be
>
>  if (!DynaActionForm.class.isAssignableFrom(beanClass)) {
>
> I raised this a couple of weeks ago (the whole line was the other way round
> then). I was ignored 
>
> It was raised again by somebody else last week, but there's still a problem
> with the latest version on CVS, i.e. the ! is missing.
>
> Can somebody please put this right ?
>
>
> --
> To unsubscribe, e-mail:   
> For additional commands, e-mail: 
>
>


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

Re: FormTag problem with VisualAge

[Craig R. McClanahan]

On Wed, 13 Mar 2002, Porter, Roy wrote:

> Date: Wed, 13 Mar 2002 15:24:07 -
> From: "Porter, Roy" <[EMAIL PROTECTED]>
> Reply-To: Struts Developers List <[EMAIL PROTECTED]>
> To: 'Struts Developers List' <[EMAIL PROTECTED]>
> Subject: FormTag problem with VisualAge
>
> Whenever I get a new copy of the Struts Source, I have to go in and make the
> following change to the FormTag java code:
>
>
> >From doEndTag:
>
> Remove:
>   pageContext.removeAttribute(Constants.BEAN_KEY,
> PageContext.REQUEST_SCOPE);
>   pageContext.removeAttribute(Constants.FORM_KEY,
> PageContext.REQUEST_SCOPE);
> Add:
>   pageContext.getRequest().removeAttribute(Constants.BEAN_KEY);
>   pageContext.getRequest().removeAttribute(Constants.FORM_KEY);
>
> I realise this is probably only affecting VisualAge (& possibly WebSphere
> ?), but could this change be made to the base code ?
>

I'm a little hesitant to do this, because the JSP spec does *not* require
that they do exactly the same thing.  It's legal for a container to cache
the current state of the attributes and then sync up at certain defined
points.

To be fair, the JSP code that WebSphere is using for this originally came
from a bug in Tomcat 3.0, which incorrectly disallowed removing attributes
from request scope.  That was more than a couple of years ago, though;
it's really time for IBM to have fixed this by now.

> Roy.
>

Craig


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

Question about design migration to struts

[Heath Chiavettone]

Hello,

 

I hope this is the correct forum for this.  I wanted to get the
opinion/knowledge of the struts contributors on this one.  If it isn't go
ahead and move it to the struts-users list.  I am investigating porting an
existing Model 1+ JSP implementation to Struts and Model 2.  I call it Model
1+ because our application was based on the template design pattern
described in this article
(http://www.javaworld.com/javaworld/jw-01-2001/jw-0119-jspframe_p.html
 ).
We expanded the pattern significantly in our application, substituting
custom tags for "included javascript" methods described in the article.  The
essence of the design is that each JSP is mated to a JavaBean.  The java
bean contains the data, and all business logic.  After the bean is
initialized on the JSP page (this involves giving the bean access to the
request and response)and the  tag is performed for the
bean, the bean's process method is triggered through another custom tag,
which wraps the JSPs' actual html output.  This method triggers the data
initialization or validation and business processing logic (based on display
or form submit) and then based on the data, redisplays itself or redirects
to the appropriate JSP.  So in a sense, we mostly need to carve up our JSP
beans into ActionForm and Action objects, do some cleanup, set up the
struts-config.xml, and use the struts tags in our JSPs.

 

Where I'm having trouble is related to a decision we made regarding how we
handle "component" jsps.  What I mean by this is in many cases we have
encapsulated reusable components within our application as their own
separate Model 1+ JSPs, and dynamically include them into parent JSPs where
necessary.  To support this, I extended our pattern to understand this
parent/child, container/component concept.  As a result, the parent is able
to validate the data of the component JSP, without having to "include" that
component.  Another factor I'm dealing with is the fact that we sometimes
nest these components several layers deep.

 

I believe that re-factoring our JSP/JavaBean into Struts, while a bit of
work, seems to be the right approach.  My only problem is trying to figure
out what to do with our component JSPs.  In an ideal world I could just
re-factor them the same way and use them as I am now.  But I don't think
that is the case.  My next thoughts were to have my parent JSP's ActionForm
objects contain the ActionForms of the components it uses, and the Action
trigger the components Actions.  But I don't think Struts would nest the
property settings into these contained forms (am I wrong?).  I would then
use Arron Bates' Nested tags to access the contained ActionForm objects of
the parent within the component JSPs.  I recognize that this hard-codes the
JSP component hierarchy into the Actions and the ActionForms, but I'm
willing to live with that in the short run until I can figure out how to
move it out into some XML configuration file (perhaps struts-config?).

 

So now for my questions:

 

1.  Will struts nest the property setting into an ActionForm if it
detects a property that IS an ActionForm?
2.  Has anyone else dealt with this kind of problem before?
3.  If so, do you have any suggestions for an alternative?
4.  Is it possible for me to extend the struts-config.xml DTD to allow
the definition of nested ActionForm/Action?
5.  Is this something that would be considered useful for the mainstream
struts world?

 

Thanks for you consideration and help...

 

Heath Chiavettone.

request time attribute value for name attribute in tiles put tag

[Chris Cool]

Is there any reason why the name attribute of tiles put tag _cannot_ be
evaluated at runtime? Currently, "rtexprvalue=false" for the name attribute.
I changed it in my sandbox and it appeared to work properly.

Thanks,

Chris

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

Proposal for Struts Validator

[David Winterfeldt]

This may be a bit late since we are in beta, but I
have some time to work on this now.  If everyone else
thinks this is worth adding, we can do so.

Here is a list of things I would like to get in for
1.1.

1. Clean up any javadoc comments and package.html.
2. Enhance documentation
3. Deprecate ValidatorServlet and use the plugin
mechanism Craig added to initialize the
ValidatorResources to be stored in application scope.
4. Create DynaValidatorActionForm

This falls into bug fixes for beta, but I have some
bug fixes that people e-mailed me that I haven't had
time to test and apply.  I will do that before final
release of course.

This was brought up a little bit ago, but after I do
the above or during the process of doing the above I
would like to move Validator source from the contrib
directory to the main source still.  I think it would
be a nice thing for the v1.1 release and then we could
get rid of that folder of the contrib directory.

I also want to get the Commons Validator in shape for
a version 1.0 release possibly sometime around the
Struts 1.1 release so Struts 1.1 users have a stable
release of the Commons Validator to use with it.

David

__
Do You Yahoo!?
Try FREE Yahoo! Mail - the world's greatest free email!
http://mail.yahoo.com/

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

DO NOT REPLY [Bug 7097] New: - when bean has null value for PresentTag exception is saved, even though value is cleared

[bugzilla]

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG 
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND 
INSERTED IN THE BUG DATABASE.

http://nagoya.apache.org/bugzilla/show_bug.cgi?id=7097

when bean has null value for PresentTag exception is saved, even though value is 
cleared

   Summary: when bean has null value for PresentTag exception is
saved, even though value is cleared
   Product: Struts
   Version: 1.0.2 Final
  Platform: Other
OS/Version: Other
Status: NEW
  Severity: Normal
  Priority: Other
 Component: Custom Tags
AssignedTo: [EMAIL PROTECTED]
ReportedBy: [EMAIL PROTECTED]


Here is my jsp example:
  
  Could not locate reason for error.
  

  
  An Error Occurred:
  

Granted this is probably not the correct use of finding errors,
it does illustrate one problem.

  In the first notPresent tag, the bean is checked for, but not
found.  However, in the process of checking for the bean (via
'RequestUtils.lookup()' an exception is throw and saved).  Now
when I meet the following Present tag, the bean does have a value,
namely the exception that was saved.

Here is the code (around line 141) of PresentTag.java

try {
value =
RequestUtils.lookup(pageContext, name, property, scope);
} catch (JspException e) {
value = null;
}

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

DO NOT REPLY [Bug 7097] - when bean has null value for PresentTag exception is saved, even though value is cleared

[bugzilla]

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG 
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND 
INSERTED IN THE BUG DATABASE.

http://nagoya.apache.org/bugzilla/show_bug.cgi?id=7097

when bean has null value for PresentTag exception is saved, even though value is 
cleared





--- Additional Comments From [EMAIL PROTECTED]  2002-03-13 21:24 ---
ooops...hit the committ button by accident...

Like I was saying, value is set to 'null', but shouldn't
the savedException be cleared as well?  It's not really
an exception that should be saved because the tag did not
behave according contract.  It's the utility method
(i.e RequestUtil.lookup()) that does not behave according
to contract...but this exception is trapped...so it
should not be saved.

I don't have a patch for this at this time, but I'll try
to get one in when I get a chance.

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

Re: FormTag problem with VisualAge

[Colin Sharples]

> To be fair, the JSP code that WebSphere is using for this originally came
> from a bug in Tomcat 3.0, which incorrectly disallowed removing
attributes
> from request scope.  That was more than a couple of years ago, though;
> it's really time for IBM to have fixed this by now.

It *is* fixed. Problem number PQ49754, fixed in WAS 3.5 FixPack 5, and
AFAIK in WAS 4.0.

Regards

Colin M Sharples
I/T Architect
IBM Global Services New Zealand

email: [EMAIL PROTECTED]
phone: 64-4-5769853
mobile: 64-21-402085
fax: 64-4-5765616



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

DO NOT REPLY [Bug 7103] New: - digester parsing error in struts-config.xml contained in struts-tiles

[bugzilla]

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG 
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND 
INSERTED IN THE BUG DATABASE.

http://nagoya.apache.org/bugzilla/show_bug.cgi?id=7103

digester parsing error in struts-config.xml contained in struts-tiles

   Summary: digester parsing error in struts-config.xml contained in
struts-tiles
   Product: Struts
   Version: Nightly Build
  Platform: Other
OS/Version: Other
Status: NEW
  Severity: Normal
  Priority: Other
 Component: Example
AssignedTo: [EMAIL PROTECTED]
ReportedBy: [EMAIL PROTECTED]


The entry in the struts-config.xml is:



This causes a digester parsing error because the file does not match the DTD.  
http://jakarta.apache.org/struts/dtds/struts-config_1_1.dtd.

The entry should be:


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

cvs commit: jakarta-struts/web/upload/WEB-INF struts-config.xml

[craigmcc]

craigmcc02/03/13 16:33:04

  Modified:web/upload/WEB-INF struts-config.xml
  Log:
  Modify the order of the elements in struts-config.xml to match the DTD.
  
  Revision  ChangesPath
  1.5   +6 -4  jakarta-struts/web/upload/WEB-INF/struts-config.xml
  
  Index: struts-config.xml
  ===
  RCS file: /home/cvs/jakarta-struts/web/upload/WEB-INF/struts-config.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- struts-config.xml 6 Mar 2002 19:39:09 -   1.4
  +++ struts-config.xml 14 Mar 2002 00:33:04 -  1.5
  @@ -7,10 +7,6 @@
   
   
   
  -  
  -  
  -
 
   
  @@ -26,4 +22,10 @@
  
   
 
  +
  +  
  +  
  +
   
  
  
  

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

cvs commit: jakarta-struts/contrib/tiles/web/doc/WEB-INF struts-config.xml

[martinc]

martinc 02/03/13 21:17:41

  Modified:contrib/tiles/web/doc/WEB-INF struts-config.xml
  Log:
  Fix the name of the message resources element.
  
  PR: 7103
  Submitted by: Steve Wilkinson
  
  Revision  ChangesPath
  1.7   +3 -3  jakarta-struts/contrib/tiles/web/doc/WEB-INF/struts-config.xml
  
  Index: struts-config.xml
  ===
  RCS file: /home/cvs/jakarta-struts/contrib/tiles/web/doc/WEB-INF/struts-config.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- struts-config.xml 18 Feb 2002 14:48:40 -  1.6
  +++ struts-config.xml 14 Mar 2002 05:17:40 -  1.7
  @@ -214,9 +214,9 @@
 
 
 
  -  
  +  
 
  -  
  -  
  +  
  +  
   
   
  
  
  

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

DO NOT REPLY [Bug 7103] - digester parsing error in struts-config.xml contained in struts-tiles

[bugzilla]

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG 
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
<http://nagoya.apache.org/bugzilla/show_bug.cgi?id=7103>.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND 
INSERTED IN THE BUG DATABASE.

http://nagoya.apache.org/bugzilla/show_bug.cgi?id=7103

digester parsing error in struts-config.xml contained in struts-tiles

[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED



--- Additional Comments From [EMAIL PROTECTED]  2002-03-14 05:18 ---
Fixed in 20020313 nightly build. Will be fixed in Struts 1.1 Beta 1.

--
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/action DynaActionFormClass.java

[Martin Cooper]

OK, I've picked up this change for Beta 1. I've also picked up your later
commit, fixing a config file problem, and one of my own, fixing a similar
problem. It's not a good sign to release a beta in which we don't have our
own example config files right. ;-)

--
Martin Cooper


- Original Message -
From: <[EMAIL PROTECTED]>
To: <[EMAIL PROTECTED]>
Sent: Wednesday, March 13, 2002 10:10 AM
Subject: cvs commit: jakarta-struts/src/share/org/apache/struts/action
DynaActionFormClass.java


> craigmcc02/03/13 10:10:40
>
>   Modified:src/share/org/apache/struts/action DynaActionFormClass.java
>   Log:
>   Correct the state of the "instance of" test -- Martin, you'll want to
include
>   this in the b1 tag.  I botched it in fixing a bug report that had the
>   previous test backwards anyway :-(.
>
>   Revision  ChangesPath
>   1.5   +5 -5
jakarta-struts/src/share/org/apache/struts/action/DynaActionFormClass.java
>
>   Index: DynaActionFormClass.java
>   ===
>   RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/action/DynaActionFormCl
ass.java,v
>   retrieving revision 1.4
>   retrieving revision 1.5
>   diff -u -r1.4 -r1.5
>   --- DynaActionFormClass.java 10 Mar 2002 01:55:49 - 1.4
>   +++ DynaActionFormClass.java 13 Mar 2002 18:10:40 - 1.5
>   @@ -1,7 +1,7 @@
>/*
>   - * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/action/DynaActionFormCl
ass.java,v 1.4 2002/03/10 01:55:49 craigmcc Exp $
>   - * $Revision: 1.4 $
>   - * $Date: 2002/03/10 01:55:49 $
>   + * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/action/DynaActionFormCl
ass.java,v 1.5 2002/03/13 18:10:40 craigmcc Exp $
>   + * $Revision: 1.5 $
>   + * $Date: 2002/03/13 18:10:40 $
> *
> * 
> *
>   @@ -83,7 +83,7 @@
> * to consult this documentation.
> *
> * @author Craig McClanahan
>   - * @version $Revision: 1.4 $ $Date: 2002/03/10 01:55:49 $
>   + * @version $Revision: 1.5 $ $Date: 2002/03/13 18:10:40 $
> * @since Struts 1.1
> */
>
>   @@ -323,7 +323,7 @@
>("Cannot instantiate ActionFormBean class '" +
> config.getType() + "': " + t);
>}
>   -if (DynaActionForm.class.isAssignableFrom(beanClass)) {
>   +if (!DynaActionForm.class.isAssignableFrom(beanClass)) {
>throw new IllegalArgumentException
>("Class '" + config.getType() + "' is not a subclass of
" +
> "'org.apache.struts.action.DynaActionForm'");
>
>
>
>
> --
> To unsubscribe, e-mail:

> For additional commands, e-mail:

>


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

cvs commit: jakarta-struts/web/example/WEB-INF struts-config.xml

[craigmcc]

craigmcc02/03/13 22:15:55

  Modified:src/share/org/apache/struts/action ActionServlet.java
   src/share/org/apache/struts/util GenericDataSource.java
   web/example/WEB-INF struts-config.xml
  Removed: src/share/org/apache/struts/util GenericConnection.java
  Log:
  For the HEAD branch, make o.a.s.util.GenericDataSource a wrapper around the
  connection pool from the Commons DBCP package.  Among other things, this
  eliminates the only problem that prevents Struts 1.1 from compiling under
  JDK 1.4.
  
  Revision  ChangesPath
  1.97  +5 -5  
jakarta-struts/src/share/org/apache/struts/action/ActionServlet.java
  
  Index: ActionServlet.java
  ===
  RCS file: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/action/ActionServlet.java,v
  retrieving revision 1.96
  retrieving revision 1.97
  diff -u -r1.96 -r1.97
  --- ActionServlet.java10 Mar 2002 01:23:29 -  1.96
  +++ ActionServlet.java14 Mar 2002 06:15:55 -  1.97
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/action/ActionServlet.java,v 1.96 
2002/03/10 01:23:29 craigmcc Exp $
  - * $Revision: 1.96 $
  - * $Date: 2002/03/10 01:23:29 $
  + * $Header: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/action/ActionServlet.java,v 1.97 
2002/03/14 06:15:55 craigmcc Exp $
  + * $Revision: 1.97 $
  + * $Date: 2002/03/14 06:15:55 $
*
* 
*
  @@ -269,7 +269,7 @@
*
* @author Craig R. McClanahan
* @author Ted Husted
  - * @version $Revision: 1.96 $ $Date: 2002/03/10 01:23:29 $
  + * @version $Revision: 1.97 $ $Date: 2002/03/14 06:15:55 $
*/
   
   public class ActionServlet
  @@ -840,10 +840,10 @@
   ds = (DataSource)
   RequestUtils.applicationInstance(dscs[i].getType());
   BeanUtils.populate(ds, dscs[i].getProperties());
  -ds.setLogWriter(scw);
   if (ds instanceof GenericDataSource) {
   ((GenericDataSource) ds).open();
   }
  +ds.setLogWriter(scw);
   } catch (Throwable t) {
   log.error(internal.getMessage
   ("dataSource.init", dscs[i].getKey()), t);
  
  
  
  1.12  +86 -555   
jakarta-struts/src/share/org/apache/struts/util/GenericDataSource.java
  
  Index: GenericDataSource.java
  ===
  RCS file: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/util/GenericDataSource.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- GenericDataSource.java10 Mar 2002 01:23:30 -  1.11
  +++ GenericDataSource.java14 Mar 2002 06:15:55 -  1.12
  @@ -1,13 +1,13 @@
   /*
  - * $Header: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/util/GenericDataSource.java,v 
1.11 2002/03/10 01:23:30 craigmcc Exp $
  - * $Revision: 1.11 $
  - * $Date: 2002/03/10 01:23:30 $
  + * $Header: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/util/GenericDataSource.java,v 
1.12 2002/03/14 06:15:55 craigmcc Exp $
  + * $Revision: 1.12 $
  + * $Date: 2002/03/14 06:15:55 $
*
* 
*
* The Apache Software License, Version 1.1
*
  - * Copyright (c) 1999-2001 The Apache Software Foundation.  All rights
  + * Copyright (c) 1999-2002 The Apache Software Foundation.  All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
  @@ -65,155 +65,36 @@
   
   import java.io.PrintWriter;
   import java.sql.Connection;
  -import java.sql.Driver;
  -import java.sql.ResultSet;
   import java.sql.SQLException;
  -import java.sql.Statement;
  -import java.util.LinkedList;
  -import java.util.Properties;
   import javax.sql.DataSource;
  +import org.apache.commons.dbcp.BasicDataSource;
   import org.apache.commons.logging.Log;
   import org.apache.commons.logging.LogFactory;
   
   
   /**
  - * Generic data source implementation of the DataSource
  - * interface.  WARNING - This implementation does not know how to
  - * provide connections with different username/password combinations.
  - * Calling this version of the implementation using the
  - * getConnection(username,password) signature will throw an exception.
  - *
  - * The following properties are supported by the standard
  - * GenericDataSource implementation:
  - * 
  - * 
  - *   Property
  - *   Description
  - * 
  - * 
  - *   autoCommit
  - *   Set to true if you want the connections returned to you
  - *   by calling getConnection() to be configured in
  - *   "auto-commit after every statement" mode.  The default value is
  - *   true, to conform to JDBC standard conventions.
  - * 
  - *