git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@271486 13f79535-47bb-0310-9956-ffa450edef68master
| @@ -8,8 +8,9 @@ | |||||
| package org.apache.tools.ant.taskdefs; | package org.apache.tools.ant.taskdefs; | ||||
| import java.io.File; | import java.io.File; | ||||
| import org.apache.myrmidon.api.AbstractTask; | |||||
| import org.apache.myrmidon.api.TaskException; | import org.apache.myrmidon.api.TaskException; | ||||
| import org.apache.tools.ant.Task; | |||||
| import org.apache.tools.ant.types.FilterSet; | |||||
| /** | /** | ||||
| * This task sets a token filter that is used by the file copy methods of the | * This task sets a token filter that is used by the file copy methods of the | ||||
| @@ -22,7 +23,7 @@ import org.apache.tools.ant.Task; | |||||
| * @author <A href="gholam@xtra.co.nz">Michael McCallum</A> | * @author <A href="gholam@xtra.co.nz">Michael McCallum</A> | ||||
| */ | */ | ||||
| public class Filter | public class Filter | ||||
| extends Task | |||||
| extends AbstractTask | |||||
| { | { | ||||
| private File filtersFile; | private File filtersFile; | ||||
| @@ -57,7 +58,7 @@ public class Filter | |||||
| if( isSingleFilter ) | if( isSingleFilter ) | ||||
| { | { | ||||
| getProject().getGlobalFilterSet().addFilter( token, value ); | |||||
| getGlobalFilterSet().addFilter( token, value ); | |||||
| } | } | ||||
| if( isFiltersFromFile ) | if( isFiltersFromFile ) | ||||
| @@ -70,6 +71,12 @@ public class Filter | |||||
| throws TaskException | throws TaskException | ||||
| { | { | ||||
| getLogger().debug( "Reading filters from " + filtersFile ); | getLogger().debug( "Reading filters from " + filtersFile ); | ||||
| getProject().getGlobalFilterSet().readFiltersFromFile( filtersFile ); | |||||
| getGlobalFilterSet().readFiltersFromFile( filtersFile ); | |||||
| } | |||||
| private FilterSet getGlobalFilterSet() | |||||
| { | |||||
| //Get filterset from a well known propety and replace it there | |||||
| return null; | |||||
| } | } | ||||
| } | } | ||||
| @@ -8,8 +8,9 @@ | |||||
| package org.apache.tools.ant.taskdefs; | package org.apache.tools.ant.taskdefs; | ||||
| import java.io.File; | import java.io.File; | ||||
| import org.apache.myrmidon.api.AbstractTask; | |||||
| import org.apache.myrmidon.api.TaskException; | import org.apache.myrmidon.api.TaskException; | ||||
| import org.apache.tools.ant.Task; | |||||
| import org.apache.tools.ant.types.FilterSet; | |||||
| /** | /** | ||||
| * This task sets a token filter that is used by the file copy methods of the | * This task sets a token filter that is used by the file copy methods of the | ||||
| @@ -22,7 +23,7 @@ import org.apache.tools.ant.Task; | |||||
| * @author <A href="gholam@xtra.co.nz">Michael McCallum</A> | * @author <A href="gholam@xtra.co.nz">Michael McCallum</A> | ||||
| */ | */ | ||||
| public class Filter | public class Filter | ||||
| extends Task | |||||
| extends AbstractTask | |||||
| { | { | ||||
| private File filtersFile; | private File filtersFile; | ||||
| @@ -57,7 +58,7 @@ public class Filter | |||||
| if( isSingleFilter ) | if( isSingleFilter ) | ||||
| { | { | ||||
| getProject().getGlobalFilterSet().addFilter( token, value ); | |||||
| getGlobalFilterSet().addFilter( token, value ); | |||||
| } | } | ||||
| if( isFiltersFromFile ) | if( isFiltersFromFile ) | ||||
| @@ -70,6 +71,12 @@ public class Filter | |||||
| throws TaskException | throws TaskException | ||||
| { | { | ||||
| getLogger().debug( "Reading filters from " + filtersFile ); | getLogger().debug( "Reading filters from " + filtersFile ); | ||||
| getProject().getGlobalFilterSet().readFiltersFromFile( filtersFile ); | |||||
| getGlobalFilterSet().readFiltersFromFile( filtersFile ); | |||||
| } | |||||
| private FilterSet getGlobalFilterSet() | |||||
| { | |||||
| //Get filterset from a well known propety and replace it there | |||||
| return null; | |||||
| } | } | ||||
| } | } | ||||