You are viewing a plain text version of this content. The canonical link for it is here.
Posted to npanday-commits@incubator.apache.org by br...@apache.org on 2012/01/17 03:50:33 UTC
svn commit: r1232286 -
/incubator/npanday/trunk/components/dotnet-packaging/src/main/java/npanday/packaging/ConfigFileHandler.java
Author: brett
Date: Tue Jan 17 03:50:33 2012
New Revision: 1232286
URL: http://svn.apache.org/viewvc?rev=1232286&view=rev
Log:
fix relative paths when running in a multi-module project
Modified:
incubator/npanday/trunk/components/dotnet-packaging/src/main/java/npanday/packaging/ConfigFileHandler.java
Modified: incubator/npanday/trunk/components/dotnet-packaging/src/main/java/npanday/packaging/ConfigFileHandler.java
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/components/dotnet-packaging/src/main/java/npanday/packaging/ConfigFileHandler.java?rev=1232286&r1=1232285&r2=1232286&view=diff
==============================================================================
--- incubator/npanday/trunk/components/dotnet-packaging/src/main/java/npanday/packaging/ConfigFileHandler.java (original)
+++ incubator/npanday/trunk/components/dotnet-packaging/src/main/java/npanday/packaging/ConfigFileHandler.java Tue Jan 17 03:50:33 2012
@@ -173,8 +173,7 @@ public class ConfigFileHandler
for ( String configFilePath : scanner.getIncludedFiles() )
{
- File configFile = new File( configFilePath );
-
+ File configFile = new File( baseDir, configFilePath );
if ( isTransformationFile( configFile ) )
{
@@ -185,7 +184,7 @@ public class ConfigFileHandler
continue;
}
- final File targetConfigFile = new File( targetFolder, relativize(configFile, baseDir) );
+ final File targetConfigFile = new File( targetFolder, configFilePath );
handleConfigFile(
vendorRequirement, configFile, transformationHint, targetConfigFile
@@ -193,11 +192,6 @@ public class ConfigFileHandler
}
}
- private String relativize( File file, File base )
- {
- return base.toURI().relativize(file.toURI()).getPath();
- }
-
private Splitter SPLIT_ON_DOTS = Splitter.on( '.' );
private Joiner JOIN_WITH_DOTS = Joiner.on( '.' );