From nmaven-commits-return-295-apmail-incubator-nmaven-commits-archive=incubator.apache.org@incubator.apache.org Sat May 12 05:51:10 2007 Return-Path: Delivered-To: apmail-incubator-nmaven-commits-archive@locus.apache.org Received: (qmail 46176 invoked from network); 12 May 2007 05:51:09 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 12 May 2007 05:51:09 -0000 Received: (qmail 42052 invoked by uid 500); 12 May 2007 05:51:16 -0000 Delivered-To: apmail-incubator-nmaven-commits-archive@incubator.apache.org Received: (qmail 42024 invoked by uid 500); 12 May 2007 05:51:16 -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 42015 invoked by uid 99); 12 May 2007 05:51:16 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 11 May 2007 22:51:16 -0700 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,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; Fri, 11 May 2007 22:51:08 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id C6F491A9838; Fri, 11 May 2007 22:50:48 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r537341 - in /incubator/nmaven/branches/SI_XPT: components/ components/dotnet-service/embedder/ plugins/maven-mojo-generator-plugin/src/main/java/org/apache/maven/dotnet/plugin/generator/ plugins/maven-resgen-plugin/src/main/java/org/apache... Date: Sat, 12 May 2007 05:50:48 -0000 To: nmaven-commits@incubator.apache.org From: sisbell@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070512055048.C6F491A9838@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: sisbell Date: Fri May 11 22:50:47 2007 New Revision: 537341 URL: http://svn.apache.org/viewvc?view=rev&rev=537341 Log: Fixed a couple of mojos looking up plugins with old plugin id. Modified: incubator/nmaven/branches/SI_XPT/components/dotnet-service/embedder/pom.xml incubator/nmaven/branches/SI_XPT/components/pom.xml incubator/nmaven/branches/SI_XPT/plugins/maven-mojo-generator-plugin/src/main/java/org/apache/maven/dotnet/plugin/generator/MojoGeneratorMojo.java incubator/nmaven/branches/SI_XPT/plugins/maven-resgen-plugin/src/main/java/org/apache/maven/dotnet/plugin/resgen/ResourceGeneratorMojo.java Modified: incubator/nmaven/branches/SI_XPT/components/dotnet-service/embedder/pom.xml URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/components/dotnet-service/embedder/pom.xml?view=diff&rev=537341&r1=537340&r2=537341 ============================================================================== --- incubator/nmaven/branches/SI_XPT/components/dotnet-service/embedder/pom.xml (original) +++ incubator/nmaven/branches/SI_XPT/components/dotnet-service/embedder/pom.xml Fri May 11 22:50:47 2007 @@ -18,6 +18,12 @@ --> + + org.apache.maven.dotnet + 0.14-SNAPSHOT + dotnet-components + ..\..\pom.xml + 4.0.0 org.apache.maven.dotnet dotnet-service-embedder Modified: incubator/nmaven/branches/SI_XPT/components/pom.xml URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/components/pom.xml?view=diff&rev=537341&r1=537340&r2=537341 ============================================================================== --- incubator/nmaven/branches/SI_XPT/components/pom.xml (original) +++ incubator/nmaven/branches/SI_XPT/components/pom.xml Fri May 11 22:50:47 2007 @@ -195,11 +195,4 @@ - - - nmaven-apache-site - NMaven Site - file://${basedir}/../../www - - Modified: incubator/nmaven/branches/SI_XPT/plugins/maven-mojo-generator-plugin/src/main/java/org/apache/maven/dotnet/plugin/generator/MojoGeneratorMojo.java URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/plugins/maven-mojo-generator-plugin/src/main/java/org/apache/maven/dotnet/plugin/generator/MojoGeneratorMojo.java?view=diff&rev=537341&r1=537340&r2=537341 ============================================================================== --- incubator/nmaven/branches/SI_XPT/plugins/maven-mojo-generator-plugin/src/main/java/org/apache/maven/dotnet/plugin/generator/MojoGeneratorMojo.java (original) +++ incubator/nmaven/branches/SI_XPT/plugins/maven-mojo-generator-plugin/src/main/java/org/apache/maven/dotnet/plugin/generator/MojoGeneratorMojo.java Fri May 11 22:50:47 2007 @@ -105,7 +105,7 @@ commands.add( "groupId=" + project.getGroupId() ); commands.add( "artifactId=" + project.getArtifactId() ); commands.add( "artifactVersion=" + project.getVersion()); - netExecutableFactory.getNetExecutableFromRepository( "NMaven.Plugin", "NMaven.Plugin.MojoGenerator", + netExecutableFactory.getNetExecutableFromRepository( "NMaven.Plugins", "NMaven.Plugin.MojoGenerator", vendorInfo, project, localRepository, commands, true ).execute(); } Modified: incubator/nmaven/branches/SI_XPT/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_XPT/plugins/maven-resgen-plugin/src/main/java/org/apache/maven/dotnet/plugin/resgen/ResourceGeneratorMojo.java?view=diff&rev=537341&r1=537340&r2=537341 ============================================================================== --- incubator/nmaven/branches/SI_XPT/plugins/maven-resgen-plugin/src/main/java/org/apache/maven/dotnet/plugin/resgen/ResourceGeneratorMojo.java (original) +++ incubator/nmaven/branches/SI_XPT/plugins/maven-resgen-plugin/src/main/java/org/apache/maven/dotnet/plugin/resgen/ResourceGeneratorMojo.java Fri May 11 22:50:47 2007 @@ -152,7 +152,7 @@ } vendorInfo.setFrameworkVersion( frameworkVersion ); vendorInfo.setVendorVersion( vendorVersion ); - netExecutableFactory.getNetExecutableFromRepository( "NMaven.Plugin", "NMaven.Plugin.Resx", vendorInfo, + netExecutableFactory.getNetExecutableFromRepository( "NMaven.Plugins", "NMaven.Plugin.Resx", vendorInfo, project, localRepository, commands, false ).execute(); } catch ( PlatformUnsupportedException e )