cvs commit: ant/docs/manual/CoreTasks macrodef.html

2005-04-21 Thread peterreilly 
peterreilly2005/04/21 02:52:05

  Modified:docs/manual/CoreTasks macrodef.html
  Log:
  typeo
  
  Revision  ChangesPath
  1.26  +1 -1  ant/docs/manual/CoreTasks/macrodef.html
  
  Index: macrodef.html
  ===
  RCS file: /home/cvs/ant/docs/manual/CoreTasks/macrodef.html,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- macrodef.html 21 Apr 2005 09:49:55 -  1.25
  +++ macrodef.html 21 Apr 2005 09:52:05 -  1.26
  @@ -55,7 +55,7 @@
   td valign=top
 This controls the error traceback if they is an
 error detected when running the macro. If this is
  -  set to true, there will be an erro trackback, if false
  +  set to true, there will be an error trackback, if false
 there will not be one. The default value is true.
 emSince ant 1.7/em.
   /td
  
  
  

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

cvs commit: ant/docs/manual/CoreTasks macrodef.html

2005-03-23 Thread mbenson 
mbenson 2005/03/23 10:48:59

  Modified:docs/manual/CoreTasks macrodef.html
  Log:
  Remove bad slashes in final example.
  
  Revision  ChangesPath
  1.24  +2 -2  ant/docs/manual/CoreTasks/macrodef.html
  
  Index: macrodef.html
  ===
  RCS file: /home/cvs/ant/docs/manual/CoreTasks/macrodef.html,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- macrodef.html 7 Mar 2005 18:09:09 -   1.23
  +++ macrodef.html 23 Mar 2005 18:48:59 -  1.24
  @@ -333,13 +333,13 @@
   /p
   blockquote
   pre class=code
  -lt;macrodef name=test/gt;
  +lt;macrodef name=testgt;
  lt;attribute name=one/gt; b*1/b
  lt;attribute name=two default=@{one}/gt;b*2/b
  lt;sequentialgt;
 lt;echogt;[EMAIL PROTECTED]   [EMAIL PROTECTED]lt;/echogt;
  lt;/sequentialgt;
  -lt;/macrodef/gt;
  +lt;/macrodefgt;
   lt;test one=test/gt;
   /pre
   /blockquote
  
  
  

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

cvs commit: ant/docs/manual/CoreTasks macrodef.html

2005-03-23 Thread mbenson 
mbenson 2005/03/23 10:50:38

  Modified:docs/manual/CoreTasks Tag: ANT_16_BRANCH macrodef.html
  Log:
  Merge
  
  Revision  ChangesPath
  No   revision
  No   revision
  1.2.2.22  +3 -3  ant/docs/manual/CoreTasks/macrodef.html
  
  Index: macrodef.html
  ===
  RCS file: /home/cvs/ant/docs/manual/CoreTasks/macrodef.html,v
  retrieving revision 1.2.2.21
  retrieving revision 1.2.2.22
  diff -u -r1.2.2.21 -r1.2.2.22
  --- macrodef.html 19 Nov 2004 09:10:00 -  1.2.2.21
  +++ macrodef.html 23 Mar 2005 18:50:38 -  1.2.2.22
  @@ -332,18 +332,18 @@
   /p
   blockquote
   pre class=code
  -lt;macrodef name=test/gt;
  +lt;macrodef name=testgt;
  lt;attribute name=one/gt; b*1/b
  lt;attribute name=two default=@{one}/gt;b*2/b
  lt;sequentialgt;
 lt;echogt;[EMAIL PROTECTED]   [EMAIL PROTECTED]lt;/echogt;
  lt;/sequentialgt;
  -lt;/macrodef/gt;
  +lt;/macrodefgt;
   lt;test one=test/gt;
   /pre
   /blockquote
   hr
  -p align=centerCopyright copy; 2003-2004 The Apache Software
  +p align=centerCopyright copy; 2003-2005 The Apache Software
   Foundation. All rights Reserved./p
   
   /body
  
  
  

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

cvs commit: ant/docs/manual/CoreTasks macrodef.html

2004-05-26 Thread peterreilly 
peterreilly2004/05/26 05:25:20

  Modified:docs/manual/CoreTasks macrodef.html
  Log:
  macrodef manual page: the text element was described twice
   also the element name description was a little confusing
  
  Revision  ChangesPath
  1.20  +1 -49 ant/docs/manual/CoreTasks/macrodef.html
  
  Index: macrodef.html
  ===
  RCS file: /home/cvs/ant/docs/manual/CoreTasks/macrodef.html,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- macrodef.html 7 May 2004 18:00:43 -   1.19
  +++ macrodef.html 26 May 2004 12:25:20 -  1.20
  @@ -119,7 +119,7 @@
 /tr
 tr
   td valign=topname/td
  -td valign=topThe name of the new attribute/td
  +td valign=topThe name of the element/td
   td valign=top align=centerYes/td
 /tr
 tr
  @@ -137,54 +137,6 @@
 This contains a description
 informing the user what the contents of the element are expected 
to be.
 emsince ant 1.6.1/em
  -/td
  -td valign=top align=centerNo/td
  -  /tr
  -/table
  -h4text/h4
  -p
  -  This is used to specify the treatment of text contents of the macrodef.
  -  If this element is not present, then any nested text in the macro
  -  will be an error. If the text element is present, then the name
  -  becomes an attribute that gets set to the nested text of the macro.
  -  emSince ant 1.6.1./em
  -/p
  -p
  -  The case of the text name is ignored.
  -/p
  -h3Parameters/h3
  -table border=1 cellpadding=2 cellspacing=0
  -  tr
  -td valign=topbAttribute/b/td
  -td valign=topbDescription/b/td
  -td align=center valign=topbRequired/b/td
  -  /tr
  -  tr
  -td valign=topname/td
  -td valign=topThe name of the text attribute/td
  -td valign=top align=centerYes/td
  -  /tr
  -  tr
  -td valign=topoptional/td
  -td valign=top
  -  If true nested text in the macro is optional, default is false.
  -/td
  -td valign=top align=centerNo/td
  -  /tr
  -  tr
  -td valign=toptrim/td
  -td valign=top
  -  If true, the nested text is trimmed of white space,
  -  default is false.
  -/td
  -td valign=top align=centerNo/td
  -  /tr
  -  tr
  -td valign=topdescription/td
  -td valign=top
  -  This contains a description
  -  informing the user what the nested text of the macro is expected
  -  to be.
   /td
   td valign=top align=centerNo/td
 /tr
  
  
  

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

cvs commit: ant/docs/manual/CoreTasks macrodef.html

