ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anto...@apache.org
Subject cvs commit: ant/xdocs/stylesheets site.vsl templates.vm
Date Mon, 09 Feb 2004 21:11:58 GMT
antoine     2004/02/09 13:11:58

  Modified:    .        LICENSE
               docs     LICENSE
               proposal/xdocs build.xml
               proposal/xdocs/dvsl build.xml task.dvsl
               proposal/xdocs/dvsl/lib velocity-dvsl-0.42.jar
               proposal/xdocs/src/org/apache/tools/ant/taskdefs
                        Property.xml SubAnt.xml
               xdocs/stylesheets site.vsl templates.vm
  Log:
  Copyright owner The Apache Software Foundation
  
  Revision  Changes    Path
  1.6       +1 -1      ant/LICENSE
  
  Index: LICENSE
  ===================================================================
  RCS file: /home/cvs/ant/LICENSE,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- LICENSE	2 Feb 2004 19:30:05 -0000	1.5
  +++ LICENSE	9 Feb 2004 21:11:58 -0000	1.6
  @@ -187,7 +187,7 @@
    *      same "printed page" as the copyright notice for easier
    *      identification within third-party archives.
    *
  - *   Copyright [yyyy] Apache Software Foundation
  + *   Copyright [yyyy] [name of copyright owner]
    *
    *   Licensed under the Apache License, Version 2.0 (the "License");
    *   you may not use this file except in compliance with the License.
  
  
  
  1.3       +1 -1      ant/docs/LICENSE
  
  Index: LICENSE
  ===================================================================
  RCS file: /home/cvs/ant/docs/LICENSE,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- LICENSE	6 Feb 2004 14:26:10 -0000	1.2
  +++ LICENSE	9 Feb 2004 21:11:58 -0000	1.3
  @@ -187,7 +187,7 @@
    *      same "printed page" as the copyright notice for easier
    *      identification within third-party archives.
    *
  - *   Copyright [yyyy] Apache Software Foundation
  + *   Copyright [yyyy] [name of copyright owner]
    *
    *   Licensed under the Apache License, Version 2.0 (the "License");
    *   you may not use this file except in compliance with the License.
  
  
  
  1.25      +4 -1      ant/proposal/xdocs/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/ant/proposal/xdocs/build.xml,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- build.xml	15 Sep 2003 09:14:14 -0000	1.24
  +++ build.xml	9 Feb 2004 21:11:58 -0000	1.25
  @@ -408,7 +408,10 @@
         <fileset dir="lib" includes="*.jar"/>
       </path>
       <path>
  -      <fileset dir="${ant.home}/lib" includes="*.jar"/>
  +      <!-- <fileset dir="${ant.home}/lib" includes="*.jar"/> -->
  +      <fileset dir="../../lib" includes="*.jar"/>
  +      <fileset dir="../../lib/optional" includes="*.jar"/>
  +      <pathelement location="../../build/classes"/>
       </path>
     </path>
   
  
  
  
  1.4       +1 -1      ant/proposal/xdocs/dvsl/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/ant/proposal/xdocs/dvsl/build.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- build.xml	17 Dec 2003 21:21:38 -0000	1.3
  +++ build.xml	9 Feb 2004 21:11:58 -0000	1.4
  @@ -36,7 +36,7 @@
       <dvsl basedir="${taskdocs.src}" destdir="${manual.dest}"
             style="task.dvsl" extension=".html"
             toolboxfile="toolbox.props"
  -          includes="**/*.xml">
  +          includes="property/property.xml">
         <velconfig name="velocimacro.library" value="" />
       </dvsl>
     </target>
  
  
  
  1.7       +9 -1      ant/proposal/xdocs/dvsl/task.dvsl
  
  Index: task.dvsl
  ===================================================================
  RCS file: /home/cvs/ant/proposal/xdocs/dvsl/task.dvsl,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- task.dvsl	12 Dec 2003 09:45:05 -0000	1.6
  +++ task.dvsl	9 Feb 2004 21:11:58 -0000	1.7
  @@ -463,6 +463,7 @@
             </td>
             <td bgcolor="#ffffff" height="1">
             <font size="$source-font-size"><pre>$toolbox.htmlescape.getText(
$node.value() )</pre></font>
  +#*      *#$context.applyTemplates("*")
             </td>
             <td bgcolor="$source-color" width="1">
               <img src="/images/void.gif" width="1" height="1" vspace="0" hspace="0" border="0"/>
  @@ -482,7 +483,14 @@
         </table>
       </div>
   #end
  -
  +#match("ant:*")
  +&lt;$node.name()
  +#foreach ( $item in $node.getAttributes() )
  +  $item.=$qq$node.getAttributeValue($item)$qq
  +#end
  +&gt;
  +&lt;$node.name()/&gt;
  +#end
   
   #match("table")
   <table>
  
  
  
  1.2       +7 -7      ant/proposal/xdocs/dvsl/lib/velocity-dvsl-0.42.jar
  
  	<<Binary file>>
  
  
  1.3       +18 -18    ant/proposal/xdocs/src/org/apache/tools/ant/taskdefs/Property.xml
  
  Index: Property.xml
  ===================================================================
  RCS file: /home/cvs/ant/proposal/xdocs/src/org/apache/tools/ant/taskdefs/Property.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Property.xml	17 Dec 2003 22:13:25 -0000	1.2
  +++ Property.xml	9 Feb 2004 21:11:58 -0000	1.3
  @@ -1,5 +1,5 @@
   <!-- property task -->
  -<external>
  +<external xmlns:ant="http://ant.apache.org">
   <description>
   
   <p>Sets a property (by name and value), or set of properties (from file or resource)
