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 @@ --> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <groupId>org.apache.maven.dotnet</groupId> + <version>0.14-SNAPSHOT</version> + <artifactId>dotnet-components</artifactId> + <relativePath>..\..\pom.xml</relativePath> + </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.apache.maven.dotnet</groupId> <artifactId>dotnet-service-embedder</artifactId> 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 @@ </plugins> </pluginManagement> </build> - <distributionManagement> - <site> - <id>nmaven-apache-site</id> - <name>NMaven Site</name> - <url>file://${basedir}/../../www</url> - </site> - </distributionManagement> </project> 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 )