2004-05-26 Thread peterreilly 
peterreilly2004/05/26 05:25:52

  Modified:docs/manual/CoreTasks Tag: ANT_16_BRANCH macrodef.html
  Log:
  sync
  
  Revision  ChangesPath
  No   revision
  No   revision
  1.2.2.19  +1 -49 ant/docs/manual/CoreTasks/macrodef.html
  
  Index: macrodef.html
  ===
  RCS file: /home/cvs/ant/docs/manual/CoreTasks/macrodef.html,v
  retrieving revision 1.2.2.18
  retrieving revision 1.2.2.19
  diff -u -r1.2.2.18 -r1.2.2.19
  --- macrodef.html 7 May 2004 18:07:32 -   1.2.2.18
  +++ macrodef.html 26 May 2004 12:25:52 -  1.2.2.19
  @@ -119,7 +119,7 @@
 /tr
 tr
   td valign=topname/td
  -td valign=topThe name of the new attribute/td
  +td valign=topThe name of the element/td
   td valign=top align=centerYes/td
 /tr
 tr
  @@ -137,54 +137,6 @@
 This contains a description
 informing the user what the contents of the element are expected 
to be.
 emsince ant 1.6.1/em
  -/td
  -td valign=top align=centerNo/td
  -  /tr
  -/table
  -h4text/h4
  -p
  -  This is used to specify the treatment of text contents of the macrodef.
  -  If this element is not present, then any nested text in the macro
  -  will be an error. If the text element is present, then the name
  -  becomes an attribute that gets set to the nested text of the macro.
  -  emSince ant 1.6.1./em
  -/p
  -p
  -  The case of the text name is ignored.
  -/p
  -h3Parameters/h3
  -table border=1 cellpadding=2 cellspacing=0
  -  tr
  -td valign=topbAttribute/b/td
  -td valign=topbDescription/b/td
  -td align=center valign=topbRequired/b/td
  -  /tr
  -  tr
  -td valign=topname/td
  -td valign=topThe name of the text attribute/td
  -td valign=top align=centerYes/td
  -  /tr
  -  tr
  -td valign=topoptional/td
  -td valign=top
  -  If true nested text in the macro is optional, default is false.
  -/td
  -td valign=top align=centerNo/td
  -  /tr
  -  tr
  -td valign=toptrim/td
  -td valign=top
  -  If true, the nested text is trimmed of white space,
  -  default is false.
  -/td
  -td valign=top align=centerNo/td
  -  /tr
  -  tr
  -td valign=topdescription/td
  -td valign=top
  -  This contains a description
  -  informing the user what the nested text of the macro is expected
  -  to be.
   /td
   td valign=top align=centerNo/td
 /tr
  
  
  

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

cvs commit: ant/docs/manual/CoreTasks macrodef.html

2004-05-07 Thread mbenson 
mbenson 2004/05/07 11:00:43

  Modified:docs/manual/CoreTasks macrodef.html
  Log:
  Fix echotest example.
  Submitted by: Yuji Yamano
  
  Revision  ChangesPath
  1.19  +2 -2  ant/docs/manual/CoreTasks/macrodef.html
  
  Index: macrodef.html
  ===
  RCS file: /home/cvs/ant/docs/manual/CoreTasks/macrodef.html,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- macrodef.html 27 Apr 2004 05:14:40 -  1.18
  +++ macrodef.html 7 May 2004 18:00:43 -   1.19
  @@ -310,7 +310,7 @@
   blockquote
   pre class=code
   lt;macrodef name=echotestgt;
  -   lt;text name=textlt;/textgt;
  +   lt;text name=text/gt;
  lt;sequentialgt;
 lt;echogt;@{text}lt;/echogt;
  lt;/sequentialgt;
  @@ -345,4 +345,4 @@
   Foundation. All rights Reserved./p
   
   /body
  -/html
  \ No newline at end of file
  +/html
  
  
  

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

cvs commit: ant/docs/manual/CoreTasks macrodef.html

2004-05-07 Thread mbenson 
mbenson 2004/05/07 11:07:32

  Modified:docs/manual/CoreTasks Tag: ANT_16_BRANCH macrodef.html
  Log:
  Sync with HEAD.
  
  Revision  ChangesPath
  No   revision
  No   revision
  1.2.2.18  +2 -2  ant/docs/manual/CoreTasks/macrodef.html
  
  Index: macrodef.html
  ===
  RCS file: /home/cvs/ant/docs/manual/CoreTasks/macrodef.html,v
  retrieving revision 1.2.2.17
  retrieving revision 1.2.2.18
  diff -u -r1.2.2.17 -r1.2.2.18
  --- macrodef.html 27 Apr 2004 05:16:51 -  1.2.2.17
  +++ macrodef.html 7 May 2004 18:07:32 -   1.2.2.18
  @@ -310,7 +310,7 @@
   blockquote
   pre class=code
   lt;macrodef name=echotestgt;
  -   lt;text name=textlt;/textgt;
  +   lt;text name=text/gt;
  lt;sequentialgt;
 lt;echogt;@{text}lt;/echogt;
  lt;/sequentialgt;
  @@ -345,4 +345,4 @@
   Foundation. All rights Reserved./p
   
   /body
  -/html
  \ No newline at end of file
  +/html
  
  
  

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

cvs commit: ant/docs/manual/CoreTasks macrodef.html

2004-04-27 Thread jhm 
jhm 2004/04/26 22:14:40

  Modified:docs/manual/CoreTasks macrodef.html
  Log:
  Missing '' in @text-example.
  
  Revision  ChangesPath
  1.18  +2 -2  ant/docs/manual/CoreTasks/macrodef.html
  
  Index: macrodef.html
  ===
  RCS file: /home/cvs/ant/docs/manual/CoreTasks/macrodef.html,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- macrodef.html 20 Apr 2004 17:41:27 -  1.17
  +++ macrodef.html 27 Apr 2004 05:14:40 -  1.18
  @@ -310,7 +310,7 @@
   blockquote
   pre class=code
   lt;macrodef name=echotestgt;
  -   lt;text name=text/textgt;
  +   lt;text name=textlt;/textgt;
  lt;sequentialgt;
 lt;echogt;@{text}lt;/echogt;
  lt;/sequentialgt;
  @@ -345,4 +345,4 @@
   Foundation. All rights Reserved./p
   
   /body
  -/html
  +/html
  \ No newline at end of file
  
  
  

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

cvs commit: ant/docs/manual/CoreTasks macrodef.html

