commons-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Martin van den Bemt <mll...@mvdb.net>
Subject Re: [Attributes] Release and Maven Plugin
Date Fri, 23 May 2003 17:04:14 GMT
Btw next commit will be style changes (lot of tabs,etc) and some cvs
admin, to enable keyword substition and updating licensing.

Mvgr,
Martin
On Thu, 2003-05-22 at 01:16, Dan Diephouse wrote:
> Thanks Martin.
> 
> Here's a new patch that fixes a test failure.  I didn't notice it 
> earlier because the ignore test failure property was set.
> 
> - Dan
> 
> Martin van den Bemt wrote:
> 
> > I am going to have a look at this (didn't zap the mail after all) and
> > apply the patch tomorrow night. 
> > 
> > Mvgr,
> > Martin
> > 
> > On Wed, 2003-05-21 at 19:35, Dan Diephouse wrote:
> > 
> >>Well, I finally got around to fixing the commons-attributes ant task. 
> >>Here's a patch.  I hope there are still attributes developers around who 
> >>will apply this! :)
> 
> ----
> 

> Index: src/java/org/apache/commons/attributes/task/AttributesCompiler.java
> ===================================================================
> RCS file: /home/cvspublic/jakarta-commons-sandbox/attributes/src/java/org/apache/commons/attributes/task/AttributesCompiler.java,v
> retrieving revision 1.3
> diff -u -r1.3 AttributesCompiler.java
> --- src/java/org/apache/commons/attributes/task/AttributesCompiler.java	18 Dec 2002 19:00:39
-0000	1.3
> +++ src/java/org/apache/commons/attributes/task/AttributesCompiler.java	21 May 2003 23:15:19
-0000
> @@ -67,9 +67,9 @@
>  import java.io.*;
>  import java.util.Properties;
>  
> -import org.apache.tools.ant.Task;
>  import org.apache.tools.ant.BuildException;
>  import org.apache.tools.ant.DirectoryScanner;
> +import org.apache.tools.ant.taskdefs.MatchingTask;
>  
>  /**
>   * <p><code>AttributesCompilerOld</code> is an Ant Task which
> @@ -80,12 +80,12 @@
>   * @author <a href="mailto:joe@truemesh.com">Joe Walnes</a>
>   * @version $Revision: $
>   */
> -public class AttributesCompiler extends Task {
> +public class AttributesCompiler extends MatchingTask {
>  
>  	private File src;
>  	private File dest;
>  	private AttributesBuilder builder = new AttributesBuilder();
> -
> +    
>  	public void setSrc(File src) {
>  		this.src = src;
>  	}
> @@ -111,9 +111,7 @@
>  	}
>  
>  	private String[] getJavaFiles() {
> -		DirectoryScanner scanner = new DirectoryScanner();
> -		scanner.setBasedir(src);
> -		scanner.setIncludes(new String[]{"**/*.java"});
> +        DirectoryScanner scanner = getDirectoryScanner(src);
>  		scanner.scan();
>  		return scanner.getIncludedFiles();
>  	}
> Index: src/test/org/apache/commons/attributes/AttributesTest.java
> ===================================================================
> RCS file: /home/cvspublic/jakarta-commons-sandbox/attributes/src/test/org/apache/commons/attributes/AttributesTest.java,v
> retrieving revision 1.3
> diff -u -r1.3 AttributesTest.java
> --- src/test/org/apache/commons/attributes/AttributesTest.java	18 Dec 2002 19:00:39 -0000
1.3
> +++ src/test/org/apache/commons/attributes/AttributesTest.java	21 May 2003 23:15:19 -0000
> @@ -75,6 +75,7 @@
>  import org.apache.commons.attributes.impl.DefaultAttributeFinder;
>  import org.apache.commons.attributes.task.AttributesCompiler;
>  import org.apache.commons.attributes.task.TagSet;
> +import org.apache.tools.ant.Project;
>  
>  /**
>   * Test case for using the Attributes facade with the default implementation.
> @@ -114,7 +115,7 @@
>  		DefaultAttributeFinder.removeSearchPath(searchPath);
>          Attributes.setAttributeFinder(null);
>          
> -        Thread.sleep(20000);
> +        //Thread.sleep(20000);
>  	}
>  
>      public static class TestAttributesLoader implements AttributeFinder {
> @@ -201,7 +202,10 @@
>  	public void testAttributes()
>  		throws IOException, NoSuchMethodException, NoSuchFieldException {
>  		AttributesCompiler attributesCompiler = new AttributesCompiler();
> -		attributesCompiler.setSrc(new File("src" + File.separator + "test"));
> +        attributesCompiler.setSrc(new File("src" + File.separator + "test"));
> +        attributesCompiler.setIncludes("**/*.java");
> +        attributesCompiler.setExcludes("");
> +        attributesCompiler.setProject( new Project() );
>  		attributesCompiler.setDest(targetDir);
>  		attributesCompiler.execute();
>  
> 
> ----
> 

> ---------------------------------------------------------------------
> To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
> For additional commands, e-mail: commons-dev-help@jakarta.apache.org



---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org


Mime
View raw message