costin 2002/10/14 12:55:14
Modified: proposal/embed test.xml
proposal/embed/src/java/org/apache/tools/ant
RuntimeConfigurable2.java
Log:
Revert the property replacement in text.
Added a note on the bug in import ( not very important, but should
be fixed ).
Revision Changes Path
1.6 +7 -3 jakarta-ant/proposal/embed/test.xml
Index: test.xml
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/embed/test.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- test.xml 11 Oct 2002 18:20:25 -0000 1.5
+++ test.xml 14 Oct 2002 19:55:13 -0000 1.6
@@ -2,8 +2,12 @@
<property name="ant.src" location="../.."/>
<import file="build.xml"/>
-
- <echo>Base.path from build.xml ( in top level ): ${base.path}</echo>
+
+ <!-- This is a tricky problem: import will append tasks at the
+ end of the task list. That's a bug, it should replace the
+ <import> task with the content. When fixed, this should show
+ the real value. -->
+ <echo message="Base.path from build.xml ( in top level ): ${base.path}"/>
<target name="init">
<property name="junit.jar" location="${base.path}/junit3.7/junit.jar"/>
@@ -84,7 +88,7 @@
<echo message="jxPath /references/myJars: ${jxpath:/references/myJars}"
/>
<!-- This is XMLDOM.java - a datatype that holds an xml DOM -->
- <typedef name="xmldom" classname="org.apache.tools.ant.types.XMLDOM"/>
+ <typedef name="xmldom" classname="org.apache.tools.ant.taskdefs.XMLDOM"/>
<!-- Init XMLDOM. The DOM of file test.xml will be referenced via the
id-->
<xmldom id="test.xml" file="test.xml"/>
1.3 +3 -3
jakarta-ant/proposal/embed/src/java/org/apache/tools/ant/RuntimeConfigurable2.java
Index: RuntimeConfigurable2.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/embed/src/java/org/apache/tools/ant/RuntimeConfigurable2.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- RuntimeConfigurable2.java 11 Oct 2002 18:06:26 -0000 1.2
+++ RuntimeConfigurable2.java 14 Oct 2002 19:55:13 -0000 1.3
@@ -261,10 +261,10 @@
}
if (characters.length() != 0) {
- // First do substitution. This allows <echo>Message</echo> to
work
- // like <echo message="..." />. And it's more fun.
+// // First do substitution. This allows <echo>Message</echo> to
work
+// // like <echo message="..." />. And it's more fun.
String txt=characters.toString();
- txt=ph.replaceProperties( txt );
+// txt=ph.replaceProperties( txt );
ProjectHelper.addText(p, wrappedObject, txt);
characters.setLength(0);
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
