dmkarr 2004/02/14 11:43:14 Modified: contrib/struts-el/doc/userGuide struts-html-el.xml contrib/struts-el/src/share/org/apache/strutsel/taglib/html ELFrameTag.java ELFrameTagBeanInfo.java ELImgTag.java ELImgTagBeanInfo.java ELLinkTag.java ELLinkTagBeanInfo.java ELRewriteTag.java ELRewriteTagBeanInfo.java Log: Adding module attribute from changes to base tags Revision Changes Path 1.29 +77 -17 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.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- struts-html-el.xml 1 Feb 2004 18:50:23 -0000 1.28 +++ struts-html-el.xml 14 Feb 2004 19:43:14 -0000 1.29 @@ -1617,6 +1617,21 @@ </info> </attribute> + <attribute> + <name>module</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + <info> + <p>Prefix name of a <code>Module</code> that + contains the action mapping for the <code>Action</code> + that is specified by the <code>action</code> attribute. + You <strong>must</strong> specify an <code>action</code> + attribute for this to have an effect.</p> + + <p><strong>Note: </strong>Use "" to map to the default module.</p> + </info> + </attribute> + <attribute> <name>anchor</name> <required>false</required> @@ -2719,23 +2734,6 @@ </info> - <attribute> - <name>action</name> - <required>false</required> - <rtexprvalue>true</rtexprvalue> - <info> - <p>The action, starting with a slash, that will render - the image to be displayed by this tag. The rendered - URL for this image will automatically prepend the context - path of this web application (in the same manner as the - <code>action</code> attribute on the link tag works), - in addition to any necessary URL rewriting. You - <strong>must</strong> specify the <code>action</code>, - <code>page</code> - attribute or the <code>src</code> attribute.</p> - </info> - </attribute> - <attribute> <name>align</name> <required>false</required> @@ -3036,6 +3034,38 @@ </info> </attribute> + <attribute> + <name>action</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + <info> + <p>The action, starting with a slash, that will render + the image to be displayed by this tag. The rendered + URL for this image will automatically prepend the context + path of this web application (in the same manner as the + <code>action</code> attribute on the link tag works), + in addition to any necessary URL rewriting. You + <strong>must</strong> specify the <code>action</code>, + <code>page</code> + attribute or the <code>src</code> attribute.</p> + </info> + </attribute> + + <attribute> + <name>module</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + <info> + <p>Prefix name of a <code>Module</code> that + contains the action mapping for the <code>Action</code> + that is specified by the <code>action</code> attribute. + You <strong>must</strong> specify an <code>action</code> + attribute for this to have an effect.</p> + + <p><strong>Note: </strong>Use "" to map to the default module.</p> + </info> + </attribute> + <attribute> <name>paramName</name> <required>false</required> @@ -3487,6 +3517,21 @@ </info> </attribute> + <attribute> + <name>module</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + <info> + <p>Prefix name of a <code>Module</code> that + contains the action mapping for the <code>Action</code> + that is specified by the <code>action</code> attribute. + You <strong>must</strong> specify an <code>action</code> + attribute for this to have an effect.</p> + + <p><strong>Note: </strong>Use "" to map to the default module.</p> + </info> + </attribute> + <attribute> <name>anchor</name> <required>false</required> @@ -5634,6 +5679,21 @@ attribute.</p> </info> </attribute> + + <attribute> + <name>module</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + <info> + <p>Prefix name of a <code>Module</code> that + contains the action mapping for the <code>Action</code> + that is specified by the <code>action</code> attribute. + You <strong>must</strong> specify an <code>action</code> + attribute for this to have an effect.</p> + + <p><strong>Note: </strong>Use "" to map to the default module.</p> + </info> + </attribute> <attribute> <name>anchor</name> 1.11 +24 -4 jakarta-struts/contrib/struts-el/src/share/org/apache/strutsel/taglib/html/ELFrameTag.java Index: ELFrameTag.java =================================================================== RCS file: /home/cvs/jakarta-struts/contrib/struts-el/src/share/org/apache/strutsel/taglib/html/ELFrameTag.java,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- ELFrameTag.java 10 Feb 2004 16:40:16 -0000 1.10 +++ ELFrameTag.java 14 Feb 2004 19:43:14 -0000 1.11 @@ -96,6 +96,11 @@ */ private String actionExpr; /** + * Instance variable mapped to "module" tag attribute. + * (Mapping set in associated BeanInfo class.) + */ + private String moduleExpr; + /** * Instance variable mapped to "anchor" tag attribute. * (Mapping set in associated BeanInfo class.) */ @@ -222,6 +227,11 @@ */ public String getActionExpr() { return (actionExpr); } /** + * Getter method for "module" tag attribute. + * (Mapping set in associated BeanInfo class.) + */ + public String getModuleExpr() { return (moduleExpr); } + /** * Getter method for "anchor" tag attribute. * (Mapping set in associated BeanInfo class.) */ @@ -348,6 +358,11 @@ */ public void setActionExpr(String actionExpr) { this.actionExpr = actionExpr; } /** + * Setter method for "module" tag attribute. + * (Mapping set in associated BeanInfo class.) + */ + public void setModuleExpr(String moduleExpr) { this.moduleExpr = moduleExpr; } + /** * Setter method for "anchor" tag attribute. * (Mapping set in associated BeanInfo class.) */ @@ -475,6 +490,7 @@ { super.release(); setActionExpr(null); + setModuleExpr(null); setAnchorExpr(null); setForwardExpr(null); setFrameborderExpr(null); @@ -525,6 +541,10 @@ if ((string = EvalHelper.evalString("action", getActionExpr(), this, pageContext)) != null) setAction(string); + + if ((string = EvalHelper.evalString("module", getModuleExpr(), + this, pageContext)) != null) + setModule(string); if ((string = EvalHelper.evalString("anchor", getAnchorExpr(), this, pageContext)) != null) 1.6 +7 -3 jakarta-struts/contrib/struts-el/src/share/org/apache/strutsel/taglib/html/ELFrameTagBeanInfo.java Index: ELFrameTagBeanInfo.java =================================================================== RCS file: /home/cvs/jakarta-struts/contrib/struts-el/src/share/org/apache/strutsel/taglib/html/ELFrameTagBeanInfo.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- ELFrameTagBeanInfo.java 23 Apr 2003 03:11:18 -0000 1.5 +++ ELFrameTagBeanInfo.java 14 Feb 2004 19:43:14 -0000 1.6 @@ -89,6 +89,10 @@ null, "setActionExpr")); } catch (IntrospectionException ex) {} try { + proplist.add(new PropertyDescriptor("module", ELFrameTag.class, + null, "setModuleExpr")); + } catch (IntrospectionException ex) {} + try { proplist.add(new PropertyDescriptor("anchor", ELFrameTag.class, null, "setAnchorExpr")); } catch (IntrospectionException ex) {} 1.13 +24 -4 jakarta-struts/contrib/struts-el/src/share/org/apache/strutsel/taglib/html/ELImgTag.java Index: ELImgTag.java =================================================================== RCS file: /home/cvs/jakarta-struts/contrib/struts-el/src/share/org/apache/strutsel/taglib/html/ELImgTag.java,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- ELImgTag.java 24 Jan 2004 18:48:17 -0000 1.12 +++ ELImgTag.java 14 Feb 2004 19:43:14 -0000 1.13 @@ -93,6 +93,11 @@ */ private String actionExpr; /** + * Instance variable mapped to "module" tag attribute. + * (Mapping set in associated BeanInfo class.) + */ + private String moduleExpr; + /** * Instance variable mapped to "align" tag attribute. * (Mapping set in associated BeanInfo class.) */ @@ -309,6 +314,11 @@ */ public String getActionExpr() { return (actionExpr); } /** + * Getter method for "module" tag attribute. + * (Mapping set in associated BeanInfo class.) + */ + public String getModuleExpr() { return (moduleExpr); } + /** * Getter method for "align" tag attribute. * (Mapping set in associated BeanInfo class.) */ @@ -525,6 +535,11 @@ */ public void setActionExpr(String actionExpr) { this.actionExpr = actionExpr; } /** + * Setter method for "module" tag attribute. + * (Mapping set in associated BeanInfo class.) + */ + public void setModuleExpr(String moduleExpr) { this.moduleExpr = moduleExpr; } + /** * Setter method for "align" tag attribute. * (Mapping set in associated BeanInfo class.) */ @@ -742,6 +757,7 @@ { super.release(); setActionExpr(null); + setModuleExpr(null); setAlignExpr(null); setAltExpr(null); setAltKeyExpr(null); @@ -809,6 +825,10 @@ if ((string = EvalHelper.evalString("action", getActionExpr(), this, pageContext)) != null) setAction(string); + + if ((string = EvalHelper.evalString("module", getModuleExpr(), + this, pageContext)) != null) + setModule(string); if ((string = EvalHelper.evalString("align", getAlignExpr(), this, pageContext)) != null) 1.7 +7 -3 jakarta-struts/contrib/struts-el/src/share/org/apache/strutsel/taglib/html/ELImgTagBeanInfo.java Index: ELImgTagBeanInfo.java =================================================================== RCS file: /home/cvs/jakarta-struts/contrib/struts-el/src/share/org/apache/strutsel/taglib/html/ELImgTagBeanInfo.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- ELImgTagBeanInfo.java 24 Jan 2004 18:48:33 -0000 1.6 +++ ELImgTagBeanInfo.java 14 Feb 2004 19:43:14 -0000 1.7 @@ -82,6 +82,10 @@ null, "setActionExpr")); } catch (IntrospectionException ex) {} try { + proplist.add(new PropertyDescriptor("module", ELImgTag.class, + null, "setModuleExpr")); + } catch (IntrospectionException ex) {} + try { proplist.add(new PropertyDescriptor("align", ELImgTag.class, null, "setAlignExpr")); } catch (IntrospectionException ex) {} 1.11 +24 -4 jakarta-struts/contrib/struts-el/src/share/org/apache/strutsel/taglib/html/ELLinkTag.java Index: ELLinkTag.java =================================================================== RCS file: /home/cvs/jakarta-struts/contrib/struts-el/src/share/org/apache/strutsel/taglib/html/ELLinkTag.java,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- ELLinkTag.java 18 Jan 2004 13:43:11 -0000 1.10 +++ ELLinkTag.java 14 Feb 2004 19:43:14 -0000 1.11 @@ -88,6 +88,11 @@ */ private String actionExpr; /** + * Instance variable mapped to "module" tag attribute. + * (Mapping set in associated BeanInfo class.) + */ + private String moduleExpr; + /** * Instance variable mapped to "anchor" tag attribute. * (Mapping set in associated BeanInfo class.) */ @@ -274,6 +279,11 @@ */ public String getActionExpr() { return (actionExpr); } /** + * Getter method for "module" tag attribute. + * (Mapping set in associated BeanInfo class.) + */ + public String getModuleExpr() { return (moduleExpr); } + /** * Getter method for "anchor" tag attribute. * (Mapping set in associated BeanInfo class.) */ @@ -460,6 +470,11 @@ */ public void setActionExpr(String actionExpr) { this.actionExpr = actionExpr; } /** + * Setter method for "module" tag attribute. + * (Mapping set in associated BeanInfo class.) + */ + public void setModuleExpr(String moduleExpr) { this.moduleExpr = moduleExpr; } + /** * Setter method for "anchor" tag attribute. * (Mapping set in associated BeanInfo class.) */ @@ -643,6 +658,7 @@ super.release(); setAccesskeyExpr(null); setActionExpr(null); + setModuleExpr(null); setAnchorExpr(null); setForwardExpr(null); setHrefExpr(null); @@ -707,6 +723,10 @@ if ((string = EvalHelper.evalString("action", getActionExpr(), this, pageContext)) != null) setAction(string); + + if ((string = EvalHelper.evalString("module", getModuleExpr(), + this, pageContext)) != null) + setModule(string); if ((string = EvalHelper.evalString("anchor", getAnchorExpr(), this, pageContext)) != null) 1.6 +7 -3 jakarta-struts/contrib/struts-el/src/share/org/apache/strutsel/taglib/html/ELLinkTagBeanInfo.java Index: ELLinkTagBeanInfo.java =================================================================== RCS file: /home/cvs/jakarta-struts/contrib/struts-el/src/share/org/apache/strutsel/taglib/html/ELLinkTagBeanInfo.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- ELLinkTagBeanInfo.java 18 Jan 2004 07:11:27 -0000 1.5 +++ ELLinkTagBeanInfo.java 14 Feb 2004 19:43:14 -0000 1.6 @@ -93,6 +93,10 @@ null, "setActionExpr")); } catch (IntrospectionException ex) {} try { + proplist.add(new PropertyDescriptor("module", ELLinkTag.class, + null, "setModuleExpr")); + } catch (IntrospectionException ex) {} + try { proplist.add(new PropertyDescriptor("anchor", ELLinkTag.class, null, "setAnchorExpr")); } catch (IntrospectionException ex) {} 1.10 +24 -4 jakarta-struts/contrib/struts-el/src/share/org/apache/strutsel/taglib/html/ELRewriteTag.java Index: ELRewriteTag.java =================================================================== RCS file: /home/cvs/jakarta-struts/contrib/struts-el/src/share/org/apache/strutsel/taglib/html/ELRewriteTag.java,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- ELRewriteTag.java 18 Jan 2004 13:43:11 -0000 1.9 +++ ELRewriteTag.java 14 Feb 2004 19:43:14 -0000 1.10 @@ -83,6 +83,11 @@ */ private String actionExpr; /** + * Instance variable mapped to "module" tag attribute. + * (Mapping set in associated BeanInfo class.) + */ + private String moduleExpr; + /** * Instance variable mapped to "anchor" tag attribute. * (Mapping set in associated BeanInfo class.) */ @@ -154,6 +159,11 @@ */ public String getActionExpr() { return (actionExpr); } /** + * Getter method for "module" tag attribute. + * (Mapping set in associated BeanInfo class.) + */ + public String getModuleExpr() { return (moduleExpr); } + /** * Getter method for "anchor" tag attribute. * (Mapping set in associated BeanInfo class.) */ @@ -225,6 +235,11 @@ */ public void setActionExpr(String actionExpr) { this.actionExpr = actionExpr; } /** + * Setter method for "module" tag attribute. + * (Mapping set in associated BeanInfo class.) + */ + public void setModuleExpr(String moduleExpr) { this.moduleExpr = moduleExpr; } + /** * Setter method for "anchor" tag attribute. * (Mapping set in associated BeanInfo class.) */ @@ -297,6 +312,7 @@ { super.release(); setActionExpr(null); + setModuleExpr(null); setAnchorExpr(null); setForwardExpr(null); setHrefExpr(null); @@ -335,6 +351,10 @@ if ((string = EvalHelper.evalString("action", getActionExpr(), this, pageContext)) != null) setAction(string); + + if ((string = EvalHelper.evalString("module", getModuleExpr(), + this, pageContext)) != null) + setModule(string); if ((string = EvalHelper.evalString("anchor", getAnchorExpr(), this, pageContext)) != null) 1.6 +7 -3 jakarta-struts/contrib/struts-el/src/share/org/apache/strutsel/taglib/html/ELRewriteTagBeanInfo.java Index: ELRewriteTagBeanInfo.java =================================================================== RCS file: /home/cvs/jakarta-struts/contrib/struts-el/src/share/org/apache/strutsel/taglib/html/ELRewriteTagBeanInfo.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- ELRewriteTagBeanInfo.java 18 Jan 2004 07:11:27 -0000 1.5 +++ ELRewriteTagBeanInfo.java 14 Feb 2004 19:43:14 -0000 1.6 @@ -89,6 +89,10 @@ null, "setActionExpr")); } catch (IntrospectionException ex) {} try { + proplist.add(new PropertyDescriptor("module", ELRewriteTag.class, + null, "setModuleExpr")); + } catch (IntrospectionException ex) {} + try { proplist.add(new PropertyDescriptor("anchor", ELRewriteTag.class, null, "setAnchorExpr")); } catch (IntrospectionException ex) {}
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]