incubator-nmaven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sisb...@apache.org
Subject svn commit: r537110 - in /incubator/nmaven/branches/SI_XPT: components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/ components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ components/dotnet-executable/src/main...
Date Fri, 11 May 2007 06:06:23 GMT
Author: sisbell
Date: Thu May 10 23:06:22 2007
New Revision: 537110

URL: http://svn.apache.org/viewvc?view=rev&rev=537110
Log:
Refactored artifact installer and context to allow passing in of remote artifact repos, rather
than relying on the project. This allows standalone plugins, like vsinstaller, toresolve artifacts.

Modified:
    incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/ArtifactContext.java
    incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/ArtifactInstaller.java
    incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactContextImpl.java
    incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactInstallerImpl.java
    incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/AssemblyResolverImpl.java
    incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/CompilerContextImpl.java
    incubator/nmaven/branches/SI_XPT/plugins/maven-install-plugin/src/main/java/org/apache/maven/dotnet/plugin/install/FileInstallerMojo.java
    incubator/nmaven/branches/SI_XPT/plugins/maven-install-plugin/src/main/java/org/apache/maven/dotnet/plugin/install/TargetModuleInstallerMojo.java
    incubator/nmaven/branches/SI_XPT/plugins/maven-resolver-plugin/src/main/java/org/apache/maven/dotnet/plugin/resolver/NetDependencyResolverMojo.java
    incubator/nmaven/branches/SI_XPT/plugins/maven-vsinstaller-plugin/src/main/java/org/apache/maven/dotnet/plugin/vsinstaller/VsInstallerMojo.java
    incubator/nmaven/branches/SI_XPT/plugins/maven-vsinstaller-plugin/src/main/resources/template/NMaven.VisualStudio.AddIn
    incubator/nmaven/branches/SI_XPT/plugins/pom.xml

Modified: incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/ArtifactContext.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/ArtifactContext.java?view=diff&rev=537110&r1=537109&r2=537110
==============================================================================
--- incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/ArtifactContext.java
(original)
+++ incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/ArtifactContext.java
Thu May 10 23:06:22 2007
@@ -19,6 +19,7 @@
 package org.apache.maven.dotnet.artifact;
 
 import org.apache.maven.artifact.Artifact;
+import org.apache.maven.artifact.repository.ArtifactRepository;
 import org.apache.maven.project.MavenProject;
 
 import java.util.List;
@@ -126,8 +127,9 @@
      * Initializes this artifact context. Neither parameter value should be null.
      *
      * @param mavenProject    the maven project
+     * @param remoteArtifactRepositories
      * @param localRepository the file location of the local maven repository
      * @throws NullPointerException if localRepository parameter is null
      */
-    void init( MavenProject mavenProject, File localRepository );
+    void init( MavenProject mavenProject, List<ArtifactRepository> remoteArtifactRepositories,
File localRepository );
 }

Modified: incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/ArtifactInstaller.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/ArtifactInstaller.java?view=diff&rev=537110&r1=537109&r2=537110
==============================================================================
--- incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/ArtifactInstaller.java
(original)
+++ incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/ArtifactInstaller.java
Thu May 10 23:06:22 2007
@@ -19,6 +19,7 @@
 package org.apache.maven.dotnet.artifact;
 
 import org.apache.maven.artifact.Artifact;
+import org.apache.maven.artifact.repository.ArtifactRepository;
 import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
 import org.apache.maven.artifact.resolver.ArtifactResolutionException;
 import org.apache.maven.artifact.installer.ArtifactInstallationException;
@@ -126,9 +127,15 @@
      * Initializes the installer.
      *
      * @param artifactContext the artifact context associated with this installer
-     * @param mavenProject    the maven project associated with the invoking plugin
+
+
+     @param mavenProject    the maven project associated with the invoking plugin
+
+
+      * @param remoteArtifactRepositories
      * @param localRepository the location of the local maven repository
      */
-    void init( ArtifactContext artifactContext, MavenProject mavenProject, File localRepository
);
+    void init( ArtifactContext artifactContext, MavenProject mavenProject,
+               List<ArtifactRepository> remoteArtifactRepositories, File localRepository
);
 
 }

