antoine 2004/02/09 13:29:18
Modified: 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
Log:
restoring files committed by mistake
Revision Changes Path
1.26 +1 -4 ant/proposal/xdocs/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/ant/proposal/xdocs/build.xml,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- build.xml 9 Feb 2004 21:11:58 -0000 1.25
+++ build.xml 9 Feb 2004 21:29:18 -0000 1.26
@@ -408,10 +408,7 @@
<fileset dir="lib" includes="*.jar"/>
</path>
<path>
- <!-- <fileset dir="${ant.home}/lib" includes="*.jar"/> -->
- <fileset dir="../../lib" includes="*.jar"/>
- <fileset dir="../../lib/optional" includes="*.jar"/>
- <pathelement location="../../build/classes"/>
+ <fileset dir="${ant.home}/lib" includes="*.jar"/>
</path>
</path>
1.5 +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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- build.xml 9 Feb 2004 21:11:58 -0000 1.4
+++ build.xml 9 Feb 2004 21:29:18 -0000 1.5
@@ -36,7 +36,7 @@
<dvsl basedir="${taskdocs.src}" destdir="${manual.dest}"
style="task.dvsl" extension=".html"
toolboxfile="toolbox.props"
- includes="property/property.xml">
+ includes="**/*.xml">
<velconfig name="velocimacro.library" value="" />
</dvsl>
</target>
1.8 +1 -9 ant/proposal/xdocs/dvsl/task.dvsl
Index: task.dvsl
===================================================================
RCS file: /home/cvs/ant/proposal/xdocs/dvsl/task.dvsl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- task.dvsl 9 Feb 2004 21:11:58 -0000 1.7
+++ task.dvsl 9 Feb 2004 21:29:18 -0000 1.8
@@ -463,7 +463,6 @@
</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"/>
@@ -483,14 +482,7 @@
</table>
</div>
#end
-#match("ant:*")
-<$node.name()
-#foreach ( $item in $node.getAttributes() )
- $item.=$qq$node.getAttributeValue($item)$qq
-#end
->
-<$node.name()/>
-#end
+
#match("table")
<table>
1.3 +7 -7 ant/proposal/xdocs/dvsl/lib/velocity-dvsl-0.42.jar
<<Binary file>>
1.4 +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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Property.xml 9 Feb 2004 21:11:58 -0000 1.3
+++ Property.xml 9 Feb 2004 21:29:18 -0000 1.4
@@ -1,5 +1,5 @@
<!-- property task -->
-<external xmlns:ant="http://ant.apache.org";>
+<external>
<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>
- <ant:property name="foo.dist" value="dist"/>
- </source>
+ <source><![CDATA[
+ <property name="foo.dist" value="dist"/>
+ ]]></source>
<p>sets the property <code>foo.dist</code> to the value "dist".</p>
- <source>
- <ant:property file="foo.properties"/>
- </source>
+ <source><![CDATA[
+ <property file="foo.properties"/>
+ ]]></source>
<p>reads a set of properties from a file called
"foo.properties".</p>
- <source>
- <ant:property resource="foo.properties"/>
- </source>
+ <source><![CDATA[
+ <property resource="foo.properties"/>
+ ]]></source>
<p>reads a set of properties from a resource called
"foo.properties".</p>
<p>Note that you can reference a global properties file for all of your Ant
builds using the following:</p>
- <source>
- <ant:property file="${user.home}/.ant-global.properties"/>
- </source>
+ <source><![CDATA[
+ <property file="${user.home}/.ant-global.properties"/>
+ ]]></source>
<p>since the "user.home" property is defined by the Java virtual
machine
to be your home directory. Where the "user.home" property
resolves to in
the file system depends on the operating system version and the JVM
implementation.
@@ -51,11 +51,11 @@
and Settings" folder. Older windows variants such as Windows 98/ME are
less
predictable, as are other operating system/JVM combinations.</p>
-<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>
+<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>
<p>reads the system environment variables and stores them in properties,
prefixed with "env".
Note that this only works on <em>select</em> operating systems.
Two of the values are shown being echoed.
1.9 +1 -4
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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- SubAnt.xml 9 Feb 2004 21:11:58 -0000 1.8
+++ SubAnt.xml 9 Feb 2004 21:29:18 -0000 1.9
@@ -26,10 +26,7 @@
</subsection>
</description>
<section anchor="examples" name="Examples">
- <source><![CDATA[
-shell-prompt> m4 foo.m4 > foo
-]]></source>
-<pre>
+ <pre>
<project name="subant" default="subant1">
<property name="build.dir" value="subant.build"/>
<target name="subant1">
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
