You are viewing a plain text version of this content. The canonical link for it is here.
Posted to nmaven-commits@incubator.apache.org by si...@apache.org on 2007/05/11 16:30:29 UTC
svn commit: r537225 - in /incubator/nmaven/branches/SI_XPT:
components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/
plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/
plugins/maven-vsinstaller-plu...
Author: sisbell
Date: Fri May 11 09:30:25 2007
New Revision: 537225
URL: http://svn.apache.org/viewvc?view=rev&rev=537225
Log:
Minor changes.
Modified:
incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/AssemblyResolverImpl.java
incubator/nmaven/branches/SI_XPT/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/ComponentInitializerMojo.java
incubator/nmaven/branches/SI_XPT/plugins/maven-vsinstaller-plugin/src/main/java/org/apache/maven/dotnet/plugin/vsinstaller/VsInstallerMojo.java
Modified: incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/AssemblyResolverImpl.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/AssemblyResolverImpl.java?view=diff&rev=537225&r1=537224&r2=537225
==============================================================================
--- incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/AssemblyResolverImpl.java (original)
+++ incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/AssemblyResolverImpl.java Fri May 11 09:30:25 2007
@@ -127,8 +127,6 @@
}
}
- ArtifactRepository localArtifactRepository =
- new DefaultArtifactRepository( "local", "file://" + localArtifactRepository, new AssemblyRepositoryLayout() );
ArtifactResolutionResult result = resolver.resolveTransitively( artifactDependencies, sourceArtifact,
localArtifactRepository,
remoteArtifactRepositories,
Modified: incubator/nmaven/branches/SI_XPT/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/ComponentInitializerMojo.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/ComponentInitializerMojo.java?view=diff&rev=537225&r1=537224&r2=537225
==============================================================================
--- incubator/nmaven/branches/SI_XPT/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/ComponentInitializerMojo.java (original)
+++ incubator/nmaven/branches/SI_XPT/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/ComponentInitializerMojo.java Fri May 11 09:30:25 2007
@@ -91,7 +91,7 @@
long startTime = System.currentTimeMillis();
ArtifactRepository localArtifactRepository =
- new DefaultArtifactRepository( "local", "file://" + localRepositoryPath, new AssemblyRepositoryLayout() );
+ new DefaultArtifactRepository( "local", "file://" + localRepository, new AssemblyRepositoryLayout() );
try
{
Modified: incubator/nmaven/branches/SI_XPT/plugins/maven-vsinstaller-plugin/src/main/java/org/apache/maven/dotnet/plugin/vsinstaller/VsInstallerMojo.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/plugins/maven-vsinstaller-plugin/src/main/java/org/apache/maven/dotnet/plugin/vsinstaller/VsInstallerMojo.java?view=diff&rev=537225&r1=537224&r2=537225
==============================================================================
--- incubator/nmaven/branches/SI_XPT/plugins/maven-vsinstaller-plugin/src/main/java/org/apache/maven/dotnet/plugin/vsinstaller/VsInstallerMojo.java (original)
+++ incubator/nmaven/branches/SI_XPT/plugins/maven-vsinstaller-plugin/src/main/java/org/apache/maven/dotnet/plugin/vsinstaller/VsInstallerMojo.java Fri May 11 09:30:25 2007
@@ -97,20 +97,12 @@
{
throw new MojoExecutionException( "NMAVEN-1600-005: Unable to resolve assemblies", e );
}
- String addin;
- try
- {
- addin =
- IOUtil.toString( VsInstallerMojo.class.getResourceAsStream( "/template/NMaven.VisualStudio.AddIn" ) );
- }
- catch ( IOException e )
- {
- throw new MojoExecutionException( "NMAVEN-1600-003: Unable to resolve assemblies", e );
- }
- FileOutputStream fos = null;
+ OutputStreamWriter writer = null;
try
{
+ String addin =
+ IOUtil.toString( VsInstallerMojo.class.getResourceAsStream( "/template/NMaven.VisualStudio.AddIn" ));
File outputFile = new File( System.getProperty( "user.home" ) +
"\\My Documents\\Visual Studio 2005\\Addins\\NMaven.VisualStudio.AddIn" );
@@ -118,11 +110,10 @@
{
outputFile.getParentFile().mkdir();
}
- fos = new FileOutputStream( outputFile );
- OutputStreamWriter writer = new OutputStreamWriter( fos, "Unicode" );
+ writer = new OutputStreamWriter( new FileOutputStream( outputFile ), "Unicode" );
writer.write(
addin.replaceAll( "\\$\\{localRepository\\}", localRepository.replaceAll( "\\\\", "\\\\\\\\" ) ) );
- writer.close();
+
}
catch ( IOException e )
{
@@ -132,9 +123,9 @@
{
try
{
- if ( fos != null )
+ if ( writer != null )
{
- fos.close();
+ writer.close();
}
}
catch ( IOException e )