Modified: incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactContextImpl.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactContextImpl.java?view=diff&rev=537110&r1=537109&r2=537110
==============================================================================
--- incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactContextImpl.java
(original)
+++ incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactContextImpl.java
Thu May 10 23:06:22 2007
@@ -264,13 +264,14 @@
     }
 
     /**
-     * @see ArtifactContext#init(org.apache.maven.project.MavenProject, java.io.File)
+     * @see ArtifactContext#init(org.apache.maven.project.MavenProject,java.util.List
      */
-    public void init( MavenProject mavenProject, File localRepository )
+    public void init( MavenProject mavenProject, List<ArtifactRepository> remoteArtifactRepositories,
+                      File localRepository )
     {
         this.project = mavenProject;
         this.localRepository = localRepository.getAbsolutePath();
-        artifactInstaller.init( this, mavenProject, localRepository );
+        artifactInstaller.init( this, mavenProject, remoteArtifactRepositories, localRepository
);
     }
 
     /**

Modified: incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactInstallerImpl.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactInstallerImpl.java?view=diff&rev=537110&r1=537109&r2=537110
==============================================================================
--- incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactInstallerImpl.java
(original)
+++ incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactInstallerImpl.java
Thu May 10 23:06:22 2007
@@ -127,6 +127,8 @@
 
     private RepositoryRegistry repositoryRegistry;
 
+    private List<ArtifactRepository> remoteArtifactRepositories;
+
     /**
      * Constructor. This method is intended to by invoked by the plexus-container, not by
the application developer.
      */
@@ -376,12 +378,6 @@
         throws ArtifactInstallationException, ArtifactNotFoundException
     {
 
-        ArtifactRepository remoteArtifactRepository = new DefaultArtifactRepository( "nmaven",
-                                                                                     "http://localhost:8080/repository",
-                                                                                     new
DefaultRepositoryLayout() );
-        ArrayList remoteReps = new ArrayList();
-        remoteReps.add( remoteArtifactRepository );
-
         Artifact sourceArtifact = artifactFactory.createBuildArtifact( dependency.getGroupId(),
                                                                        dependency.getArtifactId(),
                                                                        dependency.getVersion(),
dependency.getType() );
@@ -396,7 +392,7 @@
                                                                                 sourceArtifact.getVersion(),
"jar" );
             try
             {
-                resolver.resolve( javaBindingArtifact, remoteReps, localArtifactRepository
);
+                resolver.resolve( javaBindingArtifact, remoteArtifactRepositories, localArtifactRepository
);
             }
             catch ( ArtifactResolutionException e )
             {
@@ -455,7 +451,7 @@
         try
         {
             result = resolver.resolveTransitively( artifactDependencies, sourceArtifact,
localArtifactRepository,
-                                                   remoteReps, metadata, null );
+                                                   remoteArtifactRepositories, metadata,
null );
         }
         catch ( ArtifactResolutionException e )
         {
@@ -529,12 +525,13 @@
     }
 
     /**
-     * @see org.apache.maven.dotnet.artifact.ArtifactInstaller#init(org.apache.maven.dotnet.artifact.ArtifactContext,
-     *      org.apache.maven.project.MavenProject, java.io.File)
+     * @see org.apache.maven.dotnet.artifact.ArtifactInstaller#init(org.apache.maven.dotnet.artifact.ArtifactContext,org.apache.maven.project.MavenProject,java.util.List,
File
      */
-    public void init( ArtifactContext artifactContext, MavenProject mavenProject, File localRepository
)
+    public void init( ArtifactContext artifactContext, MavenProject mavenProject,
+                      List<ArtifactRepository> remoteArtifactRepositories, File localRepository
)
     {
         this.project = mavenProject;
+        this.remoteArtifactRepositories = remoteArtifactRepositories;
         this.localRepository = localRepository;
         this.artifactContext = artifactContext;
         this.assemblyRepositoryLayout = new AssemblyRepositoryLayout();

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=537110&r1=537109&r2=537110
==============================================================================
--- 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
Thu May 10 23:06:22 2007
@@ -146,30 +146,7 @@
                                                                         metadata, gacFilter
);
         Set<Artifact> resolvedDependencies = result.getArtifacts();
         AssemblyRepositoryLayout layout = new AssemblyRepositoryLayout();
