You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@ant.apache.org by co...@apache.org on 2002/10/18 23:50:32 UTC
cvs commit: jakarta-ant/proposal/embed/src/java/org/apache/tools/ant/taskdefs Description.java
costin 2002/10/18 14:50:32
Modified: proposal/embed build.xml test.xml
proposal/embed/src/java/org/apache/tools/ant/helper
ProjectHelperImpl2.java
Added: proposal/embed/src/java/org/apache/tools/ant/taskdefs
Description.java
Log:
Description implementation ( as a regular task ).
Revision Changes Path
1.5 +1 -0 jakarta-ant/proposal/embed/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/embed/build.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- build.xml 11 Oct 2002 18:20:25 -0000 1.4
+++ build.xml 18 Oct 2002 21:50:31 -0000 1.5
@@ -1,4 +1,5 @@
<project name="embed" default="main" basedir=".">
+ <description>Embed proposal</description>
<property file="${user.home}/build.properties" />
<property name="base.path" location="/usr/share/java"/>
1.7 +1 -1 jakarta-ant/proposal/embed/test.xml
Index: test.xml
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/embed/test.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- test.xml 14 Oct 2002 19:55:13 -0000 1.6
+++ test.xml 18 Oct 2002 21:50:31 -0000 1.7
@@ -1,6 +1,6 @@
<project name="embed-test" default="main" basedir=".">
<property name="ant.src" location="../.."/>
-
+ <description>Test for embed proposal</description>
<import file="build.xml"/>
<!-- This is a tricky problem: import will append tasks at the
1.5 +3 -1 jakarta-ant/proposal/embed/src/java/org/apache/tools/ant/helper/ProjectHelperImpl2.java
Index: ProjectHelperImpl2.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/embed/src/java/org/apache/tools/ant/helper/ProjectHelperImpl2.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ProjectHelperImpl2.java 11 Oct 2002 18:12:59 -0000 1.4
+++ ProjectHelperImpl2.java 18 Oct 2002 21:50:31 -0000 1.5
@@ -103,6 +103,8 @@
try {
Class c=Class.forName("org.apache.tools.ant.taskdefs.SystemPath");
project.addTaskDefinition( "systemPath" , c );
+ c=Class.forName("org.apache.tools.ant.taskdefs.Description");
+ project.addTaskDefinition( "description" , c );
c=Class.forName("org.apache.tools.ant.taskdefs.Import");
project.addTaskDefinition( "import" , c );
c=Class.forName("org.apache.tools.ant.taskdefs.Taskdef2");
@@ -142,7 +144,6 @@
AntXmlContext context=handler.context;
- System.err.println("Parsing with PH2: " + source );
if(source instanceof File) {
context.buildFile=(File)source;
// } else if( source instanceof InputStream ) {
@@ -173,6 +174,7 @@
inputStream = new FileInputStream(context.buildFile);
inputSource = new InputSource(inputStream);
inputSource.setSystemId(uri);
+ System.err.println("Parsing with PH2: " + context.buildFile);
project.log("parsing buildfile " + context.buildFile + " with URI = " + uri, Project.MSG_VERBOSE);
DefaultHandler hb = handler;
1.1 jakarta-ant/proposal/embed/src/java/org/apache/tools/ant/taskdefs/Description.java
Index: Description.java
===================================================================
/*
* The Apache Software License, Version 1.1
*
* Copyright (c) 2000-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* 3. The end-user documentation included with the redistribution, if
* any, must include the following acknowlegement:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowlegement may appear in the software itself,
* if and wherever such third-party acknowlegements normally appear.
*
* 4. The names "The Jakarta Project", "Ant", and "Apache Software
* Foundation" must not be used to endorse or promote products derived
* from this software without prior written permission. For written
* permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache"
* nor may "Apache" appear in their names without prior written
* permission of the Apache Group.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*/
package org.apache.tools.ant.taskdefs;
import org.apache.tools.ant.*;
import org.apache.tools.ant.types.*;
import java.io.*;
import java.util.*;
/**
* Description task. If top level tasks are executed during processing, import
* and description can be regular tasks, with no need for special code in processor.
*
* ( this only works for top-level descr. AFAIK that's how it works in ant1.5 )
* If this would be extended for <description> elements in targets - a special
* construct would be needed to mark this as 'parsing time' task.
*
* @author Costin Manolache
*/
public class Description extends Task {
String descr;
public Description() {
}
public String getDescription() {
return descr;
}
public void addText( String text ) {
this.descr=text;
}
public void execute() throws BuildException {
project.setDescription( descr );
}
}
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>