2004-04-27 Thread jhm 
jhm 2004/04/26 22:16:51

  Modified:docs/manual/CoreTasks Tag: ANT_16_BRANCH macrodef.html
  Log:
  Merge: Missing '' in @text-example.
  
  Revision  ChangesPath
  No   revision
  No   revision
  1.2.2.17  +2 -2  ant/docs/manual/CoreTasks/macrodef.html
  
  Index: macrodef.html
  ===
  RCS file: /home/cvs/ant/docs/manual/CoreTasks/macrodef.html,v
  retrieving revision 1.2.2.16
  retrieving revision 1.2.2.17
  diff -u -r1.2.2.16 -r1.2.2.17
  --- macrodef.html 20 Apr 2004 17:42:51 -  1.2.2.16
  +++ macrodef.html 27 Apr 2004 05:16:51 -  1.2.2.17
  @@ -310,7 +310,7 @@
   blockquote
   pre class=code
   lt;macrodef name=echotestgt;
  -   lt;text name=text/textgt;
  +   lt;text name=textlt;/textgt;
  lt;sequentialgt;
 lt;echogt;@{text}lt;/echogt;
  lt;/sequentialgt;
  @@ -345,4 +345,4 @@
   Foundation. All rights Reserved./p
   
   /body
  -/html
  +/html
  \ No newline at end of file
  
  
  

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

cvs commit: ant/docs/manual/CoreTasks macrodef.html

2004-04-20 Thread jhm 
jhm 2004/04/20 07:45:26

  Modified:docs/manual/CoreTasks macrodef.html
  Log:
  Document the use of @{attributes} inside attribute/ definition.
  
  Revision  ChangesPath
  1.14  +30 -6 ant/docs/manual/CoreTasks/macrodef.html
  
  Index: macrodef.html
  ===
  RCS file: /home/cvs/ant/docs/manual/CoreTasks/macrodef.html,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- macrodef.html 25 Feb 2004 11:33:34 -  1.13
  +++ macrodef.html 20 Apr 2004 14:45:26 -  1.14
  @@ -1,5 +1,5 @@
   html
  -  
  +
 head
   meta http-equiv=Content-Language content=en-us/meta
   titleMacroDef Task/title
  @@ -9,18 +9,23 @@
  --
   /style
 /head
  -
  +
 body
  -  
  +
   h2a name=macrodefMacroDef/a/h2
   h3Description/h3
   p
  -  This defines a new task using a lt;sequentialgt; 
  +  This defines a new task using a lt;sequentialgt;
 nested task as a template. Nested elements lt;attributegt; and
 lt;elementgt; are used to specify attributes and elements of
 the new task. These get substituted into the  lt;sequentialgt;
 task when the new task is run.
   /p
  +h3Note/h3
  +p
  +  You can also use iprior defined/i attributes for default-values in
  +  other attributes. See the examples.
  +/p
   p
 emsince Ant 1.6/em
   /p
  @@ -183,7 +188,7 @@
   td valign=top align=centerNo/td
 /tr
   /table
  -
  +
   h3Examples/h3
   p
 The following example defined a task called testing and
  @@ -266,10 +271,29 @@
   lt;/echotestgt;
   /pre
   /blockquote
  +p
  +  The following uses a prior defined attribut for setting the
  +  default value of another. The output would be
  +  ttone=test two=test/tt. If you change the order of lines
  +  *1 and *2 the output would be ttone=test [EMAIL PROTECTED]/tt,
  +  because while processing the itwo/i-line the value for
  +  ione/i is not set.
  +/p
  +blockquote
  +pre class=code
  +lt;macrodef name=test/gt;
  +   lt;attribute name=one/gt; b*1/b
  +   lt;attribute name=two default=@{one}/gt;b*2/b
  +   lt;sequentialgt;
  +  lt;echogt;[EMAIL PROTECTED]   [EMAIL PROTECTED]lt;/echogt;
  +   lt;/sequentialgt;
  +lt;/macrodef/gt;
  +lt;test one=test/gt;
  +/pre
  +/blockquote
   hr
   p align=centerCopyright copy; 2003-2004 Apache Software
   Foundation. All rights Reserved./p
   
   /body
   /html
  -
  
  
  

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

cvs commit: ant/docs/manual/CoreTasks macrodef.html

2004-04-20 Thread jhm 
jhm 2004/04/20 07:53:12

  Modified:docs/manual/CoreTasks Tag: ANT_16_BRANCH macrodef.html
  Log:
  Merge
  
  Revision  ChangesPath
  No   revision
  No   revision
  1.2.2.14  +81 -8 ant/docs/manual/CoreTasks/macrodef.html
  
  Index: macrodef.html
  ===
  RCS file: /home/cvs/ant/docs/manual/CoreTasks/macrodef.html,v
  retrieving revision 1.2.2.13
  retrieving revision 1.2.2.14
  diff -u -r1.2.2.13 -r1.2.2.14
  --- macrodef.html 25 Feb 2004 11:34:22 -  1.2.2.13
  +++ macrodef.html 20 Apr 2004 14:53:12 -  1.2.2.14
  @@ -1,27 +1,32 @@
   html
  -  
  +
 head
   meta http-equiv=Content-Language content=en-us/meta
   titleMacroDef Task/title
  -link rel=stylesheet type=text/css href=../stylesheets/antmanual.css
  +link rel=stylesheet type=text/css 