-/*
-        Set<Artifact> resolvedDependencies = result.getArtifacts();
-        Set<ResolutionNode> nodes = result.getArtifactResolutionNodes();
-        for(ResolutionNode node : nodes)
-        {
-            logger.info( "Node = " + node.getArtifact().getArtifactId());
-            List<String> ss = node.getDependencyTrail();
-            for(String s : ss)
-            {
-                logger.info( "Dependency Node = " + s);
-            }
-        }
 
-        artifactDependencies.addAll( resolvedDependencies );
-        AssemblyRepositoryLayout layout = new AssemblyRepositoryLayout();
-        for ( Artifact artifact : artifactDependencies )
-        {
-            if ( artifact.getType().equals( ArtifactType.EXE.getPackagingType() ) ||
-                artifact.getType().equals( ArtifactType.NETPLUGIN.getPackagingType() ) )
-            {
-                installDependentArtifacts( artifact, artifactDependencies, localRepositoryPath
);
-            }
-        }
-  */
         if ( addResolvedDependenciesToProject )
         {
             for ( Artifact artifact : resolvedDependencies )
@@ -181,81 +158,6 @@
             resolvedDependencies.addAll( gacDependencies );
             project.setDependencyArtifacts( resolvedDependencies );
         }
-    }
-
-    private void installDependentArtifacts( Artifact sourceArtifact, Set<Artifact>
resolvedDependencies,
-                                            String localRepositoryPath )
-        throws ArtifactResolutionException
-    {
-        List<Artifact> executableDependencies = getDependenciesForExecutable( sourceArtifact,
resolvedDependencies );
-        File sourceFileDirectory =
-            new File( localRepositoryPath, new AssemblyRepositoryLayout().pathOf( sourceArtifact
) ).getParentFile();
-        logger.info( "NMAVEN-xxx-000: Destination Artifact: " + sourceArtifact.getGroupId()
+ ":" +
-            sourceArtifact.getArtifactId() + ":" + sourceArtifact.getVersion() );
-        for ( Artifact executableDependency : executableDependencies )
-        {
-
-            if ( executableDependency.getFile() == null )
-            {
-                logger.info( "File is null: Artifact ID = " + executableDependency.getArtifactId()
);
-                continue;
-            }
-            File destFile = new File( sourceFileDirectory, executableDependency.getFile().getName()
);
-
-            logger.info( "Destination File = " + destFile.getAbsolutePath() );
-            logger.info( "Conditions : " + !destFile.exists() + ":" +
-                ( destFile.lastModified() < executableDependency.getFile().lastModified()
) );
-            if ( !destFile.exists() || destFile.lastModified() < executableDependency.getFile().lastModified()
)
-            {
-                try
-                {
-                    logger.info( "NMAVEN-xxx-000: Copying: File = " + executableDependency.getFile().getName()
);
-                    FileUtils.copyFileToDirectory( executableDependency.getFile(), sourceFileDirectory
);
-
-                }
-                catch ( IOException e )
-                {
-                    throw new ArtifactResolutionException(
-                        "NMAVEN-xxx-000: Unable to install all dependent files for executable
or plugin",
-                        sourceArtifact );
-                }
-            }
-        }
-        logger.info( "------------------------------------------------------" );
-    }
-
-    private List<String> getDependentIdsFor( Artifact executable, Set<Artifact>
resolvedDependencies )
-    {
-        for ( Artifact artifact : resolvedDependencies )
-        {
-            logger.info("Checking IDs: " + artifact.getId() + " : " + executable.getId());
-            logger.info("SIZE = " + artifact.getDependencyTrail());
-            if ( artifact.getId().equals( executable.getId() ) )
-            {
-                logger.info("MATCH");
-                return artifact.getDependencyTrail();
-            }
-        }
-        return new ArrayList<String>();
-    }
-
-    private List<Artifact> getDependenciesForExecutable( Artifact executable, Set<Artifact>
resolvedDependencies )
-    {
-        List<Artifact> artifacts = new ArrayList<Artifact>();
-        logger.info( "EXE ID = " + executable.getId() );
-        for ( String id : getDependentIdsFor( executable, resolvedDependencies ) )
-        {
-            logger.info("Dependent ID = " + id);
-            for ( Artifact artifact : resolvedDependencies )
-            {
-                if ( artifact.getId().equals( id ) )
-                {
-                    logger.info("Adding ID = " + id);
-                    artifacts.add( artifact );
-                }
-            }
-        }
-        return artifacts;
     }
 
     private static class GacFilter

