Skip to content

Commit e0f0ed6

Browse files
cstamascstamas
committed
WIP
1 parent d026df4 commit e0f0ed6

17 files changed

+431
-399
lines changed

‎pom.xml‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -96,15 +96,6 @@
9696
<version>${mavenVersion}</version>
9797
<scope>provided</scope>
9898
</dependency>
99-
<dependency>
100-
<groupId>org.eclipse.sisu</groupId>
101-
<artifactId>org.eclipse.sisu.plexus</artifactId>
102-
<version>0.3.0.M1</version><!-- Maven 3.2.5 -->
103-
</dependency>
104-
<dependency>
105-
<groupId>org.codehaus.plexus</groupId>
106-
<artifactId>plexus-component-annotations</artifactId>
107-
</dependency>
10899
<dependency>
109100
<groupId>org.codehaus.plexus</groupId>
110101
<artifactId>plexus-utils</artifactId>
@@ -145,6 +136,18 @@
145136
<version>${slf4jVersion}</version>
146137
<scope>test</scope>
147138
</dependency>
139+
<dependency>
140+
<groupId>org.eclipse.sisu</groupId>
141+
<artifactId>org.eclipse.sisu.plexus</artifactId>
142+
<version>0.3.0.M1</version><!-- Maven 3.2.5 -->
143+
<scope>test</scope>
144+
</dependency>
145+
<dependency>
146+
<groupId>org.eclipse.sisu</groupId>
147+
<artifactId>org.eclipse.sisu.inject</artifactId>
148+
<version>0.3.0.M1</version><!-- Maven 3.2.5 -->
149+
<scope>test</scope>
150+
</dependency>
148151

149152
</dependencies>
150153

‎src/main/java/org/apache/maven/shared/filtering/BaseFilter.java‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,18 @@
4242
import org.codehaus.plexus.interpolation.SingleResponseValueSource;
4343
import org.codehaus.plexus.interpolation.ValueSource;
4444
import org.codehaus.plexus.interpolation.multi.MultiDelimiterStringSearchInterpolator;
45-
import org.codehaus.plexus.logging.AbstractLogEnabled;
45+
import org.slf4j.Logger;
46+
import org.slf4j.LoggerFactory;
4647

4748
class BaseFilter
48-
extends AbstractLogEnabled
4949
implements DefaultFilterInfo
5050
{
51+
private final Logger logger = LoggerFactory.getLogger( getClass() );
52+
53+
protected Logger getLogger()
54+
{
55+
return logger;
56+
}
5157

5258
@Override
5359
public List<FilterWrapper> getDefaultFilterWrappers( final MavenProject mavenProject,

‎src/main/java/org/apache/maven/shared/filtering/DefaultMavenFileFilter.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,15 +87,15 @@ public void copyFile( File from, File to, boolean filtering, List<FilterWrapper>
8787
getLogger().debug( "filtering " + from.getPath() + " to " + to.getPath() );
8888
}
8989
FilterWrapper[] array = filterWrappers.toArray( new FilterWrapper[0] );
90-
FileUtils.copyFile( from, to, encoding, array, false );
90+
FilteringUtils.copyFile( from, to, encoding, array, false );
9191
}
9292
else
9393
{
9494
if ( getLogger().isDebugEnabled() )
9595
{
9696
getLogger().debug( "copy " + from.getPath() + " to " + to.getPath() );
9797
}
98-
FileUtils.copyFile( from, to, encoding, new FilterWrapper[0], overwrite );
98+
FilteringUtils.copyFile( from, to, encoding, new FilterWrapper[0], overwrite );
9999
}
100100
}
101101
catch ( IOException e )

‎src/main/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFiltering.java‎

Lines changed: 3 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -206,9 +206,6 @@ public void filterResources( MavenResourcesExecution mavenResourcesExecution )
206206
{
207207
isFilteringUsed = true;
208208
}
209-
boolean ignoreDelta = !outputExists || buildContext.hasDelta( mavenResourcesExecution.getFileFilters() )
210-
|| buildContext.hasDelta( getRelativeOutputDirectory( mavenResourcesExecution ) );
211-
getLogger().debug( "ignoreDelta " + ignoreDelta );
212209

213210
DirectoryScanner scanner = new DirectoryScanner();
214211
scanner.setBasedir( resourceDirectory );
@@ -275,26 +272,6 @@ public void filterResources( MavenResourcesExecution mavenResourcesExecution )
275272
encoding,
276273
mavenResourcesExecution.isOverwrite() );
277274
}
278-
279-
// deal with deleted source files
280-
281-
scanner = buildContext.newDeleteScanner( resourceDirectory );
282-
283-
setupScanner( resource, scanner, mavenResourcesExecution.isAddDefaultExcludes() );
284-
285-
scanner.scan();
286-
287-
List<String> deletedFiles = Arrays.asList( scanner.getIncludedFiles() );
288-
289-
for ( String name : deletedFiles )
290-
{
291-
File destinationFile = getDestinationFile( outputDirectory, targetPath, name, mavenResourcesExecution );
292-
293-
destinationFile.delete();
294-
295-
buildContext.refresh( destinationFile );
296-
}
297-
298275
}
299276

300277
// Warn the user if all of the following requirements are met, to avoid those that are not affected
@@ -497,7 +474,7 @@ private String getRelativeOutputDirectory( MavenResourcesExecution execution )
497474
if ( execution.getMavenProject() != null && execution.getMavenProject().getBasedir() != null )
498475
{
499476
String basedir = execution.getMavenProject().getBasedir().getAbsolutePath();
500-
relOutDir = PathTool.getRelativeFilePath( basedir, relOutDir );
477+
relOutDir = FilteringUtils.getRelativeFilePath( basedir, relOutDir );
501478
if ( relOutDir == null )
502479
{
503480
relOutDir = execution.getOutputDirectory().getPath();
@@ -529,9 +506,9 @@ private String filterFileName( String name, List<FilterWrapper> wrappers )
529506
IOUtils.copy( reader, writer );
530507
String filteredFilename = writer.toString();
531508

532-
if ( getLogger().isDebugEnabled() )
509+
if ( LOGGER.isDebugEnabled() )
533510
{
534-
getLogger().debug( "renaming filename " + name + " to " + filteredFilename );
511+
LOGGER.debug( "renaming filename " + name + " to " + filteredFilename );
535512
}
536513
return filteredFilename;
537514
}

0 commit comments

Comments
 (0)