You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@ant.apache.org by ru...@locus.apache.org on 2000/06/18 14:24:48 UTC
cvs commit: jakarta-ant/src/main/org/apache/tools/ant/taskdefs CompileTask.java Taskdef.java defaults.properties
rubys 00/06/18 05:24:47
Modified: src/main/org/apache/tools/ant/taskdefs Taskdef.java
defaults.properties
Added: src/main/org/apache/tools/ant/taskdefs CompileTask.java
Log:
Add a test which will compile and load a task definition.
Revision Changes Path
1.5 +4 -0 jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Taskdef.java
Index: Taskdef.java
===================================================================
RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Taskdef.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Taskdef.java 2000/03/02 20:40:04 1.4
+++ Taskdef.java 2000/06/18 12:24:47 1.5
@@ -101,6 +101,10 @@
value = v;
}
+ public String getClassname() {
+ return value;
+ }
+
public void setClassname(String v) {
value = v;
}
1.12 +1 -0 jakarta-ant/src/main/org/apache/tools/ant/taskdefs/defaults.properties
Index: defaults.properties
===================================================================
RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/defaults.properties,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- defaults.properties 2000/05/24 14:35:22 1.11
+++ defaults.properties 2000/06/18 12:24:47 1.12
@@ -29,6 +29,7 @@
filter=org.apache.tools.ant.taskdefs.Filter
fixcrlf=org.apache.tools.ant.taskdefs.FixCRLF
rename=org.apache.tools.ant.taskdefs.Rename
+compileTask==org.apache.tools.ant.taskdefs.CompileTask
# optional tasks
script=org.apache.tools.ant.taskdefs.optional.Script
1.1 jakarta-ant/src/main/org/apache/tools/ant/taskdefs/CompileTask.java
Index: CompileTask.java
===================================================================
/*
* The Apache Software License, Version 1.1
*
* Copyright (c) 1999 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", "Tomcat", 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 java.util.*;
/**
* This task will compile and load a new taskdef all in one step.
* At times, this is useful for eliminating ordering dependencies
* which otherwise would require multiple executions of Ant.
*
* @author Sam Ruby <a href="mailto:rubys@us.ibm.com">rubys@us.ibm.com</a>
*/
public class CompileTask extends Javac {
protected Vector taskList = new Vector();
/**
* add a new task entry on the task list
*/
public Taskdef createTaskdef() {
Taskdef task = new Taskdef();
taskList.addElement(task);
return task;
}
/**
* do all the real work in init
*/
public void init() {
// create all the include entries from the task defs
for (Enumeration e=taskList.elements(); e.hasMoreElements(); ) {
Taskdef task = (Taskdef)e.nextElement();
String source = task.getClassname().replace('.','/') + ".java";
MatchingTask.NameEntry include = super.createInclude();
include.setName("**/" + source);
}
// execute Javac
super.init();
super.execute();
// now define all the new tasks
for (Enumeration e=taskList.elements(); e.hasMoreElements(); ) {
Taskdef task = (Taskdef)e.nextElement();
task.init();
}
}
/**
* have execute do nothing
*/
public void execute() {
}
}
RE: cvs commit: jakarta-ant/src/main/org/apache/tools/ant/taskdefs CompileTask.java Taskdef.java defaults.properties
Posted by Conor MacNeill <co...@m64.com>.
Sam,
> --- defaults.properties 2000/05/24 14:35:22 1.11
> +++ defaults.properties 2000/06/18 12:24:47 1.12
> @@ -29,6 +29,7 @@
> filter=org.apache.tools.ant.taskdefs.Filter
> fixcrlf=org.apache.tools.ant.taskdefs.FixCRLF
> rename=org.apache.tools.ant.taskdefs.Rename
> +compileTask==org.apache.tools.ant.taskdefs.CompileTask
Was the "==" intentional. I"m guessing a typo but just wanted to check.
Conor