Modified: incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/CompilerContextImpl.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/CompilerContextImpl.java?view=diff&rev=537110&r1=537109&r2=537110
==============================================================================
--- incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/CompilerContextImpl.java
(original)
+++ incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/CompilerContextImpl.java
Thu May 10 23:06:22 2007
@@ -254,7 +254,7 @@
         this.compilerRequirement = compilerRequirement;
         libraries = new ArrayList<Artifact>();
         modules = new ArrayList<Artifact>();
-        artifactContext.init( project, config.getLocalRepository() );
+        artifactContext.init( project, project.getRemoteArtifactRepositories(), config.getLocalRepository()
);
 
         Set<Artifact> artifacts = project.getDependencyArtifacts();//Can add WFC deps
prior
         for ( Artifact artifact : artifacts )

Modified: incubator/nmaven/branches/SI_XPT/plugins/maven-install-plugin/src/main/java/org/apache/maven/dotnet/plugin/install/FileInstallerMojo.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/plugins/maven-install-plugin/src/main/java/org/apache/maven/dotnet/plugin/install/FileInstallerMojo.java?view=diff&rev=537110&r1=537109&r2=537110
==============================================================================
--- incubator/nmaven/branches/SI_XPT/plugins/maven-install-plugin/src/main/java/org/apache/maven/dotnet/plugin/install/FileInstallerMojo.java
(original)
+++ incubator/nmaven/branches/SI_XPT/plugins/maven-install-plugin/src/main/java/org/apache/maven/dotnet/plugin/install/FileInstallerMojo.java
Thu May 10 23:06:22 2007
@@ -98,7 +98,7 @@
     public void execute()
         throws MojoExecutionException
     {
-        artifactContext.init( project, localRepository );
+        artifactContext.init( project, project.getRemoteArtifactRepositories(), localRepository
);
         if ( generatePom )
         {
             try

Modified: incubator/nmaven/branches/SI_XPT/plugins/maven-install-plugin/src/main/java/org/apache/maven/dotnet/plugin/install/TargetModuleInstallerMojo.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/plugins/maven-install-plugin/src/main/java/org/apache/maven/dotnet/plugin/install/TargetModuleInstallerMojo.java?view=diff&rev=537110&r1=537109&r2=537110
==============================================================================
--- incubator/nmaven/branches/SI_XPT/plugins/maven-install-plugin/src/main/java/org/apache/maven/dotnet/plugin/install/TargetModuleInstallerMojo.java
(original)
+++ incubator/nmaven/branches/SI_XPT/plugins/maven-install-plugin/src/main/java/org/apache/maven/dotnet/plugin/install/TargetModuleInstallerMojo.java
Thu May 10 23:06:22 2007
@@ -83,7 +83,7 @@
                 "NMAVEN-1002-001: Failed to create the repository registry for this plugin",
e );
         }
 
-        artifactContext.init( project, localRepository );
+        artifactContext.init( project, project.getRemoteArtifactRepositories(), localRepository
);
         try
         {
             artifactContext.getArtifactInstaller().installNetModulesToTargetDirectory( project.getArtifact()
);

Modified: incubator/nmaven/branches/SI_XPT/plugins/maven-resolver-plugin/src/main/java/org/apache/maven/dotnet/plugin/resolver/NetDependencyResolverMojo.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/plugins/maven-resolver-plugin/src/main/java/org/apache/maven/dotnet/plugin/resolver/NetDependencyResolverMojo.java?view=diff&rev=537110&r1=537109&r2=537110
==============================================================================
--- incubator/nmaven/branches/SI_XPT/plugins/maven-resolver-plugin/src/main/java/org/apache/maven/dotnet/plugin/resolver/NetDependencyResolverMojo.java
(original)
+++ incubator/nmaven/branches/SI_XPT/plugins/maven-resolver-plugin/src/main/java/org/apache/maven/dotnet/plugin/resolver/NetDependencyResolverMojo.java
Thu May 10 23:06:22 2007
@@ -38,7 +38,6 @@
 import org.apache.maven.dotnet.artifact.NetDependenciesRepository;
 import org.apache.maven.dotnet.artifact.NetDependencyMatchPolicy;
 import org.apache.maven.dotnet.artifact.ArtifactContext;
-import org.apache.maven.dotnet.artifact.ArtifactType;
 import org.apache.maven.dotnet.model.netdependency.NetDependency;
 import org.apache.maven.dotnet.executable.NetExecutable;
 import org.apache.maven.dotnet.executable.ExecutionException;
@@ -153,7 +152,7 @@
             dependencies.add( dependency );
         }
 
