bodewig 2003/09/25 06:49:05
Modified: docs/manual/CoreTasks Tag: ANT_16_BRANCH ant.html
antcall.html
src/testcases/org/apache/tools/ant/filters Tag:
ANT_16_BRANCH ConcatFilterTest.java
Log:
Merge from HEAD
Revision Changes Path
No revision
No revision
1.18.2.1 +11 -7 ant/docs/manual/CoreTasks/ant.html
Index: ant.html
===================================================================
RCS file: /home/cvs/ant/docs/manual/CoreTasks/ant.html,v
retrieving revision 1.18
retrieving revision 1.18.2.1
diff -u -r1.18 -r1.18.2.1
--- ant.html 3 Sep 2003 10:03:46 -0000 1.18
+++ ant.html 25 Sep 2003 13:49:04 -0000 1.18.2.1
@@ -20,15 +20,19 @@
<p>If no target attribute is supplied, the default target of the new project
is
used.</p>
<p>By default, all of the properties of the current project will be
-available in the new project. Alternatively, you can
-set the <i>inheritAll</i> attribute to <code>false</code> and only
+available in the new project. Alternatively, you can set the
+<i>inheritAll</i> attribute to <code>false</code> and only
"user" properties (i.e., those passed on the command-line)
will be passed to the new project. In either case, the set of
-properties passed to the new project will override the properties that
-are set in the new project (See also the <a href="property.html">property
task</a>).</p>
-<p>You can also set properties in the new project from the old project by
-using nested property tags. These properties are always passed regardless of
the
-setting of <i>inheritAll</i>. This allows you to parameterize your
subprojects.</p>
+properties passed to the new project will override the properties that
+are set in the new project (See also the <a
+href="property.html">property task</a>).</p>
+
+<p>You can also set properties in the new project from the old project
+by using nested property tags. These properties are always passed
+regardless of the setting of <i>inheritAll</i>. This allows you to
+parameterize your subprojects. Properties defined on the command line
+can not be overridden by nested <property> elements.</p>
<p>References to data types can also be passed to the new project, but
by default they are not. If you set the inheritrefs attribute to
1.18.2.1 +5 -3 ant/docs/manual/CoreTasks/antcall.html
Index: antcall.html
===================================================================
RCS file: /home/cvs/ant/docs/manual/CoreTasks/antcall.html,v
retrieving revision 1.18
retrieving revision 1.18.2.1
diff -u -r1.18 -r1.18.2.1
--- antcall.html 4 Sep 2003 11:45:25 -0000 1.18
+++ antcall.html 25 Sep 2003 13:49:04 -0000 1.18.2.1
@@ -21,9 +21,11 @@
will be passed to the new project. In either case, the set of
properties passed to the new project will override the properties that
are set in the new project (See also the <a href="property.html">property
task</a>).</p>
-<p>You can also set properties in the new project from the old project by
-using nested param tags. These properties are always passed regardless of the
-setting of <i>inheritAll</i>. This allows you to parameterize your
subprojects.</p>
+<p>You can also set properties in the new project from the old project
+by using nested param tags. These properties are always passed
+regardless of the setting of <i>inheritAll</i>. This allows you to
+parameterize your subprojects. Properties defined on the command line
+can not be overridden by nested <param> elements.</p>
<p>Nested <a href="#reference"><i><reference></i></a> elements can
be used to copy references from the calling project to the new
No revision
No revision
1.2.2.3 +1 -1
ant/src/testcases/org/apache/tools/ant/filters/ConcatFilterTest.java
Index: ConcatFilterTest.java
===================================================================
RCS file:
/home/cvs/ant/src/testcases/org/apache/tools/ant/filters/ConcatFilterTest.java,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -u -r1.2.2.2 -r1.2.2.3
--- ConcatFilterTest.java 25 Sep 2003 06:19:51 -0000 1.2.2.2
+++ ConcatFilterTest.java 25 Sep 2003 13:49:05 -0000 1.2.2.3
@@ -187,4 +187,4 @@
return content;
}
-}
\ No newline at end of file
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