in the project.</p>
  @@ -26,23 +26,23 @@
   </description>
   
   <section anchor="examples" name="Examples">
  -    <source><![CDATA[
  -    <property name="foo.dist" value="dist"/>
  -        ]]></source>
  +    <source>
  +    <ant:property name="foo.dist" value="dist"/>
  +        </source>
   <p>sets the property <code>foo.dist</code> to the value &quot;dist&quot;.</p>
  -    <source><![CDATA[
  -    <property file="foo.properties"/>
  -        ]]></source>
  +    <source>
  +    <ant:property file="foo.properties"/>
  +        </source>
   <p>reads a set of properties from a file called &quot;foo.properties&quot;.</p>
  -    <source><![CDATA[
  -    <property resource="foo.properties"/>
  -        ]]></source>
  +    <source>
  +    <ant:property resource="foo.properties"/>
  +       </source>
   <p>reads a set of properties from a resource called &quot;foo.properties&quot;.</p>
   <p>Note that you can reference a global properties file for all of your Ant
   builds using the following:</p>
  -    <source><![CDATA[
  -    <property file="${user.home}/.ant-global.properties"/>
  -        ]]></source>
  +    <source>
  +    <ant:property file="${user.home}/.ant-global.properties"/>
  +        </source>
   <p>since the &quot;user.home&quot; property is defined by the Java virtual
machine
   to be your home directory.  Where the &quot;user.home&quot; property resolves to
in
   the file system depends on the operating system version and the JVM implementation.
  @@ -51,11 +51,11 @@
   and Settings&quot; folder. Older windows variants such as Windows 98/ME are less 
   predictable, as are other operating system/JVM combinations.</p>
   
  -<source><![CDATA[
  -  <property environment="env">
  -  <echo message="Number of Processors = ${env.NUMBER_OF_PROCESSORS}">
  -  <echo message="ANT_HOME is set to = ${env.ANT_HOME}">
  -]]></source>
  +<source>
  +  <ant:property environment="env"/>
  +  <ant:echo message="Number of Processors = ${env.NUMBER_OF_PROCESSORS}"/>
  +  <ant:echo message="ANT_HOME is set to = ${env.ANT_HOME}"/>
  +</source>
   <p>reads the system environment variables and stores them in properties, prefixed
with &quot;env&quot;.
   Note that this only works on <em>select</em> operating systems.
   Two of the values are shown being echoed. 
  
  
  
  1.8       +4 -1      ant/proposal/xdocs/src/org/apache/tools/ant/taskdefs/SubAnt.xml
  
  Index: SubAnt.xml
  ===================================================================
  RCS file: /home/cvs/ant/proposal/xdocs/src/org/apache/tools/ant/taskdefs/SubAnt.xml,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- SubAnt.xml	12 Dec 2003 10:14:26 -0000	1.7
  +++ SubAnt.xml	9 Feb 2004 21:11:58 -0000	1.8
  @@ -26,7 +26,10 @@
           </subsection>
        </description>
       <section anchor="examples" name="Examples">
  -        <pre>
  +                <source><![CDATA[
  +shell-prompt> m4 foo.m4 > foo
  +]]></source>
  +<pre>
           &lt;project name="subant" default="subant1"&gt;
           &lt;property name="build.dir" value="subant.build"/&gt;
           &lt;target name="subant1"&gt;
  
  
  
  1.10      +1 -1      ant/xdocs/stylesheets/site.vsl
  
  Index: site.vsl
  ===================================================================
  RCS file: /home/cvs/ant/xdocs/stylesheets/site.vsl,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- site.vsl	6 Feb 2004 14:55:46 -0000	1.9
  +++ site.vsl	9 Feb 2004 21:11:58 -0000	1.10
  @@ -1,5 +1,5 @@
   #* 
  - * Copyright  2003-2004 Apache Software Foundation
  + * Copyright  2003-2004 The Apache Software Foundation
    *
    *  Licensed under the Apache License, Version 2.0 (the "License");
    *  you may not use this file except in compliance with the License.
  
  
  
  1.32      +1 -1      ant/xdocs/stylesheets/templates.vm
  
  Index: templates.vm
  ===================================================================
  RCS file: /home/cvs/ant/xdocs/stylesheets/templates.vm,v
  retrieving revision 1.31
  retrieving revision 1.32
  diff -u -r1.31 -r1.32
  --- templates.vm	6 Feb 2004 14:55:46 -0000	1.31
  +++ templates.vm	9 Feb 2004 21:11:58 -0000	1.32
  @@ -1,5 +1,5 @@
   #* 
  - * Copyright  2000-2004 Apache Software Foundation
  + * Copyright  2000-2004 The Apache Software Foundation
    *
    *  Licensed under the Apache License, Version 2.0 (the "License");
    *  you may not use this file except in compliance with the License.
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org
For additional commands, e-mail: dev-help@ant.apache.org


Mime
View raw message