-        artifactContext.init( project, new File( localRepository ) );
+        artifactContext.init( project, project.getRemoteArtifactRepositories(), new File(
localRepository ) );
         try
         {
             artifactContext.getArtifactInstaller().resolveAndInstallNetDependenciesForProfile(
profile,

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=537110&r1=537109&r2=537110
==============================================================================
--- 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
Thu May 10 23:06:22 2007
@@ -8,8 +8,10 @@
 import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
 import org.apache.maven.artifact.installer.ArtifactInstallationException;
 import org.apache.maven.artifact.handler.manager.ArtifactHandlerManager;
-import org.apache.maven.artifact.handler.DefaultArtifactHandler;
 import org.apache.maven.artifact.handler.ArtifactHandler;
+import org.apache.maven.artifact.repository.ArtifactRepository;
+import org.apache.maven.artifact.repository.DefaultArtifactRepository;
+import org.apache.maven.artifact.repository.layout.DefaultRepositoryLayout;
 import org.apache.maven.dotnet.artifact.ArtifactContext;
 import org.apache.maven.project.MavenProject;
 import org.codehaus.plexus.util.IOUtil;
@@ -17,11 +19,11 @@
 import java.io.File;
 import java.io.IOException;
 import java.io.FileOutputStream;
-import java.io.FileWriter;
 import java.io.OutputStreamWriter;
 import java.util.ArrayList;
 import java.util.Map;
 import java.util.HashMap;
+import java.util.List;
 
 /**
  * @author Shane Isbell
@@ -71,8 +73,12 @@
         handlers.put( "library", createArtifactHandler( "library", "dll" ) );
         handlers.put( "netplugin", createArtifactHandler( "netplugin", "dll" ) );
         artifactHandlerManager.addHandlers( handlers );
-
-        artifactContext.init( project, new File( localRepository ) );
+        ArtifactRepository remoteArtifactRepository = new DefaultArtifactRepository( "nmaven",
+                                                                                     "http://localhost:8080/repository",
+                                                                                     new
DefaultRepositoryLayout() );
+        List<ArtifactRepository> remoteRepositories = new ArrayList<ArtifactRepository>();
+        remoteRepositories.add( remoteArtifactRepository );
+        artifactContext.init( project, remoteRepositories, new File( localRepository ) );
 
         try
         {

Modified: incubator/nmaven/branches/SI_XPT/plugins/maven-vsinstaller-plugin/src/main/resources/template/NMaven.VisualStudio.AddIn
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/plugins/maven-vsinstaller-plugin/src/main/resources/template/NMaven.VisualStudio.AddIn?view=diff&rev=537110&r1=537109&r2=537110
==============================================================================
--- incubator/nmaven/branches/SI_XPT/plugins/maven-vsinstaller-plugin/src/main/resources/template/NMaven.VisualStudio.AddIn
(original)
+++ incubator/nmaven/branches/SI_XPT/plugins/maven-vsinstaller-plugin/src/main/resources/template/NMaven.VisualStudio.AddIn
Thu May 10 23:06:22 2007
@@ -9,5 +9,8 @@
     <FullClassName>NMaven.VisualStudio.Addin.Connect</FullClassName>
     <FriendlyName>NMaven.VisualStudio.Addin</FriendlyName>
     <Description>NMaven provides Maven 2.x plugins to support building of .NET applications</Description>
+    <LoadBehavior>0</LoadBehavior>
+    <CommandLineSafe>0</CommandLineSafe>
+    <CommandPreload>1</CommandPreload>    
   </Addin>
 </Extensibility>

Modified: incubator/nmaven/branches/SI_XPT/plugins/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/plugins/pom.xml?view=diff&rev=537110&r1=537109&r2=537110
==============================================================================
--- incubator/nmaven/branches/SI_XPT/plugins/pom.xml (original)
+++ incubator/nmaven/branches/SI_XPT/plugins/pom.xml Thu May 10 23:06:22 2007
@@ -36,6 +36,7 @@
     <module>maven-resgen-plugin</module>
     <module>maven-resolver-plugin</module>
     <module>maven-test-plugin</module>
+    <module>maven-vsinstaller-plugin</module>    
     <module>maven-webapp-plugin</module>
     <module>maven-xsd-plugin</module>
     <module>maven-xsp-plugin</module>



Mime
View raw message