Author: brett Date: Thu Jun 23 08:50:05 2011 New Revision: 1138772 URL: http://svn.apache.org/viewvc?rev=1138772&view=rev Log: Partial rollback of r1128182, as it was already determined that it wasn't a good idea to add this plugin so often. Users that need it may add it by hand. Side effects of adding it here are that it builds the project twice, and can introduce some dependence on directory structure in a multi-module build (as project files can contain relative paths using ..)
See mailing list: http://s.apache.org/Q9I Modified: incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/NPanday/ProjectImporter/Converter/Algorithms/WebWithVbOrCsProjectFilePomConverter.cs Modified: incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/NPanday/ProjectImporter/Converter/Algorithms/WebWithVbOrCsProjectFilePomConverter.cs URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/NPanday/ProjectImporter/Converter/Algorithms/WebWithVbOrCsProjectFilePomConverter.cs?rev=1138772&r1=1138771&r2=1138772&view=diff ============================================================================== --- incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/NPanday/ProjectImporter/Converter/Algorithms/WebWithVbOrCsProjectFilePomConverter.cs (original) +++ incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/NPanday/ProjectImporter/Converter/Algorithms/WebWithVbOrCsProjectFilePomConverter.cs Thu Jun 23 08:50:05 2011 @@ -77,15 +77,6 @@ namespace NPanday.ProjectImporter.Conver Plugin aspxPlugin = AddPlugin("org.apache.npanday.plugins", "maven-aspx-plugin"); if (!string.IsNullOrEmpty(projectDigest.TargetFramework)) AddPluginConfiguration(aspxPlugin, "frameworkVersion", projectDigest.TargetFramework); - - // add msbuild plugin config in pom if there's a maven-resgen-plugin but no msbuild config - // generates resources in target/bin folder - if (( FindPlugin("npanday.plugin", "maven-resgen-plugin") != null && FindPlugin("npanday.plugin", "NPanday.Plugin.Msbuild.JavaBinding") == null) || ( FindPlugin("org.apache.npanday.plugins", "maven-resgen-plugin") != null && FindPlugin("org.apache.npanday.plugins", "NPanday.Plugin.Msbuild.JavaBinding") == null)) - { - Plugin msBuildPlugin = AddPlugin("org.apache.npanday.plugins", "NPanday.Plugin.Msbuild.JavaBinding"); - AddPluginExecution(msBuildPlugin, "compile", "validate"); - AddPluginConfiguration(msBuildPlugin, "frameworkVersion", ProjectDigest.TargetFramework); - } if (writePom) {