From nmaven-commits-return-426-apmail-incubator-nmaven-commits-archive=incubator.apache.org@incubator.apache.org Tue Jul 24 15:24:37 2007 Return-Path: Delivered-To: apmail-incubator-nmaven-commits-archive@locus.apache.org Received: (qmail 69236 invoked from network); 24 Jul 2007 15:24:36 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 24 Jul 2007 15:24:36 -0000 Received: (qmail 49285 invoked by uid 500); 24 Jul 2007 15:24:38 -0000 Delivered-To: apmail-incubator-nmaven-commits-archive@incubator.apache.org Received: (qmail 49258 invoked by uid 500); 24 Jul 2007 15:24:38 -0000 Mailing-List: contact nmaven-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: nmaven-dev@incubator.apache.org Delivered-To: mailing list nmaven-commits@incubator.apache.org Received: (qmail 49240 invoked by uid 99); 24 Jul 2007 15:24:37 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 24 Jul 2007 08:24:37 -0700 X-ASF-Spam-Status: No, hits=-98.6 required=10.0 tests=ALL_TRUSTED,INFO_TLD,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 24 Jul 2007 08:24:35 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 289271A981A; Tue, 24 Jul 2007 08:24:15 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r559080 - in /incubator/nmaven/branches/SI_GAC: assemblies/NMaven.Artifact/ components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/ components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ component... Date: Tue, 24 Jul 2007 15:24:13 -0000 To: nmaven-commits@incubator.apache.org From: sisbell@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070724152415.289271A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: sisbell Date: Tue Jul 24 08:24:10 2007 New Revision: 559080 URL: http://svn.apache.org/viewvc?view=rev&rev=559080 Log: Bug fixes for the exe.config projects and for transitive resolving. Modified: incubator/nmaven/branches/SI_GAC/assemblies/NMaven.Artifact/pom.xml incubator/nmaven/branches/SI_GAC/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/AssemblyResolver.java incubator/nmaven/branches/SI_GAC/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactInstallerImpl.java incubator/nmaven/branches/SI_GAC/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/AssemblyResolverImpl.java incubator/nmaven/branches/SI_GAC/components/dotnet-dao/project/src/main/java/org/apache/maven/dotnet/dao/ProjectDao.java incubator/nmaven/branches/SI_GAC/components/dotnet-dao/project/src/main/java/org/apache/maven/dotnet/dao/impl/ProjectDaoImpl.java incubator/nmaven/branches/SI_GAC/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/ComponentInitializerMojo.java incubator/nmaven/branches/SI_GAC/plugins/maven-fxcop-plugin/src/main/java/org/apache/maven/dotnet/plugin/fxcop/FxCopAggregateMojo.java incubator/nmaven/branches/SI_GAC/plugins/maven-fxcop-plugin/src/main/java/org/apache/maven/dotnet/plugin/fxcop/FxCopMojo.java incubator/nmaven/branches/SI_GAC/plugins/maven-install-plugin/src/main/java/org/apache/maven/dotnet/plugin/install/InstallerMojo.java incubator/nmaven/branches/SI_GAC/plugins/maven-resgen-plugin/src/main/java/org/apache/maven/dotnet/plugin/resgen/ResourceGeneratorMojo.java incubator/nmaven/branches/SI_GAC/plugins/maven-resolver-plugin/src/main/java/org/apache/maven/dotnet/plugin/resolver/NetDependencyResolverMojo.java incubator/nmaven/branches/SI_GAC/plugins/maven-test-plugin/src/main/java/org/apache/maven/dotnet/plugin/test/TesterMojo.java Modified: incubator/nmaven/branches/SI_GAC/assemblies/NMaven.Artifact/pom.xml URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_GAC/assemblies/NMaven.Artifact/pom.xml?view=diff&rev=559080&r1=559079&r2=559080 ============================================================================== --- incubator/nmaven/branches/SI_GAC/assemblies/NMaven.Artifact/pom.xml (original) +++ incubator/nmaven/branches/SI_GAC/assemblies/NMaven.Artifact/pom.xml Tue Jul 24 08:24:10 2007 @@ -34,7 +34,6 @@ NMaven.Model.Pom library 0.14 - 4b435f4d76e2f0e6 NUnit Modified: incubator/nmaven/branches/SI_GAC/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/AssemblyResolver.java URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_GAC/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/AssemblyResolver.java?view=diff&rev=559080&r1=559079&r2=559080 ============================================================================== --- incubator/nmaven/branches/SI_GAC/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/AssemblyResolver.java (original) +++ incubator/nmaven/branches/SI_GAC/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/AssemblyResolver.java Tue Jul 24 08:24:10 2007 @@ -45,7 +45,6 @@ * Resolves transitive dependencies for the project. * * @param mavenProject - * @param sourceArtifact the artifact to which the resolved dependencies belong * @param dependencies the list of dependencies of the specified artifact * @param remoteArtifactRepositories * @param localArtifactRepository @@ -58,7 +57,7 @@ * @throws ArtifactResolutionException * @throws ArtifactNotFoundException */ - void resolveTransitivelyFor( MavenProject mavenProject, Artifact sourceArtifact, List dependencies, + void resolveTransitivelyFor( MavenProject mavenProject, List dependencies, List remoteArtifactRepositories, File localArtifactRepository, boolean addResolvedDependenciesToProject ) throws ArtifactResolutionException, ArtifactNotFoundException; Modified: incubator/nmaven/branches/SI_GAC/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactInstallerImpl.java URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_GAC/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactInstallerImpl.java?view=diff&rev=559080&r1=559079&r2=559080 ============================================================================== --- incubator/nmaven/branches/SI_GAC/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactInstallerImpl.java (original) +++ incubator/nmaven/branches/SI_GAC/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactInstallerImpl.java Tue Jul 24 08:24:10 2007 @@ -161,8 +161,8 @@ matchPolicies.add( new ProfileMatchPolicy( profile ) ); dependencies.addAll( repository.getDependenciesFor( matchPolicies ) ); - assemblyResolver.resolveTransitivelyFor( project, project.getArtifact(), dependencies, - remoteArtifactRepositories, localRepository, false ); + assemblyResolver.resolveTransitivelyFor( new MavenProject(), dependencies, remoteArtifactRepositories, + localRepository, false ); //Do Library Installs for Net Dependencies matchPolicies = new ArrayList(); @@ -263,6 +263,20 @@ { ApplicationConfig applicationConfig = artifactContext.getApplicationConfigFor( artifact ); File configExeFile = new File( applicationConfig.getConfigDestinationPath() ); + if ( configExeFile.exists() ) + { + try + { + FileUtils.copyFileToDirectory( configExeFile, PathUtil.getUserAssemblyCacheFileFor( artifact, + localRepository ).getParentFile() ); + } + catch ( IOException e ) + { + throw new ArtifactInstallationException( "NMAVEN-002-003b: Failed to install artifact: ID = " + + artifact.getId() + ", File = " + + ( ( artifact.getFile() != null ) ? artifact.getFile().getAbsolutePath() : "" ), e ); + } + } try { @@ -273,7 +287,8 @@ File artifactFile = artifact.getFile(); try { - FileUtils.copyFile( artifactFile, PathUtil.getUserAssemblyCacheFileFor( artifact, localRepository ) ); + FileUtils.copyFile( artifactFile, + PathUtil.getUserAssemblyCacheFileFor( artifact, localRepository ) ); } catch ( IOException e ) { @@ -313,7 +328,8 @@ try { - dao.storeModelAndResolveDependencies( model, pomFile.getParentFile(), null, new ArrayList() ); + dao.storeModelAndResolveDependencies( model, pomFile.getParentFile(), null, + new ArrayList() ); } catch ( java.io.IOException e ) { Modified: incubator/nmaven/branches/SI_GAC/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/AssemblyResolverImpl.java URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_GAC/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/AssemblyResolverImpl.java?view=diff&rev=559080&r1=559079&r2=559080 ============================================================================== --- incubator/nmaven/branches/SI_GAC/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/AssemblyResolverImpl.java (original) +++ incubator/nmaven/branches/SI_GAC/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/AssemblyResolverImpl.java Tue Jul 24 08:24:10 2007 @@ -151,11 +151,9 @@ /** * @see AssemblyResolver#resolveTransitivelyFor */ - public void resolveTransitivelyFor( MavenProject mavenProject, Artifact sourceArtifact, - List dependencies, + public void resolveTransitivelyFor( MavenProject mavenProject, List dependencies, List remoteArtifactRepositories, - File localArtifactRepository, - boolean addResolvedDependenciesToProject ) + File localArtifactRepository, boolean addResolvedDependenciesToProject ) throws ArtifactResolutionException, ArtifactNotFoundException { //Check that the list of dependencies matches the first level RDF Repo @@ -167,9 +165,11 @@ project.setGroupId( mavenProject.getGroupId() ); project.setArtifactId( mavenProject.getArtifactId() ); project.setVersion( mavenProject.getVersion() ); - project.setArtifactType( mavenProject.getArtifact().getType() ); + project.setArtifactType( + ( mavenProject.getArtifact() != null ) ? mavenProject.getArtifact().getType() : "library" ); - project.setPublicKeyTokenId( mavenProject.getArtifact().getClassifier() ); + project.setPublicKeyTokenId( + ( mavenProject.getArtifact() != null ) ? mavenProject.getArtifact().getClassifier() : null ); for ( Dependency dependency : dependencies ) { @@ -224,6 +224,5 @@ { mavenProject.setDependencyArtifacts( artifactDependencies ); } - } } Modified: incubator/nmaven/branches/SI_GAC/components/dotnet-dao/project/src/main/java/org/apache/maven/dotnet/dao/ProjectDao.java URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_GAC/components/dotnet-dao/project/src/main/java/org/apache/maven/dotnet/dao/ProjectDao.java?view=diff&rev=559080&r1=559079&r2=559080 ============================================================================== --- incubator/nmaven/branches/SI_GAC/components/dotnet-dao/project/src/main/java/org/apache/maven/dotnet/dao/ProjectDao.java (original) +++ incubator/nmaven/branches/SI_GAC/components/dotnet-dao/project/src/main/java/org/apache/maven/dotnet/dao/ProjectDao.java Tue Jul 24 08:24:10 2007 @@ -30,12 +30,14 @@ Project getProjectFor( MavenProject mavenProject ) throws IOException; + void storeProject( Project project, File localRepository, List artifactRepositories ) + throws IOException; + Set storeProjectAndResolveDependencies( Project project, File localRepository, List artifactRepositories ) throws IOException; - Set storeModelAndResolveDependencies( Model model, File pomFileDirectory, - File localArtifactRepository, + Set storeModelAndResolveDependencies( Model model, File pomFileDirectory, File localArtifactRepository, List artifactRepositories ) throws IOException; Modified: incubator/nmaven/branches/SI_GAC/components/dotnet-dao/project/src/main/java/org/apache/maven/dotnet/dao/impl/ProjectDaoImpl.java URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_GAC/components/dotnet-dao/project/src/main/java/org/apache/maven/dotnet/dao/impl/ProjectDaoImpl.java?view=diff&rev=559080&r1=559079&r2=559080 ============================================================================== --- incubator/nmaven/branches/SI_GAC/components/dotnet-dao/project/src/main/java/org/apache/maven/dotnet/dao/impl/ProjectDaoImpl.java (original) +++ incubator/nmaven/branches/SI_GAC/components/dotnet-dao/project/src/main/java/org/apache/maven/dotnet/dao/impl/ProjectDaoImpl.java Tue Jul 24 08:24:10 2007 @@ -120,9 +120,9 @@ tupleQuery.setBinding( ProjectUri.ARTIFACT_ID.getObjectBinding(), valueFactory.createLiteral( artifactId ) ); tupleQuery.setBinding( ProjectUri.VERSION.getObjectBinding(), valueFactory.createLiteral( version ) ); - long startQueryTime = System.currentTimeMillis(); + //long startQueryTime = System.currentTimeMillis(); TupleQueryResult result = tupleQuery.evaluate(); - logger.info( "Get Project Query: Time = " + ( System.currentTimeMillis() - startQueryTime ) ); + //logger.info( "Get Project Query: Time = " + ( System.currentTimeMillis() - startQueryTime ) ); if ( !result.hasNext() ) { if ( artifactType != null && artifactType.startsWith( "gac" ) ) @@ -218,6 +218,13 @@ mavenProject.getArtifact().getType(), mavenProject.getArtifact().getClassifier() ); } + public void storeProject( Project project, File localRepository, List artifactRepositories ) + throws IOException + { + + } + + public Set storeProjectAndResolveDependencies( Project project, File localRepository, List artifactRepositories ) throws IOException, IllegalArgumentException @@ -512,16 +519,13 @@ projectUris.add( ProjectUri.DEPENDENCY ); String query = "SELECT * FROM " + this.constructQueryFragmentFor( "{x}", projectUris ); - // System.out.println( query ); Set projectDependencies = new HashSet(); - // String dependencyQuery = - // "SELECT DISTINCT * FROM {x} {groupIdValue}; {artifactIdValue}; {versionValue}"; TupleQuery tq = repositoryConnection.prepareTupleQuery( QueryLanguage.SERQL, query ); tq.setBinding( "x", dependencyUri ); - long startQueryTime = System.currentTimeMillis(); + //long startQueryTime = System.currentTimeMillis(); TupleQueryResult dependencyResult = tq.evaluate(); - logger.info( "Query Dependencies: Time = " + ( System.currentTimeMillis() - startQueryTime ) ); + //logger.info( "Query Dependencies: Time = " + ( System.currentTimeMillis() - startQueryTime ) ); while ( dependencyResult.hasNext() ) { ProjectDependency projectDependency = new ProjectDependency(); Modified: incubator/nmaven/branches/SI_GAC/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_GAC/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/ComponentInitializerMojo.java?view=diff&rev=559080&r1=559079&r2=559080 ============================================================================== --- incubator/nmaven/branches/SI_GAC/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/ComponentInitializerMojo.java (original) +++ incubator/nmaven/branches/SI_GAC/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/ComponentInitializerMojo.java Tue Jul 24 08:24:10 2007 @@ -116,7 +116,7 @@ try { - assemblyResolver.resolveTransitivelyFor( project, project.getArtifact(), project.getDependencies(), + assemblyResolver.resolveTransitivelyFor( project, project.getDependencies(), project.getRemoteArtifactRepositories(), localRepository, true ); } Modified: incubator/nmaven/branches/SI_GAC/plugins/maven-fxcop-plugin/src/main/java/org/apache/maven/dotnet/plugin/fxcop/FxCopAggregateMojo.java URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_GAC/plugins/maven-fxcop-plugin/src/main/java/org/apache/maven/dotnet/plugin/fxcop/FxCopAggregateMojo.java?view=diff&rev=559080&r1=559079&r2=559080 ============================================================================== --- incubator/nmaven/branches/SI_GAC/plugins/maven-fxcop-plugin/src/main/java/org/apache/maven/dotnet/plugin/fxcop/FxCopAggregateMojo.java (original) +++ incubator/nmaven/branches/SI_GAC/plugins/maven-fxcop-plugin/src/main/java/org/apache/maven/dotnet/plugin/fxcop/FxCopAggregateMojo.java Tue Jul 24 08:24:10 2007 @@ -105,7 +105,7 @@ try { - assemblyResolver.resolveTransitivelyFor( project, project.getArtifact(), aggregateDependencies, + assemblyResolver.resolveTransitivelyFor( project, aggregateDependencies, project.getRemoteArtifactRepositories(), localRepository, true ); } Modified: incubator/nmaven/branches/SI_GAC/plugins/maven-fxcop-plugin/src/main/java/org/apache/maven/dotnet/plugin/fxcop/FxCopMojo.java URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_GAC/plugins/maven-fxcop-plugin/src/main/java/org/apache/maven/dotnet/plugin/fxcop/FxCopMojo.java?view=diff&rev=559080&r1=559079&r2=559080 ============================================================================== --- incubator/nmaven/branches/SI_GAC/plugins/maven-fxcop-plugin/src/main/java/org/apache/maven/dotnet/plugin/fxcop/FxCopMojo.java (original) +++ incubator/nmaven/branches/SI_GAC/plugins/maven-fxcop-plugin/src/main/java/org/apache/maven/dotnet/plugin/fxcop/FxCopMojo.java Tue Jul 24 08:24:10 2007 @@ -95,7 +95,7 @@ try { - assemblyResolver.resolveTransitivelyFor( project, project.getArtifact(), project.getDependencies(), + assemblyResolver.resolveTransitivelyFor( project, project.getDependencies(), project.getRemoteArtifactRepositories(), localRepository, true ); } Modified: incubator/nmaven/branches/SI_GAC/plugins/maven-install-plugin/src/main/java/org/apache/maven/dotnet/plugin/install/InstallerMojo.java URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_GAC/plugins/maven-install-plugin/src/main/java/org/apache/maven/dotnet/plugin/install/InstallerMojo.java?view=diff&rev=559080&r1=559079&r2=559080 ============================================================================== --- incubator/nmaven/branches/SI_GAC/plugins/maven-install-plugin/src/main/java/org/apache/maven/dotnet/plugin/install/InstallerMojo.java (original) +++ incubator/nmaven/branches/SI_GAC/plugins/maven-install-plugin/src/main/java/org/apache/maven/dotnet/plugin/install/InstallerMojo.java Tue Jul 24 08:24:10 2007 @@ -29,6 +29,7 @@ import org.apache.maven.dotnet.artifact.ArtifactContext; import org.apache.maven.dotnet.artifact.ArtifactType; import org.apache.maven.dotnet.artifact.PathUtil; +import org.apache.maven.dotnet.artifact.ApplicationConfig; import org.apache.maven.dotnet.executable.NetExecutable; import org.apache.maven.dotnet.executable.ExecutionException; import org.apache.maven.dotnet.PlatformUnsupportedException; @@ -144,34 +145,36 @@ { storeMavenProject( project ); } - else if ( isGacInstall ) + else { - try - { - NetExecutable netExecutable = - netExecutableFactory.getNetExecutableFor( vendor, frameworkVersion, profile, getCommands(), null ); - netExecutable.execute(); - getLog().info( "NMAVEN-xxx-003: Installed Assembly into GAC: Assembly = " + - project.getArtifact().getFile() + ", Vendor = " + netExecutable.getVendor().getVendorName() ); - } - catch ( ExecutionException e ) + if ( isGacInstall ) { - throw new MojoExecutionException( "NMAVEN-1400-000: Unable to execute gacutil: Vendor " + vendor + - ", frameworkVersion = " + frameworkVersion + ", Profile = " + profile, e ); + try + { + NetExecutable netExecutable = netExecutableFactory.getNetExecutableFor( vendor, frameworkVersion, + profile, getCommands(), + null ); + netExecutable.execute(); + getLog().info( "NMAVEN-xxx-003: Installed Assembly into GAC: Assembly = " + + project.getArtifact().getFile() + ", Vendor = " + netExecutable.getVendor().getVendorName() ); + } + catch ( ExecutionException e ) + { + throw new MojoExecutionException( "NMAVEN-1400-000: Unable to execute gacutil: Vendor " + vendor + + ", frameworkVersion = " + frameworkVersion + ", Profile = " + profile, e ); + } + catch ( PlatformUnsupportedException e ) + { + throw new MojoExecutionException( "NMAVEN-1400-001: Platform Unsupported: Vendor " + vendor + + ", frameworkVersion = " + frameworkVersion + ", Profile = " + profile, e ); + } + storeMavenProject( project ); } - catch ( PlatformUnsupportedException e ) - { - throw new MojoExecutionException( "NMAVEN-1400-001: Platform Unsupported: Vendor " + vendor + - ", frameworkVersion = " + frameworkVersion + ", Profile = " + profile, e ); - } - storeMavenProject( project ); - } - else //UAC install - { - Artifact artifact = project.getArtifact(); + + //UAC install try { - artifactContext.getArtifactInstaller().installArtifactWithPom( artifact, pomFile, true ); + artifactContext.getArtifactInstaller().installArtifactWithPom( project.getArtifact(), pomFile, true ); } catch ( ArtifactInstallationException e ) { @@ -183,6 +186,7 @@ // To allow executables to be runnable from the repo Artifact artifact = project.getArtifact(); + if ( artifact.getType().equals( ArtifactType.EXE.getPackagingType() ) || artifact.getType().equals( ArtifactType.NETPLUGIN.getPackagingType() ) || artifact.getType().equals( ArtifactType.VISUAL_STUDIO_ADDIN.getPackagingType() ) || @@ -190,10 +194,25 @@ { File pab = PathUtil.getPrivateApplicationBaseFileFor( artifact, localRepository ); List dependencies = project.getDependencies(); + if ( artifact.getType().equals( ArtifactType.EXE.getPackagingType() ) ) + { + ApplicationConfig applicationConfig = artifactContext.getApplicationConfigFor( artifact ); + File configExeFile = new File( applicationConfig.getConfigDestinationPath() ); + if ( configExeFile.exists() ) + { + Dependency dependency = new Dependency(); + dependency.setGroupId( artifact.getGroupId() ); + dependency.setArtifactId( artifact.getArtifactId() ); + dependency.setVersion( artifact.getVersion() ); + dependency.setType( ArtifactType.EXECONFIG.getPackagingType() ); + dependencies.add( dependency ); + } + } try { artifactContext.getArtifactInstaller() - .installArtifactAndDependenciesIntoPrivateApplicationBase( pab, artifact, dependencies ); + .installArtifactAndDependenciesIntoPrivateApplicationBase( pab.getParentFile(), artifact, + dependencies ); } catch ( ArtifactInstallationException e ) { Modified: incubator/nmaven/branches/SI_GAC/plugins/maven-resgen-plugin/src/main/java/org/apache/maven/dotnet/plugin/resgen/ResourceGeneratorMojo.java URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_GAC/plugins/maven-resgen-plugin/src/main/java/org/apache/maven/dotnet/plugin/resgen/ResourceGeneratorMojo.java?view=diff&rev=559080&r1=559079&r2=559080 ============================================================================== --- incubator/nmaven/branches/SI_GAC/plugins/maven-resgen-plugin/src/main/java/org/apache/maven/dotnet/plugin/resgen/ResourceGeneratorMojo.java (original) +++ incubator/nmaven/branches/SI_GAC/plugins/maven-resgen-plugin/src/main/java/org/apache/maven/dotnet/plugin/resgen/ResourceGeneratorMojo.java Tue Jul 24 08:24:10 2007 @@ -111,6 +111,7 @@ localRepository = new File( System.getProperty( "user.home" ), ".m2/repository" ); } + artifactContext.init( project, project.getRemoteArtifactRepositories(), localRepository ); /* * We should do this check at a lower level (to keep consistent behavior with the nmaven-settings.xml) * but we do not currently support the execution of specific plugins based on vendor info. Modified: incubator/nmaven/branches/SI_GAC/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_GAC/plugins/maven-resolver-plugin/src/main/java/org/apache/maven/dotnet/plugin/resolver/NetDependencyResolverMojo.java?view=diff&rev=559080&r1=559079&r2=559080 ============================================================================== --- incubator/nmaven/branches/SI_GAC/plugins/maven-resolver-plugin/src/main/java/org/apache/maven/dotnet/plugin/resolver/NetDependencyResolverMojo.java (original) +++ incubator/nmaven/branches/SI_GAC/plugins/maven-resolver-plugin/src/main/java/org/apache/maven/dotnet/plugin/resolver/NetDependencyResolverMojo.java Tue Jul 24 08:24:10 2007 @@ -166,7 +166,7 @@ try { artifactContext.getArtifactInstaller().resolveAndInstallNetDependenciesForProfile( profile, - new ArrayList() ); + dependencies ); } catch ( ArtifactResolutionException e ) { Modified: incubator/nmaven/branches/SI_GAC/plugins/maven-test-plugin/src/main/java/org/apache/maven/dotnet/plugin/test/TesterMojo.java URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_GAC/plugins/maven-test-plugin/src/main/java/org/apache/maven/dotnet/plugin/test/TesterMojo.java?view=diff&rev=559080&r1=559079&r2=559080 ============================================================================== --- incubator/nmaven/branches/SI_GAC/plugins/maven-test-plugin/src/main/java/org/apache/maven/dotnet/plugin/test/TesterMojo.java (original) +++ incubator/nmaven/branches/SI_GAC/plugins/maven-test-plugin/src/main/java/org/apache/maven/dotnet/plugin/test/TesterMojo.java Tue Jul 24 08:24:10 2007 @@ -24,8 +24,6 @@ import org.apache.maven.artifact.Artifact; import org.apache.maven.artifact.resolver.ArtifactResolutionException; import org.apache.maven.artifact.resolver.ArtifactNotFoundException; -import org.apache.maven.artifact.repository.ArtifactRepository; -import org.apache.maven.artifact.repository.DefaultArtifactRepository; import org.codehaus.plexus.util.FileUtils; import java.util.ArrayList; @@ -162,7 +160,7 @@ try { - assemblyResolver.resolveTransitivelyFor( project, project.getArtifact(), project.getDependencies(), + assemblyResolver.resolveTransitivelyFor( project, project.getDependencies(), project.getRemoteArtifactRepositories(), localRepository, true ); } catch ( ArtifactResolutionException e )