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 ap...@apache.org on 2010/11/24 11:30:54 UTC
svn commit: r1038554 - in
/incubator/npanday/trunk/plugins/maven-vsinstaller-plugin/src:
main/java/npanday/plugin/vsinstaller/VsInstallerMojo.java
test/groovy/npanday/plugin/vsinstaller/VsInstallerMojoTest.groovy
Author: apadilla
Date: Wed Nov 24 11:30:53 2010
New Revision: 1038554
URL: http://svn.apache.org/viewvc?rev=1038554&view=rev
Log:
[NPANDAY-335] changed installationLocation to File type
Modified:
incubator/npanday/trunk/plugins/maven-vsinstaller-plugin/src/main/java/npanday/plugin/vsinstaller/VsInstallerMojo.java
incubator/npanday/trunk/plugins/maven-vsinstaller-plugin/src/test/groovy/npanday/plugin/vsinstaller/VsInstallerMojoTest.groovy
Modified: incubator/npanday/trunk/plugins/maven-vsinstaller-plugin/src/main/java/npanday/plugin/vsinstaller/VsInstallerMojo.java
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/maven-vsinstaller-plugin/src/main/java/npanday/plugin/vsinstaller/VsInstallerMojo.java?rev=1038554&r1=1038553&r2=1038554&view=diff
==============================================================================
--- incubator/npanday/trunk/plugins/maven-vsinstaller-plugin/src/main/java/npanday/plugin/vsinstaller/VsInstallerMojo.java (original)
+++ incubator/npanday/trunk/plugins/maven-vsinstaller-plugin/src/main/java/npanday/plugin/vsinstaller/VsInstallerMojo.java Wed Nov 24 11:30:53 2010
@@ -64,9 +64,9 @@ public class VsInstallerMojo
extends AbstractMojo
{
/**
- * @parameter expression ="${installationLocation}"
- */
- public String installationLocation;
+ * @parameter expression ="${installationLocation}"
+ */
+ public File installationLocation;
/**
* @parameter expression = "${project}"
*/
@@ -277,7 +277,7 @@ public class VsInstallerMojo
writer = new OutputStreamWriter( new FileOutputStream( outputFile ), "Unicode" );
- writer.write( addin.replaceAll( "\\$\\{installationLocation\\}", installationLocation.replaceAll( "\\\\", "\\\\\\\\" ) ) );
+ writer.write( addin.replaceAll( "\\$\\{installationLocation\\}", installationLocation.getAbsolutePath().replaceAll( "\\\\", "\\\\\\\\" ) ) );
}
catch ( IOException e )
{
@@ -324,14 +324,11 @@ public class VsInstallerMojo
String src = System.getProperty( "user.dir" ) + File.separator + "target";
File srcFolder = new File( src );
- File destFolder = new File( installationLocation );
-
- new File( installationLocation ).mkdirs();
IOFileFilter dllSuffixFilter = FileFilterUtils.suffixFileFilter( ".dll" );
IOFileFilter dllFiles = FileFilterUtils.andFileFilter( FileFileFilter.FILE, dllSuffixFilter );
- FileUtils.copyDirectory(srcFolder, destFolder, dllFiles, true);
+ FileUtils.copyDirectory(srcFolder, installationLocation, dllFiles, true);
}
catch ( IOException e )
@@ -342,18 +339,26 @@ public class VsInstallerMojo
private void getInstallationLocation()
{
- if ( installationLocation == null || installationLocation.length() == 0 )
+ if ( installationLocation == null )
{
String programFilesPath = System.getenv( "PROGRAMFILES" );
if ( programFilesPath == null || programFilesPath.length() == 0 )
{
- programFilesPath = System.getProperty( "user.dir" );
- }
- installationLocation = programFilesPath + File.separator + "NPanday";
+ programFilesPath = System.getProperty( "user.dir" );
+ }
+
+ installationLocation = new File ( programFilesPath + "/NPanday/bin" );
+ }
+ else
+ {
+ installationLocation = new File ( installationLocation.getAbsolutePath() + "/bin" );
}
- installationLocation = installationLocation + File.separator + "bin";
+ if ( !installationLocation.exists() )
+ {
+ installationLocation.mkdirs();
+ }
}
}
Modified: incubator/npanday/trunk/plugins/maven-vsinstaller-plugin/src/test/groovy/npanday/plugin/vsinstaller/VsInstallerMojoTest.groovy
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/maven-vsinstaller-plugin/src/test/groovy/npanday/plugin/vsinstaller/VsInstallerMojoTest.groovy?rev=1038554&r1=1038553&r2=1038554&view=diff
==============================================================================
--- incubator/npanday/trunk/plugins/maven-vsinstaller-plugin/src/test/groovy/npanday/plugin/vsinstaller/VsInstallerMojoTest.groovy (original)
+++ incubator/npanday/trunk/plugins/maven-vsinstaller-plugin/src/test/groovy/npanday/plugin/vsinstaller/VsInstallerMojoTest.groovy Wed Nov 24 11:30:53 2010
@@ -96,7 +96,7 @@ public class VsInstallerMojoTest{
mojo.collectDefaultVSAddinDirectories()
List results = mojo.vsAddinDirectories
- mojo.installationLocation = tempDir.getPath()+"/bin"
+ mojo.installationLocation = new File ( tempDir.getAbsolutePath() + "/bin" )
mojo.localRepository = tempDir.getPath()+"/m2/repo"
results.each{ mojo.writePlugin it }
@@ -116,7 +116,7 @@ public class VsInstallerMojoTest{
mojo.collectDefaultVSAddinDirectories()
List results = mojo.vsAddinDirectories
- mojo.installationLocation = tempDir.getPath()+"/bin"
+ mojo.installationLocation = new File ( tempDir.getAbsolutePath() + "/bin" )
mojo.localRepository = tempDir.getPath()+"/m2/repo"
results.each{ mojo.writePlugin it }