diff --git a/src/main/org/apache/tools/ant/taskdefs/CallTarget.java b/src/main/org/apache/tools/ant/taskdefs/CallTarget.java new file mode 100644 index 000000000..f223c2428 --- /dev/null +++ b/src/main/org/apache/tools/ant/taskdefs/CallTarget.java @@ -0,0 +1,113 @@ +/* + * 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 + * . + */ + +package org.apache.tools.ant.taskdefs; + +import org.apache.tools.ant.*; + +/** + * Call another target in the same project. + * + *
+ *    
+ *      
+ *        
+ *        
+ *       
+ *    
+ *
+ *    
+ *      
+ *    
+ * 
+ * + *

This only works as expected if neither property1 nor foo are + * defined in the project itself. + * + * + * @author Stefan Bodewig + */ +public class CallTarget extends Task { + + private Ant delegate; + private String subTarget; + + public void init() { + delegate = (Ant) project.createTask("ant"); + delegate.setOwningTarget(target); + delegate.setTaskName(getTaskName()); + delegate.setLocation(location); + delegate.init(); + } + + public void execute() { + if (subTarget == null) { + throw new BuildException("Attribute target is required.", + location); + } + + delegate.setDir("."); + delegate.setAntfile(project.getProperty("ant.file")); + delegate.setTarget(subTarget); + delegate.execute(); + } + + public Property createParam() { + return delegate.createProperty(); + } + + public void setTarget(String target) { + subTarget = target; + } +} diff --git a/src/main/org/apache/tools/ant/taskdefs/defaults.properties b/src/main/org/apache/tools/ant/taskdefs/defaults.properties index 4c978aaa5..ab5987309 100644 --- a/src/main/org/apache/tools/ant/taskdefs/defaults.properties +++ b/src/main/org/apache/tools/ant/taskdefs/defaults.properties @@ -37,6 +37,7 @@ touch=org.apache.tools.ant.taskdefs.Touch signjar=org.apache.tools.ant.taskdefs.SignJar antstructure=org.apache.tools.ant.taskdefs.AntStructure executeon=org.apache.tools.ant.taskdefs.ExecuteOn +antcall=org.apache.tools.ant.taskdefs.CallTarget # optional tasks script=org.apache.tools.ant.taskdefs.optional.Script