diff --git a/WHATSNEW b/WHATSNEW index 39667a144..eb8e560e5 100644 --- a/WHATSNEW +++ b/WHATSNEW @@ -31,6 +31,10 @@ Changes that could break older environments: * The output generated by the xml formatter for has changed again, it doesn't format the numeric value in the time attribute anymore. +* Pattern matching rules have changes slightly, the pattern foo* + doesn't match files contained in a directory named foo - use foo/* + instead. + Other changes: -------------- @@ -120,6 +124,9 @@ Other changes: * can now optionally set a property on test failure. +* can now define several tasks at once, reading the + name/classname pairs from a property file or resource. + Fixed bugs: ----------- diff --git a/docs/manual/CoreTasks/taskdef.html b/docs/manual/CoreTasks/taskdef.html index ec6250abe..9d24fbed5 100644 --- a/docs/manual/CoreTasks/taskdef.html +++ b/docs/manual/CoreTasks/taskdef.html @@ -13,6 +13,13 @@ used in the current project. Two attributes are needed, the name that identifies this task uniquely, and the full name of the class (including the packages) that implements this task.

+

You can also define a group of tasks at once using the file or +resource attributes. These attributes point to files in the format of +Java property files. Each line defines a single task in the +format:

+
+taskname=fully.qualified.java.classname
+

Taskdef should be used to add your own tasks to the system. See also "Writing your own task".

Parameters

@@ -25,17 +32,32 @@ href="../develop.html#writingowntask">Writing your own task".

name the name of the task - Yes + Yes, unless file or resource have + been specified. classname the full class name implementing the task - Yes + Yes, unless file or resource have + been specified. + + + file + Name of the property file to load + taskname/classname pairs from. + No + + + resource + Name of the property resource to load + taskname/classname pairs from. + No classpath the classpath to - use when looking up classname. No + use when looking up classname or + resource. + No

Parameters specified as nested elements

diff --git a/docs/manual/CoreTasks/typedef.html b/docs/manual/CoreTasks/typedef.html index 00b1d557b..a5c927dce 100644 --- a/docs/manual/CoreTasks/typedef.html +++ b/docs/manual/CoreTasks/typedef.html @@ -14,6 +14,13 @@ new type can be used in the current project. Two attributes are needed, the name that identifies this data type uniquely, and the full name of the class (including the packages) that implements this type.

+

You can also define a group of data types at once using the file or +resource attributes. These attributes point to files in the format of +Java property files. Each line defines a single data type in the +format:

+
+typename=fully.qualified.java.classname
+

Typedef should be used to add your own types to the system. Data types are things like paths or filesets that can be defined at @@ -29,12 +36,26 @@ the project level and referenced via their ID attribute.

name the name of the data type - Yes + Yes, unless file or resource have + been specified. classname the full class name implementing the data type - Yes + Yes, unless file or resource have + been specified. + + + file + Name of the property file to load + typename/classname pairs from. + No + + + resource + Name of the property resource to load + typename/classname pairs from. + No classpath the classpath to diff --git a/src/main/org/apache/tools/ant/taskdefs/Definer.java b/src/main/org/apache/tools/ant/taskdefs/Definer.java index 0bbeb839b..614f87968 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Definer.java +++ b/src/main/org/apache/tools/ant/taskdefs/Definer.java @@ -57,17 +57,22 @@ package org.apache.tools.ant.taskdefs; import org.apache.tools.ant.*; import org.apache.tools.ant.types.*; +import java.util.*; +import java.io.*; + /** * Base class for Taskdef and Typedef - does all the classpath * handling and and class loading. * - * @author costin@dnt.ro + * @author Costin Manolache * @author Stefan Bodewig */ public abstract class Definer extends Task { private String name; private String value; private Path classpath; + private File file; + private String resource; public void setClasspath(Path classpath) { if (this.classpath == null) { @@ -89,24 +94,73 @@ public abstract class Definer extends Task { } public void execute() throws BuildException { - if (name==null || value==null ) { - String msg = "name or classname attributes of " - + getTaskName() + " element " - + "are undefined"; - throw new BuildException(msg); - } - try { - AntClassLoader al = null; - if (classpath != null) { - al = new AntClassLoader(project, classpath); - } else { - al = new AntClassLoader(project, Path.systemClasspath); + AntClassLoader al=createLoader(); + + if (file==null && resource==null ) { + + // simple case - one definition + if ( name==null || value==null ) { + String msg = "name or classname attributes of " + + getTaskName() + " element " + + "are undefined"; + throw new BuildException(msg); } - // need to load Task via system classloader or the new - // task we want to define will never be a Task but always - // be wrapped into a TaskAdapter. - al.addSystemPackageRoot("org.apache.tools.ant"); + addDefinition( al, name, value ); + + } else { + try { + if (name != null || value != null) { + String msg = "You must not specify name or value " + + "together with file or resource."; + throw new BuildException(msg, location); + } + + if (file != null && resource != null) { + String msg = "You must not specify both, file and resource."; + throw new BuildException(msg, location); + } + + + Properties props=new Properties(); + InputStream is=null; + if( file != null ) { + log("Loading definitions from file " + file, + Project.MSG_VERBOSE); + is=new FileInputStream( file ); + if (is == null) { + log("Could not load definitions from file " + file + + ". It doesn\'t exist.", Project.MSG_WARN); + } + } + if( resource!=null ) { + log("Loading definitions from resource " + resource, + Project.MSG_VERBOSE); + is=al.getResourceAsStream( resource ); + if (is == null) { + log("Could not load definitions from resource " + + resource + ". It could not be found.", + Project.MSG_WARN); + } + } + + if( is!=null ) { + props.load( is ); + Enumeration keys=props.keys(); + while( keys.hasMoreElements() ) { + String n=(String)keys.nextElement(); + String v=props.getProperty( n ); + addDefinition( al, n, v ); + } + } + } catch( IOException ex ) { + throw new BuildException(ex, location); + } + } + } + + private void addDefinition( ClassLoader al, String name, String value ) { + try { Class c = al.loadClass(value); AntClassLoader.initializeClass(c); addDefinition(name, c); @@ -120,7 +174,30 @@ public abstract class Definer extends Task { throw new BuildException(msg, ncdfe, location); } } - + + + private AntClassLoader createLoader() { + AntClassLoader al = null; + if (classpath != null) { + al = new AntClassLoader(project, classpath); + } else { + al = new AntClassLoader(project, Path.systemClasspath); + } + // need to load Task via system classloader or the new + // task we want to define will never be a Task but always + // be wrapped into a TaskAdapter. + al.addSystemPackageRoot("org.apache.tools.ant"); + return al; + } + + public void setFile( File file ) { + this.file=file; + } + + public void setResource( String res ) { + this.resource=res; + } + public void setName( String name) { this.name = name; }