href=../stylesheets/antmanual.css
   style type=text/css
 !--
  .code { background: #EFEFEF; margin-top: }
  --
   /style
 /head
  -
  +
 body
  -  
  +
   h2a name=macrodefMacroDef/a/h2
   h3Description/h3
   p
  -  This defines a new task using a lt;sequentialgt; 
  +  This defines a new task using a lt;sequentialgt;
 nested task as a template. Nested elements lt;attributegt; and
 lt;elementgt; are used to specify attributes and elements of
 the new task. These get substituted into the  lt;sequentialgt;
 task when the new task is run.
   /p
  +h3Note/h3
  +p
  +  You can also use iprior defined/i attributes for default-values in
  +  other attributes. See the examples.
  +/p
   p
 emsince Ant 1.6/em
   /p
  @@ -184,7 +189,55 @@
   td valign=top align=centerNo/td
 /tr
   /table
  -
  +h4text/h4
  +p
  +  This is used to specify the treatment of text contents of the macrodef.
  +  If this element is not present, then any nested text in the macro
  +  will be an error. If the text element is present, then the name
  +  becomes an attribute that gets set to the nested text of the macro.
  +  emSince ant 1.6.1./em
  +/p
  +p
  +  The case of the text name is ignored.
  +/p
  +h3Parameters/h3
  +table border=1 cellpadding=2 cellspacing=0
  +  tr
  +td valign=topbAttribute/b/td
  +td valign=topbDescription/b/td
  +td align=center valign=topbRequired/b/td
  +  /tr
  +  tr
  +td valign=topname/td
  +td valign=topThe name of the text attribute/td
  +td valign=top align=centerYes/td
  +  /tr
  +  tr
  +td valign=topoptional/td
  +td valign=top
  +  If true nested text in the macro is optional, default is false.
  +/td
  +td valign=top align=centerNo/td
  +  /tr
  +  tr
  +td valign=toptrim/td
  +td valign=top
  +  If true, the nested text is trimmed of white space,
  +  default is false.
  +/td
  +td valign=top align=centerNo/td
  +  /tr
  +  tr
  +td valign=topdescription/td
  +td valign=top
  +  This contains a description
  +  informing the user what the nested text of the macro is expected
  +  to be.
  +/td
  +td valign=top align=centerNo/td
  +  /tr
  +/table
  +
   h3Examples/h3
   p
 The following example defined a task called testing and
  @@ -267,10 +320,30 @@
   lt;/echotestgt;
   /pre
   /blockquote
  +p
  +  The following uses a prior defined attribut for setting the
  +  default value of another. The output would be
  +  ttone=test two=test/tt. If you change the order of lines
  +  *1 and *2 the output would be ttone=test [EMAIL PROTECTED]/tt,
  +  because while processing the itwo/i-line the value for
  +  ione/i is not set.
  +/p
  +blockquote
  +pre class=code
  +lt;macrodef name=test/gt;
  +   lt;attribute name=one/gt; b*1/b
  +   lt;attribute name=two default=@{one}/gt;b*2/b
  +   lt;sequentialgt;
  +  lt;echogt;[EMAIL PROTECTED]   [EMAIL PROTECTED]lt;/echogt;
  +   lt;/sequentialgt;
  +lt;/macrodef/gt;
  +lt;test one=test/gt;
  +/pre
  + 1.14
  +/blockquote
   hr
   p align=centerCopyright copy; 2003-2004 The Apache Software
   Foundation. All rights Reserved./p
   
   /body
  -/html
  -
  +/html
  \ No newline at end of file
  
  
  

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

cvs commit: ant/docs/manual/CoreTasks macrodef.html

2004-04-20 Thread mbenson 
mbenson 2004/04/20 08:26:39

  Modified:docs/manual/CoreTasks macrodef.html
  Log:
  Typo correction.
  
  Revision  ChangesPath
  1.15  +1 -1  ant/docs/manual/CoreTasks/macrodef.html
  
  Index: macrodef.html
  ===
  RCS file: /home/cvs/ant/docs/manual/CoreTasks/macrodef.html,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- macrodef.html 20 Apr 2004 14:45:26 -  1.14
  +++ macrodef.html 20 Apr 2004 15:26:39 -  1.15
  @@ -272,7 +272,7 @@
   /pre
   /blockquote
   p
  -  The following uses a prior defined attribut for setting the
  +  The following uses a prior defined attribute for setting the
 default value of another. The output would be
 ttone=test two=test/tt. If you change the order of lines
 *1 and *2 the output would be ttone=test [EMAIL PROTECTED]/tt,
  
  
  

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

cvs commit: ant/docs/manual/CoreTasks macrodef.html

2004-04-20 Thread mbenson 
mbenson 2004/04/20 08:42:36

  Modified:docs/manual/CoreTasks macrodef.html
  Log:
  Add nested text support commentary to HEAD.
  
  Revision  ChangesPath
  1.16  +51 -1 ant/docs/manual/CoreTasks/macrodef.html
  
  Index: macrodef.html
  ===
  RCS file: /home/cvs/ant/docs/manual/CoreTasks/macrodef.html,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- macrodef.html 20 Apr 2004 15:26:39 -  1.15
  +++ macrodef.html 20 Apr 2004 15:42:34 -  1.16
  @@ -3,6 +3,7 @@
 head
   meta http-equiv=Content-Language content=en-us/meta
   titleMacroDef Task/title
  +link rel=stylesheet type=text/css 
href=../stylesheets/antmanual.css
   style type=text/css
 !--
  .code { background: #EFEFEF; margin-top: }
  @@ -188,6 +189,54 @@
   td valign=top align=centerNo/td
 /tr
   /table
  +h4text/h4
  +p
  +  This is used to specify the treatment of text contents of the macrodef.
  +  If this element is not present, then any nested text in the macro
  +  will be an error. If the text element is present, then the name
  +  becomes an attribute that gets set to the nested text of the macro.
  +  emSince ant 1.6.1./em
  +/p
  +p
  +  The case of the text name is ignored.
  +/p
  +h3Parameters/h3
  +table border=1 cellpadding=2 cellspacing=0
  +  tr
  +td valign=topbAttribute/b/td
  +td valign=topbDescription/b/td
  +td align=center valign=topbRequired/b/td
  +  /tr
  +  tr
  +td valign=topname/td
  +td valign=topThe name of the text attribute/td
  +td valign=top align=centerYes/td
  +  /tr
  +  tr
  +td valign=topoptional/td
  +td valign=top
  +  If true nested text in the macro is optional, default is false.
  +/td
  +td valign=top align=centerNo/td
  +  /tr
  +  tr
  +td valign=toptrim/td
  +td valign=top
  +  If true, the nested text is trimmed of white space,
  +  default is false.
  +/td
  +td valign=top align=centerNo/td
  +  /tr
  +  tr
  +td valign=topdescription/td
  +td valign=top
  +  This contains a description
  +  informing the user what the nested text of the macro is expected
  +  to be.
  +/td
  +td valign=top align=centerNo/td
  +  /tr
  +/table
   
   h3Examples/h3
   p
  @@ -290,9 +339,10 @@
   lt;/macrodef/gt;
   lt;test one=test/gt;
   /pre
  + 1.14
   /blockquote
   hr
  -p align=centerCopyright copy; 2003-2004 Apache Software
  +p align=centerCopyright copy; 2003-2004 The Apache Software
   Foundation. All rights Reserved./p
   
   /body
  
  
  

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

cvs commit: ant/docs/manual/CoreTasks macrodef.html

2004-04-20 Thread mbenson 
mbenson 2004/04/20 09:29:48

  Modified:docs/manual/CoreTasks Tag: ANT_16_BRANCH macrodef.html
  Log:
  Sync with HEAD.
  
  Revision  ChangesPath
  No   revision
  No   revision
  1.2.2.15  +2 -2  ant/docs/manual/CoreTasks/macrodef.html
  
  Index: macrodef.html
  ===
  RCS file: /home/cvs/ant/docs/manual/CoreTasks/macrodef.html,v
  retrieving revision 1.2.2.14
  retrieving revision 1.2.2.15
  diff -u -r1.2.2.14 -r1.2.2.15
  --- macrodef.html 20 Apr 2004 14:53:12 -  1.2.2.14
  +++ macrodef.html 20 Apr 2004 16:29:47 -  1.2.2.15
  @@ -321,7 +321,7 @@
   /pre
   /blockquote
   p
  -  The following uses a prior defined attribut for setting the
  +  The following uses a prior defined attribute for setting the
 default value of another. The output would be
 ttone=test two=test/tt. If you change the order of lines
 *1 and *2 the output would be ttone=test [EMAIL PROTECTED]/tt,
  @@ -346,4 +346,4 @@
   Foundation. All rights Reserved./p
   
   /body
  -/html
  \ No newline at end of file
  +/html
  
  
  

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

cvs commit: ant/docs/manual/CoreTasks macrodef.html

2004-04-20 Thread mbenson 
mbenson 2004/04/20 10:41:27

  Modified:docs/manual/CoreTasks macrodef.html
  Log:
  Removed v1.14 conflict indicator.
  
  Revision  ChangesPath
  1.17  +0 -1  ant/docs/manual/CoreTasks/macrodef.html
  
  Index: macrodef.html
  ===
  RCS file: /home/cvs/ant/docs/manual/CoreTasks/macrodef.html,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- macrodef.html 20 Apr 2004 15:42:34 -  1.16
  +++ macrodef.html 20 Apr 2004 17:41:27 -  1.17
  @@ -339,7 +339,6 @@
   lt;/macrodef/gt;
   lt;test one=test/gt;
   /pre
  - 1.14
   /blockquote
   hr
   p align=centerCopyright copy; 2003-2004 The Apache Software
  
  
  

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

cvs commit: ant/docs/manual/CoreTasks macrodef.html

2004-04-20 Thread mbenson 
mbenson 2004/04/20 10:42:51

  Modified:docs/manual/CoreTasks Tag: ANT_16_BRANCH macrodef.html
  Log:
  Sync with HEAD.
  
  Revision  ChangesPath
  No   revision
  No   revision
  1.2.2.16  +0 -1  ant/docs/manual/CoreTasks/macrodef.html
  
  Index: macrodef.html
  ===
  RCS file: /home/cvs/ant/docs/manual/CoreTasks/macrodef.html,v
  retrieving revision 1.2.2.15
  retrieving revision 1.2.2.16
  diff -u -r1.2.2.15 -r1.2.2.16
  --- macrodef.html 20 Apr 2004 16:29:47 -  1.2.2.15
  +++ macrodef.html 20 Apr 2004 17:42:51 -  1.2.2.16
  @@ -339,7 +339,6 @@
   lt;/macrodef/gt;
   lt;test one=test/gt;
   /pre
  - 1.14
   /blockquote
   hr
   p align=centerCopyright copy; 2003-2004 The Apache Software
  
  
  

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

cvs commit: ant/docs/manual/CoreTasks macrodef.html

2004-02-25 Thread peterreilly 
peterreilly2004/02/25 03:33:34

  Modified:docs/manual/CoreTasks macrodef.html
  Log:
  manual page update for @@ change in macrodef
  
  Revision  ChangesPath
  1.13  +5 -3  ant/docs/manual/CoreTasks/macrodef.html
  
  Index: macrodef.html
  ===
  RCS file: /home/cvs/ant/docs/manual/CoreTasks/macrodef.html,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- macrodef.html 27 Jan 2004 17:43:25 -  1.12
  +++ macrodef.html 25 Feb 2004 11:33:34 -  1.13
  @@ -57,9 +57,11 @@
 task using a notation similar to the ant property notation
 - @{attribute name}. (May be remembered as put the substitution
 AT this location).
  -  The escape sequence @@{x} is used to allow @{x} to be
  -  placed in the text without substitution of x.
  -  This corresponds to the $${x} escape sequence for properties.
  +/p
  +p
  +  The escape sequence @@ is used to escape @. This allows @{x} to be
  +  placed in the text without substitution of x by using @@{x}.
  +  This corresponds to the $$ escape sequence for properties.
   /p
   p
 The case of the attribute is ignored, so @{myAttribute} is treated the
  
  
  

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

cvs commit: ant/docs/manual/CoreTasks macrodef.html

2004-02-25 Thread peterreilly 
peterreilly2004/02/25 03:34:22

  Modified:docs/manual/CoreTasks Tag: ANT_16_BRANCH macrodef.html
  Log:
  Sync with HEAD
  
  Revision  ChangesPath
  No   revision
  No   revision
  1.2.2.13  +5 -3  ant/docs/manual/CoreTasks/macrodef.html
  
  Index: macrodef.html
  ===
  RCS file: /home/cvs/ant/docs/manual/CoreTasks/macrodef.html,v
  retrieving revision 1.2.2.12
  retrieving revision 1.2.2.13
  diff -u -r1.2.2.12 -r1.2.2.13
  --- macrodef.html 9 Feb 2004 22:12:07 -   1.2.2.12
  +++ macrodef.html 25 Feb 2004 11:34:22 -  1.2.2.13
  @@ -58,9 +58,11 @@
 task using a notation similar to the ant property notation
 - @{attribute name}. (May be remembered as put the substitution
 AT this location).
  -  The escape sequence @@{x} is used to allow @{x} to be
  -  placed in the text without substitution of x.
  -  This corresponds to the $${x} escape sequence for properties.
  +/p
  +p
  +  The escape sequence @@ is used to escape @. This allows @{x} to be
  +  placed in the text without substitution of x by using @@{x}.
  +  This corresponds to the $$ escape sequence for properties.
   /p
   p
 The case of the attribute is ignored, so @{myAttribute} is treated the
  
  
  

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

Re: cvs commit: ant/docs/manual/CoreTasks macrodef.html

2004-01-09 Thread Peter Reilly 
Jose Alberto Fernandez wrote:
Peter,
An additional enhacement that would be very very nice,
is to allow having a body-element. So I can write
something like this:
 macrodef name=x body=y
   sequential
 javac ...
  y/
 /javac
   /sequential
 /macrodef
And use it like:
x
 fileset/
 classpath .../
/x
instead of
x
 y
  fileset/
  classpath .../
 /y
/x
For many macros, those that wrap some group of tasks
for example, it looks very odd to have to have an element
that covers all the tasks inside.
How dificult would be to achieve that?
 

Not too easy.
MacroInstance is a DynamicConfigurable and MacroInstance#Element is
a TaskContainer. These two interfaces cannot be implemented at the moment
by the same object, and DymanicConfigable#createDynamicElement does
not have enough information to create a proper namespaced UnknownElement
since the changes from 1.6beta3 to 1.6.0.
Peter
Jose Alberto
 

-Original Message-
From: Peter Reilly [mailto:[EMAIL PROTECTED] 
Sent: 08 January 2004 17:42
To: Ant Developers List
Subject: Re: cvs commit: ant/docs/manual/CoreTasks macrodef.html

description attributes are allowed on tasks and targets, so 
it is a logical extension to have them for the nested 
elements - esp for macrodef 
attributes/elements.
Peter
Dominique Devienne wrote:

   

From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED]
Log:
Add description attributes for elements and attributes of macrodef
PR: 24711
Obtained from: gudnabrsam at yahoo dot com and Yuji Yamano
  

   

How about a addText(String) so that any text within the 
 

attribute could 
   

be appended or replace the description attribute?
Or allow a nested description element? Wait, isn't there this some 
rule that any description element is part of the build element or 
something!?!?

I allows feel that XML attributes are unsuitable to hold 
 

sometimes long 
   

text such as descriptions!
--DD
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]


 

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

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

 


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

cvs commit: ant/docs/manual/CoreTasks macrodef.html

2004-01-08 Thread peterreilly 
peterreilly2004/01/08 09:34:57

  Modified:src/main/org/apache/tools/ant/taskdefs MacroDef.java
   docs/manual/CoreTasks macrodef.html
  Log:
  Add description attributes for elements and attributes of macrodef
  PR: 24711
  Obtained from: gudnabrsam at yahoo dot com and Yuji Yamano
  
  Revision  ChangesPath
  1.16  +33 -0 ant/src/main/org/apache/tools/ant/taskdefs/MacroDef.java
  
  Index: MacroDef.java
  ===
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/MacroDef.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- MacroDef.java 22 Dec 2003 09:46:23 -  1.15
  +++ MacroDef.java 8 Jan 2004 17:34:57 -   1.16
  @@ -283,6 +283,7 @@
   public static class Attribute {
   private String name;
   private String defaultValue;
  +private String description;
   
   /**
* The name of the attribute.
  @@ -322,6 +323,21 @@
   }
   
   /**
  + * @param desc Description of the element.
  + */
  +public void setDescription(String desc) {
  +description = desc;
  +}
  +
  +/**
  + * @return the description of the element, or codenull/code if   
  + * no description is available.
  + */
  +public String getDescription() {
  +return description;
  +}
  +
  +/**
* equality method
*
* @param obj an codeObject/code value
  @@ -367,6 +383,8 @@
   public static class TemplateElement {
   private String name;
   private boolean optional = false;
  + private String description;
  +
   /**
* The name of the element.
*
  @@ -402,6 +420,21 @@
*/
   public boolean isOptional() {
   return optional;
  +}
  +
  +/**
  + * @param desc Description of the element.
  + */
  +public void setDescription(String desc) {
  +description = desc;
  +}
  +
  +/**
  + * @return the description of the element, or codenull/code if   
  + * no description is available.
  + */
  +public String getDescription() {
  +return description;
   }
   
   /**
  
  
  
  1.8   +15 -0 ant/docs/manual/CoreTasks/macrodef.html
  
  Index: macrodef.html
  ===
  RCS file: /home/cvs/ant/docs/manual/CoreTasks/macrodef.html,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- macrodef.html 22 Dec 2003 09:46:23 -  1.7
  +++ macrodef.html 8 Jan 2004 17:34:57 -   1.8
  @@ -84,6 +84,13 @@
   /td
   td valign=top align=centerNo/td
 /tr
  +  tr
  +td valign=topdescription/td
  +td valign=top
  +  This contains a description of the attribute.
  +/td
  +td valign=top align=centerNo/td
  +  /tr
   /table
   h4element/h4
   p
  @@ -109,6 +116,14 @@
 If true this nested element is optional. Default is
 false - i.e the nested element is required in
 the new task.
  +/td
  +td valign=top align=centerNo/td
  +  /tr
  +  tr
  +td valign=topdescription/td
  +td valign=top
  +  This contains a description
  +  informing the user what the contents of the element are expected 
to be.
   /td
   td valign=top align=centerNo/td
 /tr
  
  
  

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

RE: cvs commit: ant/docs/manual/CoreTasks macrodef.html

2004-01-08 Thread Dominique Devienne 
 From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED]
   Log:
   Add description attributes for elements and attributes of macrodef
   PR: 24711
   Obtained from: gudnabrsam at yahoo dot com and Yuji Yamano

How about a addText(String) so that any text within the attribute
could be appended or replace the description attribute?

Or allow a nested description element? Wait, isn't there this
some rule that any description element is part of the build
element or something!?!?

I allows feel that XML attributes are unsuitable to hold
sometimes long text such as descriptions!

--DD

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

RE: cvs commit: ant/docs/manual/CoreTasks macrodef.html

2004-01-08 Thread Dominique Devienne 
 From: Dominique Devienne [mailto:[EMAIL PROTECTED]
 
  From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED]
Log:
Add description attributes for elements and attributes of macrodef
PR: 24711
Obtained from: gudnabrsam at yahoo dot com and Yuji Yamano
 
 How about a addText(String) so that any text within the attribute
 could be appended or replace the description attribute?
 
 Or allow a nested description element? Wait, isn't there
 some rule that any description element is part of the build's
 global description or something!?!?
 
 I always feel that XML attributes are unsuitable to hold
 sometimes long text such as descriptions! Many times I
 have target descriptions I need to wrap, and I find that ugly.

Gee I'm tired of being sick. Here goes again with a few changes... --FF

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

Re: cvs commit: ant/docs/manual/CoreTasks macrodef.html

2004-01-08 Thread Peter Reilly 
description attributes are allowed on tasks and targets, so it is a logical
extension to have them for the nested elements - esp for macrodef 
attributes/elements.
Peter
Dominique Devienne wrote:

From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED]
 Log:
 Add description attributes for elements and attributes of macrodef
 PR: 24711
 Obtained from: gudnabrsam at yahoo dot com and Yuji Yamano
   

How about a addText(String) so that any text within the attribute
could be appended or replace the description attribute?
Or allow a nested description element? Wait, isn't there this
some rule that any description element is part of the build
element or something!?!?
I allows feel that XML attributes are unsuitable to hold
sometimes long text such as descriptions!
--DD
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

 


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

RE: cvs commit: ant/docs/manual/CoreTasks macrodef.html

2004-01-08 Thread Dominique Devienne 
 From: Peter Reilly [mailto:[EMAIL PROTECTED]
 
 description attributes are allowed on tasks and targets, so it is a
 logical
 extension to have them for the nested elements - esp for macrodef
 attributes/elements.
 Peter

I didn't dispute that, just the fact that it's often not practical
to put long descriptions in an XML attributes. I was proposing to
allow an alternate way to provide description which is more compatible
with writing detailed descriptions. I would actually like such an
alternate mechanism to also be available for tasks and targets...

Oh well, never mind! --DD

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

RE: cvs commit: ant/docs/manual/CoreTasks macrodef.html

2004-01-08 Thread Jose Alberto Fernandez 
Peter,

An additional enhacement that would be very very nice,
is to allow having a body-element. So I can write
something like this:

  macrodef name=x body=y
sequential
  javac ...
   y/
  /javac
/sequential
  /macrodef

And use it like:

 x
  fileset/
  classpath .../
 /x

instead of

 x
  y
   fileset/
   classpath .../
  /y
 /x

For many macros, those that wrap some group of tasks
for example, it looks very odd to have to have an element
that covers all the tasks inside.

How dificult would be to achieve that?

Jose Alberto

 -Original Message-
 From: Peter Reilly [mailto:[EMAIL PROTECTED] 
 Sent: 08 January 2004 17:42
 To: Ant Developers List
 Subject: Re: cvs commit: ant/docs/manual/CoreTasks macrodef.html
 
 
 description attributes are allowed on tasks and targets, so 
 it is a logical extension to have them for the nested 
 elements - esp for macrodef 
 attributes/elements.
 Peter
 Dominique Devienne wrote:
 
 From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED]
   Log:
   Add description attributes for elements and attributes of macrodef
   PR: 24711
   Obtained from: gudnabrsam at yahoo dot com and Yuji Yamano
 
 
 
 How about a addText(String) so that any text within the 
 attribute could 
 be appended or replace the description attribute?
 
 Or allow a nested description element? Wait, isn't there this some 
 rule that any description element is part of the build element or 
 something!?!?
 
 I allows feel that XML attributes are unsuitable to hold 
 sometimes long 
 text such as descriptions!
 
 --DD
 
 -
 To unsubscribe, e-mail: [EMAIL PROTECTED]
 For additional commands, e-mail: [EMAIL PROTECTED]
 
 
 
   
 
 
 
 -
 To unsubscribe, e-mail: [EMAIL PROTECTED]
 For additional commands, e-mail: [EMAIL PROTECTED]
 
 

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

Re: cvs commit: ant/docs/manual/CoreTasks macrodef.html

2004-01-08 Thread Alexey N. Solofnenko 
I think too, it would be very convenient. I filed a bug report about it 
- 25633 http://issues.apache.org/bugzilla/show_bug.cgi?id=25633.

- Alexey.
Jose Alberto Fernandez wrote:
Peter,
An additional enhacement that would be very very nice,
is to allow having a body-element. So I can write
something like this:
 macrodef name=x body=y
   sequential
 javac ...
  y/
 /javac
   /sequential
 /macrodef
And use it like:
x
 fileset/
 classpath .../
/x
instead of
x
 y
  fileset/
  classpath .../
 /y
/x
For many macros, those that wrap some group of tasks
for example, it looks very odd to have to have an element
that covers all the tasks inside.
How dificult would be to achieve that?
Jose Alberto
 

-Original Message-
From: Peter Reilly [mailto:[EMAIL PROTECTED] 
Sent: 08 January 2004 17:42
To: Ant Developers List
Subject: Re: cvs commit: ant/docs/manual/CoreTasks macrodef.html

description attributes are allowed on tasks and targets, so 
it is a logical extension to have them for the nested 
elements - esp for macrodef 
attributes/elements.
Peter
Dominique Devienne wrote:

   

From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED]
Log:
Add description attributes for elements and attributes of macrodef
PR: 24711
Obtained from: gudnabrsam at yahoo dot com and Yuji Yamano
  

   

How about a addText(String) so that any text within the 
 

attribute could 
   

be appended or replace the description attribute?
Or allow a nested description element? Wait, isn't there this some 
rule that any description element is part of the build element or 
something!?!?

I allows feel that XML attributes are unsuitable to hold 
 

sometimes long 
   

text such as descriptions!
--DD
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]


 

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

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

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

cvs commit: ant/docs/manual/CoreTasks macrodef.html

2003-10-31 Thread peterreilly 
peterreilly2003/10/31 01:51:24

  Modified:src/main/org/apache/tools/ant/taskdefs MacroDef.java
   docs/manual/CoreTasks macrodef.html
  Log:
  Remove option to have parallel instead of sequential for macrodef. The
  former was never tested.
  
  Revision  ChangesPath
  1.11  +2 -3  ant/src/main/org/apache/tools/ant/taskdefs/MacroDef.java
  
  Index: MacroDef.java
  ===
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/MacroDef.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- MacroDef.java 15 Oct 2003 07:39:35 -  1.10
  +++ MacroDef.java 31 Oct 2003 09:51:24 -  1.11
  @@ -96,12 +96,11 @@
*/
   public void addTask(Task nestedTask) {
   if (this.nestedTask != null) {
  -throw new BuildException(Only one sequential/Parallel allowed);
  +throw new BuildException(Only one sequential allowed);
   }
   UnknownElement ue = (UnknownElement) nestedTask;
   if (!ue.getNamespace().equals()
  -|| (!ue.getTag().equals(sequential)
  - !ue.getTag().equals(parallel))) {
  +|| !ue.getTag().equals(sequential)) {
   throw new BuildException(Unsupported tag  + ue.getQName());
   }
   this.nestedTask = ue;
  
  
  
  1.5   +2 -2  ant/docs/manual/CoreTasks/macrodef.html
  
  Index: macrodef.html
  ===
  RCS file: /home/cvs/ant/docs/manual/CoreTasks/macrodef.html,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- macrodef.html 14 Oct 2003 09:59:19 -  1.4
  +++ macrodef.html 31 Oct 2003 09:51:24 -  1.5
  @@ -10,11 +10,11 @@
   h2a name=macrodefMacroDef/a/h2
   h3Description/h3
   p
  -  This defines a new task using a lt;sequentialgt; or lt;parallelgt;
  +  This defines a new task using a lt;sequentialgt; 
 nested task as a template. Nested elements lt;attributegt; and
 lt;elementgt; are used to specify attributes and elements of
 the new task. These get substituted into the  lt;sequentialgt;
  -  or lt;parallelgt; task when the new task is run.
  +  task when the new task is run.
   /p
   p
 emsince Ant 1.6/em
  
  
  

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

cvs commit: ant/docs/manual/CoreTasks macrodef.html

2003-10-31 Thread peterreilly 
peterreilly2003/10/31 01:56:43

  Modified:src/main/org/apache/tools/ant/taskdefs Tag: ANT_16_BRANCH
MacroDef.java
   docs/manual/CoreTasks Tag: ANT_16_BRANCH macrodef.html
  Log:
  Merge with HEAD
  
  Revision  ChangesPath
  No   revision
  No   revision
  1.7.2.4   +2 -3  ant/src/main/org/apache/tools/ant/taskdefs/MacroDef.java
  
  Index: MacroDef.java
  ===
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/MacroDef.java,v
  retrieving revision 1.7.2.3
  retrieving revision 1.7.2.4
  diff -u -r1.7.2.3 -r1.7.2.4
  --- MacroDef.java 15 Oct 2003 07:40:32 -  1.7.2.3
  +++ MacroDef.java 31 Oct 2003 09:56:42 -  1.7.2.4
  @@ -96,12 +96,11 @@
*/
   public void addTask(Task nestedTask) {
   if (this.nestedTask != null) {
  -throw new BuildException(Only one sequential/Parallel allowed);
  +throw new BuildException(Only one sequential allowed);
   }
   UnknownElement ue = (UnknownElement) nestedTask;
   if (!ue.getNamespace().equals()
  -|| (!ue.getTag().equals(sequential)
  - !ue.getTag().equals(parallel))) {
  +|| !ue.getTag().equals(sequential)) {
   throw new BuildException(Unsupported tag  + ue.getQName());
   }
   this.nestedTask = ue;
  
  
  
  No   revision
  No   revision
  1.2.2.4   +2 -2  ant/docs/manual/CoreTasks/macrodef.html
  
  Index: macrodef.html
  ===
  RCS file: /home/cvs/ant/docs/manual/CoreTasks/macrodef.html,v
  retrieving revision 1.2.2.3
  retrieving revision 1.2.2.4
  diff -u -r1.2.2.3 -r1.2.2.4
  --- macrodef.html 14 Oct 2003 09:59:49 -  1.2.2.3
  +++ macrodef.html 31 Oct 2003 09:56:42 -  1.2.2.4
  @@ -11,11 +11,11 @@
   h2a name=macrodefMacroDef/a/h2
   h3Description/h3
   p
  -  This defines a new task using a lt;sequentialgt; or lt;parallelgt;
  +  This defines a new task using a lt;sequentialgt; 
 nested task as a template. Nested elements lt;attributegt; and
 lt;elementgt; are used to specify attributes and elements of
 the new task. These get substituted into the  lt;sequentialgt;
  -  or lt;parallelgt; task when the new task is run.
  +  task when the new task is run.
   /p
   p
 emsince Ant 1.6/em
  
  
  

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

cvs commit: ant/docs/manual/CoreTasks macrodef.html

2003-08-15 Thread peterreilly 
peterreilly2003/08/15 02:33:45

  Modified:src/main/org/apache/tools/ant/taskdefs MacroDef.java
MacroInstance.java
   src/etc/testcases/taskdefs macrodef.xml
   src/testcases/org/apache/tools/ant/taskdefs
MacroDefTest.java
   docs/manual/CoreTasks macrodef.html
  Log:
  macrodef changes:
   * change nested element name from param to attribute
 (now the same as scriptdef)
   * expermintal testing for @attribute notation - controlled
 by an attributeStyle attribute
   * checking if correct attribute/element names are used
   * samedefinition method overloaded
  
  Revision  ChangesPath
  1.3   +108 -15   ant/src/main/org/apache/tools/ant/taskdefs/MacroDef.java
  
  Index: MacroDef.java
  ===
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/MacroDef.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- MacroDef.java 14 Aug 2003 13:22:24 -  1.2
  +++ MacroDef.java 15 Aug 2003 09:33:45 -  1.3
  @@ -68,6 +68,8 @@
   import org.apache.tools.ant.TaskContainer;
   import org.apache.tools.ant.UnknownElement;
   
  +import org.apache.tools.ant.types.EnumeratedAttribute;
  +
   /**
* Describe class codeMacroDef/code here.
*
  @@ -78,9 +80,10 @@
   private UnknownElement nestedTask;
   private String name;
   private String componentName;
  -private List   params = new ArrayList();
  +private List   attributes = new ArrayList();
   private Mapelements = new HashMap();
  -private String uri;
  +private String uri;
  +private intattributeStyle = AttributeStyle.ANT;
   
   /**
* Name of the definition
  @@ -106,6 +109,46 @@
   }
   
   /**
  + * Enumerated type for attributeStyle attribute
  + *
  + * @see EnumeratedAttribute
  + */
  +public static class AttributeStyle extends EnumeratedAttribute {
  +/** Enumerated values */
  +public static final int ANT = 0, XPATH = 1;
  +
  +/**
  + * get the values
  + * @return an array of the allowed values for this attribute.
  + */
  +public String[] getValues() {
  +return new String[] {ant, xpath};
  +}
  +}
  +
  +/**
  + * emExpermential/em
  + * I am uncertain at the moment how to encode attributes
  + * using ant style ${attribute} or xpath style @attribute.
  + * The first may get mixed up with ant properties and
  + * the second may get mixed up with xpath.
  + * The default at the moment is ant s
  + *
  + * @param style an codeAttributeStyle/code value
  + */
  +public void setAttributeStyle(AttributeStyle style) {
  +attributeStyle = style.getIndex();
  +}
  +
  +/**
  + * emExpermential/em
  + * @return the attribute style
  + */
  +public int getAttributeStyle() {
  +return attributeStyle;
  +}
  +
  +/**
* Set the class loader.
* Not used
* @param classLoader a codeClassLoader/code value
  @@ -139,10 +182,10 @@
   }
   
   /**
  - * @return the nested Params
  + * @return the nested Attributes
*/
  -public List getParams() {
  -return params;
  +public List getAttributes() {
  +return attributes;
   }
   
   /**
  @@ -153,16 +196,46 @@
   }
   
   /**
  - * Add a param element.
  + * Check if a character is a valid character for an element or
  + * attribute name
  + * @param c the character to check
  + * @return true if the character is a letter or digit or '.' or '-'
  + * attribute name
  + */
  +public static boolean isValidNameCharacter(char c) {
  +// ? is there an xml api for this ?
  +return Character.isLetterOrDigit(c) || c == '.' || c == '-';
  +}
  +
  +/**
  + * Check if a string is a valid name for an element or
  + * attribute
  + * @param name the string to check
  + * @return true if the name consists of valid name characters
  + */
  +private static boolean isValidName(String name) {
  +if (name.length() == 0) {
  +return false;
  +}
  +for (int i = 0; i  name.length(); ++i) {
  +if (!isValidNameCharacter(name.charAt(i))) {
  +return false;
  +}
  +}
  +return true;
  +}
  +
  +/**
  + * Add an attribute element.
*
  - * @param param a param nested element.
  + * @param attribute an attribute nested element.
*/
  -public void addConfiguredParam(Param param) {
  -if (param.getName() == null) {
  +public void addConfiguredAttribute(Attribute attribute) {
  +if (attribute.getName() == null) {