From 33c177007498d897fba047c6af7c62024a8e2438 Mon Sep 17 00:00:00 2001 From: Antoine Levy-Lambert Date: Mon, 9 Feb 2004 21:11:58 +0000 Subject: [PATCH] Copyright owner The Apache Software Foundation git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@276066 13f79535-47bb-0310-9956-ffa450edef68 --- LICENSE | 2 +- docs/LICENSE | 2 +- proposal/xdocs/build.xml | 5 ++- proposal/xdocs/dvsl/build.xml | 2 +- .../xdocs/dvsl/lib/velocity-dvsl-0.42.jar | Bin 49507 -> 49491 bytes proposal/xdocs/dvsl/task.dvsl | 10 ++++- .../apache/tools/ant/taskdefs/Property.xml | 36 +++++++++--------- .../org/apache/tools/ant/taskdefs/SubAnt.xml | 5 ++- xdocs/stylesheets/site.vsl | 2 +- xdocs/stylesheets/templates.vm | 2 +- 10 files changed, 40 insertions(+), 26 deletions(-) diff --git a/LICENSE b/LICENSE index ccaa0989f..f820d4bd3 100644 --- a/LICENSE +++ b/LICENSE @@ -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. diff --git a/docs/LICENSE b/docs/LICENSE index ccaa0989f..f820d4bd3 100644 --- a/docs/LICENSE +++ b/docs/LICENSE @@ -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. diff --git a/proposal/xdocs/build.xml b/proposal/xdocs/build.xml index c39278ffa..5be8df790 100644 --- a/proposal/xdocs/build.xml +++ b/proposal/xdocs/build.xml @@ -408,7 +408,10 @@ - + + + + diff --git a/proposal/xdocs/dvsl/build.xml b/proposal/xdocs/dvsl/build.xml index 00e947c16..939884cad 100644 --- a/proposal/xdocs/dvsl/build.xml +++ b/proposal/xdocs/dvsl/build.xml @@ -36,7 +36,7 @@ + includes="property/property.xml"> diff --git a/proposal/xdocs/dvsl/lib/velocity-dvsl-0.42.jar b/proposal/xdocs/dvsl/lib/velocity-dvsl-0.42.jar index 2fcc8af7bd30c8f66020d1cf5a3baf1ee01f2f42..5662ec4da848851e3dbe5b0c54206cb6f732cb19 100644 GIT binary patch delta 185 zcmaFd#C*AldBf2almEs_P3}1$y7~6X-@KyCEFugH3>*xFt0wAuE)_NJ0`k60-Y+6M z`TmNfER0Md43j4?if#U|ottBF!~v+9lX$N>SGKn!@F&$`wJ`jTdBZC5vd^=h3pyXuz1JWX_Y#>oNAgttMU^ucJ G!~+2Av^Tc^ delta 145 zcmccI#QeC4dBf2alMjhVP0nHBoUD6LV6xTr9v*fM&!wW~T?`BiUl=Aoj5XVQe}w=a z3nP;V!{iB!Vw)dq=jNFF;eg2G|N9l7`h+Im-LJtkY31aJOcImj57;w_uLm>lZRMPt kyN+XW=K(FIiQAw;!eRm5tZYEj8RUSll9Peq%61SB0P1NojsO4v diff --git a/proposal/xdocs/dvsl/task.dvsl b/proposal/xdocs/dvsl/task.dvsl index 6176331e4..782232ec7 100644 --- a/proposal/xdocs/dvsl/task.dvsl +++ b/proposal/xdocs/dvsl/task.dvsl @@ -463,6 +463,7 @@ $word.substring(0,1).toUpperCase()$word.substring(1) 
$toolbox.htmlescape.getText( $node.value() )
 +#* *#$context.applyTemplates("*") @@ -482,7 +483,14 @@ $word.substring(0,1).toUpperCase()$word.substring(1) #end - +#match("ant:*") +<$node.name() +#foreach ( $item in $node.getAttributes() ) + $item.=$qq$node.getAttributeValue($item)$qq +#end +> +<$node.name()/> +#end #match("table") diff --git a/proposal/xdocs/src/org/apache/tools/ant/taskdefs/Property.xml b/proposal/xdocs/src/org/apache/tools/ant/taskdefs/Property.xml index 29e2f2dca..a64fa6e9a 100644 --- a/proposal/xdocs/src/org/apache/tools/ant/taskdefs/Property.xml +++ b/proposal/xdocs/src/org/apache/tools/ant/taskdefs/Property.xml @@ -1,5 +1,5 @@ - +

Sets a property (by name and value), or set of properties (from file or resource) in the project.

@@ -26,23 +26,23 @@
- - ]]> + + +

sets the property foo.dist to the value "dist".

- - ]]> + + +

reads a set of properties from a file called "foo.properties".

- - ]]> + + +

reads a set of properties from a resource called "foo.properties".

Note that you can reference a global properties file for all of your Ant builds using the following:

- - ]]> + + +

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 @@ variants, this will most likely resolve to the user's directory in the "Doc and Settings" folder. Older windows variants such as Windows 98/ME are less predictable, as are other operating system/JVM combinations.

- - - -]]> + + + + +

reads the system environment variables and stores them in properties, prefixed with "env". Note that this only works on select operating systems. Two of the values are shown being echoed. diff --git a/proposal/xdocs/src/org/apache/tools/ant/taskdefs/SubAnt.xml b/proposal/xdocs/src/org/apache/tools/ant/taskdefs/SubAnt.xml index 6a268f0af..b79f89a2a 100644 --- a/proposal/xdocs/src/org/apache/tools/ant/taskdefs/SubAnt.xml +++ b/proposal/xdocs/src/org/apache/tools/ant/taskdefs/SubAnt.xml @@ -26,7 +26,10 @@

- 
+                 m4 foo.m4 > foo
+]]>
+
         <project name="subant" default="subant1">
         <property name="build.dir" value="subant.build"/>
         <target name="subant1">
diff --git a/xdocs/stylesheets/site.vsl b/xdocs/stylesheets/site.vsl
index fb82f25ea..d4bce057e 100644
--- a/xdocs/stylesheets/site.vsl
+++ b/xdocs/stylesheets/site.vsl
@@ -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.
diff --git a/xdocs/stylesheets/templates.vm b/xdocs/stylesheets/templates.vm
index 66a522d74..c9c3955ff 100644
--- a/xdocs/stylesheets/templates.vm
+++ b/xdocs/stylesheets/templates.vm
@@ -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.