From nmaven-commits-return-549-apmail-incubator-nmaven-commits-archive=incubator.apache.org@incubator.apache.org Thu Sep 27 02:21:46 2007 Return-Path: Delivered-To: apmail-incubator-nmaven-commits-archive@locus.apache.org Received: (qmail 56600 invoked from network); 27 Sep 2007 02:21:46 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 27 Sep 2007 02:21:46 -0000 Received: (qmail 58831 invoked by uid 500); 27 Sep 2007 02:21:36 -0000 Delivered-To: apmail-incubator-nmaven-commits-archive@incubator.apache.org Received: (qmail 58808 invoked by uid 500); 27 Sep 2007 02:21:36 -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 58799 invoked by uid 99); 27 Sep 2007 02:21:36 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 26 Sep 2007 19:21:36 -0700 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED 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; Thu, 27 Sep 2007 02:24:03 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id CDB851A983A; Wed, 26 Sep 2007 19:21:22 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r579872 - in /incubator/nmaven/trunk/plugins: maven-embedder-plugin/src/main/java/org/apache/maven/dotnet/plugin/embedder/ maven-test-plugin/src/main/java/org/apache/maven/dotnet/plugin/test/ maven-vsinstaller-plugin/src/main/java/org/apach... Date: Thu, 27 Sep 2007 02:21:21 -0000 To: nmaven-commits@incubator.apache.org From: sisbell@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20070927022122.CDB851A983A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: sisbell Date: Wed Sep 26 19:21:20 2007 New Revision: 579872 URL: http://svn.apache.org/viewvc?rev=579872&view=rev Log: Plugins now correctly read the version of NMaven to run under. Modified: incubator/nmaven/trunk/plugins/maven-embedder-plugin/src/main/java/org/apache/maven/dotnet/plugin/embedder/EmbedderStarterMojo.java incubator/nmaven/trunk/plugins/maven-test-plugin/src/main/java/org/apache/maven/dotnet/plugin/test/TesterMojo.java incubator/nmaven/trunk/plugins/maven-vsinstaller-plugin/src/main/java/org/apache/maven/dotnet/plugin/vsinstaller/VsInstallerMojo.java incubator/nmaven/trunk/plugins/netplugins/pom.xml Modified: incubator/nmaven/trunk/plugins/maven-embedder-plugin/src/main/java/org/apache/maven/dotnet/plugin/embedder/EmbedderStarterMojo.java URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/plugins/maven-embedder-plugin/src/main/java/org/apache/maven/dotnet/plugin/embedder/EmbedderStarterMojo.java?rev=579872&r1=579871&r2=579872&view=diff ============================================================================== --- incubator/nmaven/trunk/plugins/maven-embedder-plugin/src/main/java/org/apache/maven/dotnet/plugin/embedder/EmbedderStarterMojo.java (original) +++ incubator/nmaven/trunk/plugins/maven-embedder-plugin/src/main/java/org/apache/maven/dotnet/plugin/embedder/EmbedderStarterMojo.java Wed Sep 26 19:21:20 2007 @@ -35,10 +35,12 @@ import org.apache.maven.artifact.repository.layout.DefaultRepositoryLayout; import org.apache.maven.dotnet.artifact.AssemblyResolver; import org.apache.maven.dotnet.artifact.ArtifactContext; +import org.apache.maven.dotnet.artifact.NetDependenciesRepository; import org.apache.maven.dotnet.vendor.VendorInfo; import org.apache.maven.dotnet.vendor.VendorFactory; import org.apache.maven.dotnet.vendor.VendorUnsupportedException; import org.apache.maven.dotnet.PlatformUnsupportedException; +import org.apache.maven.dotnet.registry.RepositoryRegistry; import java.util.List; import java.util.ArrayList; @@ -133,9 +135,11 @@ private String frameworkVersion; /** - * @parameter expression = "${project.version}" + * Provides access to configuration information used by NMaven. + * + * @component */ - private String pomVersion; + private org.apache.maven.dotnet.NMavenRepositoryRegistry nmavenRegistry; /** * File logger: needed for creating logs when the IDE starts because the console output and thrown exceptions are @@ -309,8 +313,23 @@ } } - private String artifactsToClassPath( Set artifacts ) + private String artifactsToClassPath( Set artifacts ) throws MojoExecutionException { + RepositoryRegistry repositoryRegistry; + try + { + repositoryRegistry = nmavenRegistry.createRepositoryRegistry(); + } + catch ( IOException e ) + { + throw new MojoExecutionException( + "NMAVEN-1400-002: Failed to create the repository registry for this plugin", e ); + } + + NetDependenciesRepository repository = + (NetDependenciesRepository) repositoryRegistry.find( "net-dependencies" ); + String pomVersion = repository.getProperty( "nmaven.version"); + StringBuffer sb = new StringBuffer(); for ( Artifact artifact : artifacts ) { Modified: incubator/nmaven/trunk/plugins/maven-test-plugin/src/main/java/org/apache/maven/dotnet/plugin/test/TesterMojo.java URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/plugins/maven-test-plugin/src/main/java/org/apache/maven/dotnet/plugin/test/TesterMojo.java?rev=579872&r1=579871&r2=579872&view=diff ============================================================================== --- incubator/nmaven/trunk/plugins/maven-test-plugin/src/main/java/org/apache/maven/dotnet/plugin/test/TesterMojo.java (original) +++ incubator/nmaven/trunk/plugins/maven-test-plugin/src/main/java/org/apache/maven/dotnet/plugin/test/TesterMojo.java Wed Sep 26 19:21:20 2007 @@ -138,7 +138,7 @@ public void execute() throws MojoExecutionException - { + { String skipTests = System.getProperty( "maven.test.skip" ); if ( ( skipTests != null && skipTests.equalsIgnoreCase( "true" ) ) || skipTest ) { Modified: incubator/nmaven/trunk/plugins/maven-vsinstaller-plugin/src/main/java/org/apache/maven/dotnet/plugin/vsinstaller/VsInstallerMojo.java URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/plugins/maven-vsinstaller-plugin/src/main/java/org/apache/maven/dotnet/plugin/vsinstaller/VsInstallerMojo.java?rev=579872&r1=579871&r2=579872&view=diff ============================================================================== --- incubator/nmaven/trunk/plugins/maven-vsinstaller-plugin/src/main/java/org/apache/maven/dotnet/plugin/vsinstaller/VsInstallerMojo.java (original) +++ incubator/nmaven/trunk/plugins/maven-vsinstaller-plugin/src/main/java/org/apache/maven/dotnet/plugin/vsinstaller/VsInstallerMojo.java Wed Sep 26 19:21:20 2007 @@ -29,6 +29,8 @@ import java.io.OutputStreamWriter; import java.util.ArrayList; import java.util.List; +import java.util.Properties; +import java.util.Set; /** * Installs Visual Studio 2005 addin. @@ -75,11 +77,6 @@ */ private Settings settings; - /** - * @parameter expression = "${project.version}" - */ - private String pomVersion; - public void execute() throws MojoExecutionException, MojoFailureException { @@ -100,6 +97,11 @@ throw new MojoExecutionException( "NMAVEN-1600-000: Failed to create the repository registry for this plugin", e ); } + + NetDependenciesRepository netRepository = + (NetDependenciesRepository) repositoryRegistry.find( "net-dependencies" ); + String pomVersion = netRepository.getProperty( "nmaven.version"); + List remoteRepositories = new ArrayList(); //TODO: Only use active profiles @@ -142,12 +144,10 @@ } //GAC Installs - NetDependenciesRepository repository = - (NetDependenciesRepository) repositoryRegistry.find( "net-dependencies" ); List gacInstallPolicies = new ArrayList(); gacInstallPolicies.add( new GacMatchPolicy( true ) ); - List gacInstallDependencies = repository.getDependenciesFor( gacInstallPolicies ); + List gacInstallDependencies = netRepository.getDependenciesFor( gacInstallPolicies ); for ( Dependency dependency : gacInstallDependencies ) { List artifacts = artifactContext.getArtifactsFor( dependency.getGroupId(), Modified: incubator/nmaven/trunk/plugins/netplugins/pom.xml URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/plugins/netplugins/pom.xml?rev=579872&r1=579871&r2=579872&view=diff ============================================================================== --- incubator/nmaven/trunk/plugins/netplugins/pom.xml (original) +++ incubator/nmaven/trunk/plugins/netplugins/pom.xml Wed Sep 26 19:21:20 2007 @@ -35,18 +35,18 @@ NMaven.Plugin.Addin NMaven.Plugin.Devenv NMaven.Plugin.Resx - NMaven.Plugin.Settings - - - - - - VisualStudio2005 - - - - NMaven.Plugin.Solution - - - + NMaven.Plugin.Settings + + + + + + VisualStudio2005 + + + + NMaven.Plugin.Solution + + +