Author: brett
Date: Tue Dec 6 02:43:43 2011
New Revision: 1210753
URL: http://svn.apache.org/viewvc?rev=1210753&view=rev
Log:
[NPANDAY-410] fix missing project references
Modified:
incubator/npanday/branches/NPANDAY-410/components/dotnet-artifact/src/main/java/npanday/artifact/ArtifactInstaller.java
incubator/npanday/branches/NPANDAY-410/components/dotnet-artifact/src/main/java/npanday/artifact/impl/ArtifactInstallerImpl.java
incubator/npanday/branches/NPANDAY-410/plugins/maven-resolver-plugin/src/main/java/npanday/plugin/resolver/NetDependencyResolverMojo.java
incubator/npanday/branches/NPANDAY-410/plugins/maven-vsinstaller-plugin/src/main/java/npanday/plugin/vsinstaller/VsInstallerMojo.java
Modified:
incubator/npanday/branches/NPANDAY-410/components/dotnet-artifact/src/main/java/npanday/artifact/ArtifactInstaller.java
URL:
http://svn.apache.org/viewvc/incubator/npanday/branches/NPANDAY-410/components/dotnet-artifact/src/main/java/npanday/artifact/ArtifactInstaller.java?rev=1210753&r1=1210752&r2=1210753&view=diff
==============================================================================
---
incubator/npanday/branches/NPANDAY-410/components/dotnet-artifact/src/main/java/npanday/artifact/ArtifactInstaller.java
(original)
+++
incubator/npanday/branches/NPANDAY-410/components/dotnet-artifact/src/main/java/npanday/artifact/ArtifactInstaller.java
Tue Dec 6 02:43:43 2011
@@ -22,6 +22,7 @@ import org.apache.maven.artifact.Artifac
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.installer.ArtifactInstallationException;
import org.apache.maven.model.Dependency;
+import org.apache.maven.project.MavenProject;
import java.io.File;
import java.io.IOException;
@@ -78,14 +79,16 @@ public interface ArtifactInstaller
* with that profile.
*
*
+ *
* @param profile the specified profile to resolve. This value
may be null.
* @param netDependencies additional .NET artifacts to resolve and
install.
* @param javaDependencies the Java Dependencies to resolve. Typically
these should be the java bindings for the
* .NET plugins.
+ * @param project
* @throws IOException if there is a problem with installation
*/
void resolveAndInstallNetDependenciesForProfile( String profile,
List<Dependency> netDependencies,
- List<Dependency>
javaDependencies )
+ List<Dependency>
javaDependencies, MavenProject project )
throws IOException, NPandayArtifactResolutionException;
/**
Modified:
incubator/npanday/branches/NPANDAY-410/components/dotnet-artifact/src/main/java/npanday/artifact/impl/ArtifactInstallerImpl.java
URL:
http://svn.apache.org/viewvc/incubator/npanday/branches/NPANDAY-410/components/dotnet-artifact/src/main/java/npanday/artifact/impl/ArtifactInstallerImpl.java?rev=1210753&r1=1210752&r2=1210753&view=diff
==============================================================================
---
incubator/npanday/branches/NPANDAY-410/components/dotnet-artifact/src/main/java/npanday/artifact/impl/ArtifactInstallerImpl.java
(original)
+++
incubator/npanday/branches/NPANDAY-410/components/dotnet-artifact/src/main/java/npanday/artifact/impl/ArtifactInstallerImpl.java
Tue Dec 6 02:43:43 2011
@@ -130,11 +130,8 @@ public class ArtifactInstallerImpl
this.logger = logger;
}
- /**
- * @see
npanday.artifact.ArtifactInstaller#resolveAndInstallNetDependenciesForProfile(String,
java.util.List, java.util.List)
- */
public void resolveAndInstallNetDependenciesForProfile( String profile,
List<Dependency> netDependencies,
- List<Dependency>
javaDependencies )
+ List<Dependency>
javaDependencies, MavenProject project )
throws IOException, NPandayArtifactResolutionException
{
if ( netDependencies == null )
@@ -153,7 +150,7 @@ public class ArtifactInstallerImpl
matchPolicies.add( new ProfileMatchPolicy( profile ) );
netDependencies.addAll( repository.getDependenciesFor( matchPolicies )
);
- assemblyResolver.resolveTransitivelyFor( new MavenProject(),
netDependencies, remoteArtifactRepositories,
+ assemblyResolver.resolveTransitivelyFor( project, netDependencies,
remoteArtifactRepositories,
localRepository, false );
//Do Library Installs for Net Dependencies
Modified:
incubator/npanday/branches/NPANDAY-410/plugins/maven-resolver-plugin/src/main/java/npanday/plugin/resolver/NetDependencyResolverMojo.java
URL:
http://svn.apache.org/viewvc/incubator/npanday/branches/NPANDAY-410/plugins/maven-resolver-plugin/src/main/java/npanday/plugin/resolver/NetDependencyResolverMojo.java?rev=1210753&r1=1210752&r2=1210753&view=diff
==============================================================================
---
incubator/npanday/branches/NPANDAY-410/plugins/maven-resolver-plugin/src/main/java/npanday/plugin/resolver/NetDependencyResolverMojo.java
(original)
+++
incubator/npanday/branches/NPANDAY-410/plugins/maven-resolver-plugin/src/main/java/npanday/plugin/resolver/NetDependencyResolverMojo.java
Tue Dec 6 02:43:43 2011
@@ -18,6 +18,7 @@
*/
package npanday.plugin.resolver;
+import npanday.artifact.ArtifactInstaller;
import npanday.artifact.NPandayArtifactResolutionException;
import npanday.registry.NPandayRepositoryException;
import org.apache.maven.project.MavenProject;
@@ -165,8 +166,8 @@ public class NetDependencyResolverMojo
{
try
{
-
artifactContext.getArtifactInstaller().resolveAndInstallNetDependenciesForProfile(
profile,
-
dependencies, null );
+ ArtifactInstaller installer =
artifactContext.getArtifactInstaller();
+ installer.resolveAndInstallNetDependenciesForProfile( profile,
dependencies, null, project );
}
catch ( NPandayArtifactResolutionException e )
{
Modified:
incubator/npanday/branches/NPANDAY-410/plugins/maven-vsinstaller-plugin/src/main/java/npanday/plugin/vsinstaller/VsInstallerMojo.java
URL:
http://svn.apache.org/viewvc/incubator/npanday/branches/NPANDAY-410/plugins/maven-vsinstaller-plugin/src/main/java/npanday/plugin/vsinstaller/VsInstallerMojo.java?rev=1210753&r1=1210752&r2=1210753&view=diff
==============================================================================
---
incubator/npanday/branches/NPANDAY-410/plugins/maven-vsinstaller-plugin/src/main/java/npanday/plugin/vsinstaller/VsInstallerMojo.java
(original)
+++
incubator/npanday/branches/NPANDAY-410/plugins/maven-vsinstaller-plugin/src/main/java/npanday/plugin/vsinstaller/VsInstallerMojo.java
Tue Dec 6 02:43:43 2011
@@ -21,6 +21,7 @@ package npanday.plugin.vsinstaller;
import npanday.PlatformUnsupportedException;
import npanday.artifact.ArtifactContext;
+import npanday.artifact.ArtifactInstaller;
import npanday.artifact.NPandayArtifactResolutionException;
import npanday.artifact.NetDependenciesRepository;
import npanday.artifact.NetDependencyMatchPolicy;
@@ -37,6 +38,7 @@ import org.apache.maven.model.Dependency
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
+import org.apache.maven.project.MavenProject;
import org.apache.maven.settings.Settings;
import org.apache.commons.io.filefilter.*;
import org.apache.commons.io.FileUtils;
@@ -50,7 +52,6 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import javax.swing.*;
import javax.swing.filechooser.FileSystemView;
/**
@@ -163,8 +164,8 @@ public class VsInstallerMojo
try
{
-
artifactContext.getArtifactInstaller().resolveAndInstallNetDependenciesForProfile(
"VisualStudio2005", null,
-
null );
+ ArtifactInstaller installer =
artifactContext.getArtifactInstaller();
+ installer.resolveAndInstallNetDependenciesForProfile(
"VisualStudio2005", null, null, mavenProject );
}
catch ( NPandayArtifactResolutionException e )
{
