Return-Path: Delivered-To: apmail-ant-dev-archive@www.apache.org Received: (qmail 75145 invoked from network); 28 Nov 2003 09:29:19 -0000 Received: from daedalus.apache.org (HELO mail.apache.org) (208.185.179.12) by minotaur-2.apache.org with SMTP; 28 Nov 2003 09:29:19 -0000 Received: (qmail 62892 invoked by uid 500); 28 Nov 2003 09:28:52 -0000 Delivered-To: apmail-ant-dev-archive@ant.apache.org Received: (qmail 62847 invoked by uid 500); 28 Nov 2003 09:28:52 -0000 Mailing-List: contact dev-help@ant.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Subscribe: List-Help: List-Post: List-Id: "Ant Developers List" Reply-To: "Ant Developers List" Delivered-To: mailing list dev@ant.apache.org Received: (qmail 62834 invoked by uid 500); 28 Nov 2003 09:28:52 -0000 Received: (qmail 62830 invoked from network); 28 Nov 2003 09:28:52 -0000 Received: from unknown (HELO minotaur.apache.org) (209.237.227.194) by daedalus.apache.org with SMTP; 28 Nov 2003 09:28:52 -0000 Received: (qmail 75114 invoked by uid 1539); 28 Nov 2003 09:29:16 -0000 Date: 28 Nov 2003 09:29:16 -0000 Message-ID: <20031128092916.75113.qmail@minotaur.apache.org> From: peterreilly@apache.org To: ant-cvs@apache.org Subject: cvs commit: ant/src/main/org/apache/tools/ant/taskdefs Concat.java X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N peterreilly 2003/11/28 01:29:16 Modified: src/main/org/apache/tools/ant/taskdefs Tag: ANT_16_BRANCH Concat.java Log: sync with head Revision Changes Path No revision No revision 1.28.2.1 +3 -2 ant/src/main/org/apache/tools/ant/taskdefs/Concat.java Index: Concat.java =================================================================== RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Concat.java,v retrieving revision 1.28 retrieving revision 1.28.2.1 diff -u -r1.28 -r1.28.2.1 --- Concat.java 13 Sep 2003 12:58:33 -0000 1.28 +++ Concat.java 28 Nov 2003 09:29:16 -0000 1.28.2.1 @@ -73,6 +73,7 @@ import org.apache.tools.ant.BuildException; import org.apache.tools.ant.DirectoryScanner; import org.apache.tools.ant.Project; +import org.apache.tools.ant.ProjectComponent; import org.apache.tools.ant.Task; import org.apache.tools.ant.filters.util.ChainReaderHelper; import org.apache.tools.ant.types.FileList; @@ -573,7 +574,7 @@ /** * sub element points to a file or contains text */ - public static class TextElement { + public static class TextElement extends ProjectComponent { private String value = ""; private boolean trimLeading = false; private boolean trim = false; @@ -645,7 +646,7 @@ * @param value the text to place inline */ public void addText(String value) { - this.value += value; + this.value += getProject().replaceProperties(value); } /** --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org For additional commands, e-mail: dev-help@ant.apache.org