You are viewing a plain text version of this content. The canonical link for it is here.
Posted to npanday-commits@incubator.apache.org by lc...@apache.org on 2011/05/03 08:06:09 UTC
svn commit: r1098955 - in /incubator/npanday/trunk/dotnet: ./
assemblies/NPanday.Artifact/ assemblies/NPanday.Logging/
assemblies/NPanday.Model.AutomationExtensibility/
assemblies/NPanday.Model.Settings/ assemblies/NPanday.Plugin.Loader/
assemblies/NPa...
Author: lcorneliussen
Date: Tue May 3 08:06:08 2011
New Revision: 1098955
URL: http://svn.apache.org/viewvc?rev=1098955&view=rev
Log:
[NPANDAY-383] groupId renames - seems like idea missed out some files
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.Artifact/pom.xml
incubator/npanday/trunk/dotnet/assemblies/NPanday.Logging/pom.xml
incubator/npanday/trunk/dotnet/assemblies/NPanday.Model.AutomationExtensibility/pom.xml
incubator/npanday/trunk/dotnet/assemblies/NPanday.Model.Settings/pom.xml
incubator/npanday/trunk/dotnet/assemblies/NPanday.Plugin.Loader/pom.xml
incubator/npanday/trunk/dotnet/assemblies/NPanday.Plugin.MojoGenerator/pom.xml
incubator/npanday/trunk/dotnet/assemblies/NPanday.Plugin.Runner/pom.xml
incubator/npanday/trunk/dotnet/assemblies/NPanday.Plugin/pom.xml
incubator/npanday/trunk/dotnet/assemblies/NPanday.Plugin/src/main/csharp/NPanday/Plugin/Generator/JavaClassUnmarshaller.cs
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Console/pom.xml
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/pom.xml
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/NPanday/ProjectImporter/Converter/Algorithms/AbstractPomConverter.cs
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/NPanday/ProjectImporter/Converter/Algorithms/NormalPomConverter.cs
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/NPanday/ProjectImporter/Converter/Algorithms/WebPomConverter.cs
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/NPanday/ProjectImporter/Converter/Algorithms/WebWithVbOrCsProjectFilePomConverter.cs
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/NPanday/ProjectImporter/Verifiers/VerifyProjectImportSyncronization.cs
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/EmbeddedResourcesTest/EmbeddedResourcesTest/pom.test
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/MavenTestProjectWithNUnit/MavenTestProjectWithNUnit/pom.test
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/MavenTestProjectWithoutNUnit/MavenTestProjectWithoutNUnit/pom.test
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/MultipleFolderLevelTest/MultipleFolderLevelExample/pom.test
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/MultipleFolderLevelTest/SubLevelWebApplication/SubLevelWebApplication/pom.test
incubator/npanday/trunk/dotnet/assemblies/NPanday.Utils/src/main/csharp/NPanday/Utils/PomHelperUtility.cs
incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/main/csharp/NPanday/VisualStudio/Addin/Connect.cs
incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/test/csharp/NPanday.Utils-Test/MavenCompilePluginConfigurationTest.cs
incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/test/csharp/NPanday.Utils-Test/MavenResxPluginConfigurationTest.cs
incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/test/resource/ClassLibrary1/ClassLibrary1/pom.xml
incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.ProjectWizard/pom.xml
incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio/pom.xml
incubator/npanday/trunk/dotnet/pom.xml
Modified: incubator/npanday/trunk/dotnet/assemblies/NPanday.Artifact/pom.xml
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.Artifact/pom.xml?rev=1098955&r1=1098954&r2=1098955&view=diff
==============================================================================
--- incubator/npanday/trunk/dotnet/assemblies/NPanday.Artifact/pom.xml (original)
+++ incubator/npanday/trunk/dotnet/assemblies/NPanday.Artifact/pom.xml Tue May 3 08:06:08 2011
@@ -25,19 +25,19 @@ under the License.
<artifactId>NPanday.Assemblies</artifactId>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.npanday.artifact</groupId>
+ <groupId>org.apache.npanday</groupId>
<artifactId>NPanday.Artifact</artifactId>
<packaging>library</packaging>
<name>NPanday :: .NET Artifact</name>
<dependencies>
<dependency>
- <groupId>org.apache.npanday.model</groupId>
+ <groupId>org.apache.npanday</groupId>
<artifactId>NPanday.Model.Pom</artifactId>
<version>1.3.1-incubating-SNAPSHOT</version>
<type>library</type>
</dependency>
<dependency>
- <groupId>org.apache.npanday.model</groupId>
+ <groupId>org.apache.npanday</groupId>
<artifactId>NPanday.Model.Settings</artifactId>
<version>1.3.1-incubating-SNAPSHOT</version>
<type>library</type>
Modified: incubator/npanday/trunk/dotnet/assemblies/NPanday.Logging/pom.xml
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.Logging/pom.xml?rev=1098955&r1=1098954&r2=1098955&view=diff
==============================================================================
--- incubator/npanday/trunk/dotnet/assemblies/NPanday.Logging/pom.xml (original)
+++ incubator/npanday/trunk/dotnet/assemblies/NPanday.Logging/pom.xml Tue May 3 08:06:08 2011
@@ -25,7 +25,7 @@ under the License.
<artifactId>NPanday.Assemblies</artifactId>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.npanday.logging</groupId>
+ <groupId>org.apache.npanday</groupId>
<artifactId>NPanday.Logging</artifactId>
<packaging>library</packaging>
<name>NPanday :: .NET Logging</name>
Modified: incubator/npanday/trunk/dotnet/assemblies/NPanday.Model.AutomationExtensibility/pom.xml
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.Model.AutomationExtensibility/pom.xml?rev=1098955&r1=1098954&r2=1098955&view=diff
==============================================================================
--- incubator/npanday/trunk/dotnet/assemblies/NPanday.Model.AutomationExtensibility/pom.xml (original)
+++ incubator/npanday/trunk/dotnet/assemblies/NPanday.Model.AutomationExtensibility/pom.xml Tue May 3 08:06:08 2011
@@ -25,7 +25,7 @@ under the License.
<artifactId>NPanday.Assemblies</artifactId>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.npanday.model</groupId>
+ <groupId>org.apache.npanday</groupId>
<artifactId>NPanday.Model.AutomationExtensibility</artifactId>
<packaging>library</packaging>
<name>NPanday :: .NET Model :: AutomationExtensibility</name>
Modified: incubator/npanday/trunk/dotnet/assemblies/NPanday.Model.Settings/pom.xml
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.Model.Settings/pom.xml?rev=1098955&r1=1098954&r2=1098955&view=diff
==============================================================================
--- incubator/npanday/trunk/dotnet/assemblies/NPanday.Model.Settings/pom.xml (original)
+++ incubator/npanday/trunk/dotnet/assemblies/NPanday.Model.Settings/pom.xml Tue May 3 08:06:08 2011
@@ -25,7 +25,7 @@ under the License.
<artifactId>NPanday.Assemblies</artifactId>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.npanday.model</groupId>
+ <groupId>org.apache.npanday</groupId>
<artifactId>NPanday.Model.Settings</artifactId>
<packaging>library</packaging>
<name>NPanday :: .NET Model :: Settings</name>
@@ -44,7 +44,7 @@ under the License.
<build>
<plugins>
<plugin>
- <groupId>org.apache.npanday.plugin</groupId>
+ <groupId>org.apache.npanday.plugins</groupId>
<artifactId>partcover-maven-plugin</artifactId>
<configuration>
<!--<nUnit>C:\\Program Files\\NUnit 2.5.7\\bin\net-2.0\\nunit-console.exe</nUnit>-->
Modified: incubator/npanday/trunk/dotnet/assemblies/NPanday.Plugin.Loader/pom.xml
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.Plugin.Loader/pom.xml?rev=1098955&r1=1098954&r2=1098955&view=diff
==============================================================================
--- incubator/npanday/trunk/dotnet/assemblies/NPanday.Plugin.Loader/pom.xml (original)
+++ incubator/npanday/trunk/dotnet/assemblies/NPanday.Plugin.Loader/pom.xml Tue May 3 08:06:08 2011
@@ -25,13 +25,13 @@ under the License.
<artifactId>NPanday.Assemblies</artifactId>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.npanday.plugin</groupId>
+ <groupId>org.apache.npanday.plugins</groupId>
<artifactId>NPanday.Plugin.Loader</artifactId>
<packaging>exe</packaging>
<name>NPanday :: .NET Plugin Loader</name>
<dependencies>
<dependency>
- <groupId>org.apache.npanday.plugin</groupId>
+ <groupId>org.apache.npanday.plugins</groupId>
<artifactId>NPanday.Plugin</artifactId>
<version>1.3.1-incubating-SNAPSHOT</version>
<type>library</type>
Modified: incubator/npanday/trunk/dotnet/assemblies/NPanday.Plugin.MojoGenerator/pom.xml
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.Plugin.MojoGenerator/pom.xml?rev=1098955&r1=1098954&r2=1098955&view=diff
==============================================================================
--- incubator/npanday/trunk/dotnet/assemblies/NPanday.Plugin.MojoGenerator/pom.xml (original)
+++ incubator/npanday/trunk/dotnet/assemblies/NPanday.Plugin.MojoGenerator/pom.xml Tue May 3 08:06:08 2011
@@ -25,19 +25,19 @@ under the License.
<artifactId>NPanday.Assemblies</artifactId>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.npanday.plugin</groupId>
+ <groupId>org.apache.npanday.plugins</groupId>
<artifactId>NPanday.Plugin.MojoGenerator</artifactId>
<packaging>exe</packaging>
<name>NPanday :: .NET Plugin MojoGenerator</name>
<dependencies>
<dependency>
- <groupId>org.apache.npanday.plugin</groupId>
+ <groupId>org.apache.npanday.plugins</groupId>
<artifactId>NPanday.Plugin</artifactId>
<version>1.3.1-incubating-SNAPSHOT</version>
<type>library</type>
</dependency>
<dependency>
- <groupId>org.apache.npanday.model</groupId>
+ <groupId>org.apache.npanday</groupId>
<artifactId>NPanday.Model.Pom</artifactId>
<version>1.3.1-incubating-SNAPSHOT</version>
<type>library</type>
Modified: incubator/npanday/trunk/dotnet/assemblies/NPanday.Plugin.Runner/pom.xml
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.Plugin.Runner/pom.xml?rev=1098955&r1=1098954&r2=1098955&view=diff
==============================================================================
--- incubator/npanday/trunk/dotnet/assemblies/NPanday.Plugin.Runner/pom.xml (original)
+++ incubator/npanday/trunk/dotnet/assemblies/NPanday.Plugin.Runner/pom.xml Tue May 3 08:06:08 2011
@@ -25,7 +25,7 @@ under the License.
<artifactId>NPanday.Assemblies</artifactId>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.npanday.plugin</groupId>
+ <groupId>org.apache.npanday.plugins</groupId>
<artifactId>NPanday.Plugin.Runner</artifactId>
<packaging>exe</packaging>
<name>NPanday :: .NET Plugin Runner</name>
Modified: incubator/npanday/trunk/dotnet/assemblies/NPanday.Plugin/pom.xml
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.Plugin/pom.xml?rev=1098955&r1=1098954&r2=1098955&view=diff
==============================================================================
--- incubator/npanday/trunk/dotnet/assemblies/NPanday.Plugin/pom.xml (original)
+++ incubator/npanday/trunk/dotnet/assemblies/NPanday.Plugin/pom.xml Tue May 3 08:06:08 2011
@@ -25,13 +25,13 @@ under the License.
<artifactId>NPanday.Assemblies</artifactId>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.npanday.plugin</groupId>
+ <groupId>org.apache.npanday.plugins</groupId>
<artifactId>NPanday.Plugin</artifactId>
<packaging>library</packaging>
<name>NPanday :: .NET Plugin</name>
<dependencies>
<dependency>
- <groupId>org.apache.npanday.model</groupId>
+ <groupId>org.apache.npanday</groupId>
<artifactId>NPanday.Model.Pom</artifactId>
<version>1.3.1-incubating-SNAPSHOT</version>
<type>library</type>
@@ -67,14 +67,14 @@ under the License.
<pluginManagement>
<plugins>
<plugin>
- <groupId>org.apache.npanday.plugin</groupId>
+ <groupId>org.apache.npanday.plugins</groupId>
<artifactId>maven-compile-plugin</artifactId>
<configuration>
<keyfile>sample.snk</keyfile>
</configuration>
</plugin>
<plugin>
- <groupId>org.apache.npanday.plugin</groupId>
+ <groupId>org.apache.npanday.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
<configuration>
<isGacInstall>true</isGacInstall>
Modified: incubator/npanday/trunk/dotnet/assemblies/NPanday.Plugin/src/main/csharp/NPanday/Plugin/Generator/JavaClassUnmarshaller.cs
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.Plugin/src/main/csharp/NPanday/Plugin/Generator/JavaClassUnmarshaller.cs?rev=1098955&r1=1098954&r2=1098955&view=diff
==============================================================================
--- incubator/npanday/trunk/dotnet/assemblies/NPanday.Plugin/src/main/csharp/NPanday/Plugin/Generator/JavaClassUnmarshaller.cs (original)
+++ incubator/npanday/trunk/dotnet/assemblies/NPanday.Plugin/src/main/csharp/NPanday/Plugin/Generator/JavaClassUnmarshaller.cs Tue May 3 08:06:08 2011
@@ -66,10 +66,10 @@ namespace NPanday.Plugin.Generator
JavaClass javaClass = new JavaClass();
javaClass.PackageName = abstractMojoType.Namespace;
javaClass.ClassName = abstractMojoType.Name;
- javaClass.ExtendsClassName = "org.apache.npanday.plugin.AbstractMojo";
+ javaClass.ExtendsClassName = "org.apache.npanday.plugins.AbstractMojo";
ImportPackage importPackage = new ImportPackage();
- javaClass.ImportPackage = importPackage.AddPackage("org.apache.npanday.plugin.FieldAnnotation");
+ javaClass.ImportPackage = importPackage.AddPackage("org.apache.npanday.plugins.FieldAnnotation");
List<String> classComments = new List<String>();
System.Attribute[] attributes =
@@ -117,7 +117,7 @@ namespace NPanday.Plugin.Generator
comments.Add("@component");
javaFields.Add(CreateJavaField("private", "npanday.executable.NetExecutableFactory",
"netExecutableFactory", comments, null));
- javaFields.Add(CreateJavaField("private", "org.apache.npanday.plugin.PluginContext",
+ javaFields.Add(CreateJavaField("private", "org.apache.npanday.plugins.PluginContext",
"pluginContext", comments, null));
//methods
@@ -135,7 +135,7 @@ namespace NPanday.Plugin.Generator
new Code().AddLine(@"return """ + abstractMojoType.Namespace
+ "." + abstractMojoType.Name + @""";")));
- javaMethods.Add(CreateJavaMethod("public", "org.apache.npanday.plugin.PluginContext",
+ javaMethods.Add(CreateJavaMethod("public", "org.apache.npanday.plugins.PluginContext",
"getNetPluginContext",
CreateCodeWithSimpleReturnType("pluginContext")));
Modified: incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Console/pom.xml
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Console/pom.xml?rev=1098955&r1=1098954&r2=1098955&view=diff
==============================================================================
--- incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Console/pom.xml (original)
+++ incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Console/pom.xml Tue May 3 08:06:08 2011
@@ -20,7 +20,7 @@ under the License.
-->
<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.npanday.projectimporter</groupId>
+ <groupId>org.apache.npanday.visualstudio</groupId>
<version>1.3.1-incubating-SNAPSHOT</version>
<artifactId>NPanday.ImporterProjectParent</artifactId>
</parent>
@@ -42,7 +42,7 @@ under the License.
</build>
<dependencies>
<dependency>
- <groupId>org.apache.npanday.projectimporter</groupId>
+ <groupId>org.apache.npanday.visualstudio</groupId>
<artifactId>NPanday.ProjectImporterEngine</artifactId>
<version>1.3.1-incubating-SNAPSHOT</version>
<type>library</type>
Modified: incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/pom.xml
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/pom.xml?rev=1098955&r1=1098954&r2=1098955&view=diff
==============================================================================
--- incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/pom.xml (original)
+++ incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/pom.xml Tue May 3 08:06:08 2011
@@ -20,7 +20,7 @@ under the License.
-->
<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.npanday.projectimporter</groupId>
+ <groupId>org.apache.npanday.visualstudio</groupId>
<version>1.3.1-incubating-SNAPSHOT</version>
<artifactId>NPanday.ImporterProjectParent</artifactId>
</parent>
@@ -31,7 +31,7 @@ under the License.
<build>
<plugins>
<plugin>
- <groupId>org.apache.npanday.plugin</groupId>
+ <groupId>org.apache.npanday.plugins</groupId>
<artifactId>maven-compile-plugin</artifactId>
</plugin>
<plugin>
@@ -46,31 +46,31 @@ under the License.
</build>
<dependencies>
<dependency>
- <groupId>org.apache.npanday.artifact</groupId>
+ <groupId>org.apache.npanday</groupId>
<artifactId>NPanday.Artifact</artifactId>
<version>1.3.1-incubating-SNAPSHOT</version>
<type>library</type>
</dependency>
<dependency>
- <groupId>org.apache.npanday.logging</groupId>
+ <groupId>org.apache.npanday</groupId>
<artifactId>NPanday.Logging</artifactId>
<version>1.3.1-incubating-SNAPSHOT</version>
<type>library</type>
</dependency>
<dependency>
- <groupId>org.apache.npanday.model</groupId>
+ <groupId>org.apache.npanday</groupId>
<artifactId>NPanday.Model.Pom</artifactId>
<version>1.3.1-incubating-SNAPSHOT</version>
<type>library</type>
</dependency>
<dependency>
- <groupId>org.apache.npanday.model</groupId>
+ <groupId>org.apache.npanday</groupId>
<artifactId>NPanday.Model.Settings</artifactId>
<version>1.3.1-incubating-SNAPSHOT</version>
<type>library</type>
</dependency>
<dependency>
- <groupId>org.apache.npanday.utils</groupId>
+ <groupId>org.apache.npanday</groupId>
<artifactId>NPanday.Utils</artifactId>
<version>1.3.1-incubating-SNAPSHOT</version>
<type>library</type>
@@ -98,7 +98,7 @@ under the License.
<build>
<plugins>
<plugin>
- <groupId>org.apache.npanday.plugin</groupId>
+ <groupId>org.apache.npanday.plugins</groupId>
<artifactId>partcover-maven-plugin</artifactId>
<configuration>
<!--<nUnit>C:\\Program Files\\NUnit 2.5.7\\bin\net-2.0\\nunit-console.exe</nUnit>-->
Modified: incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/NPanday/ProjectImporter/Converter/Algorithms/AbstractPomConverter.cs
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/NPanday/ProjectImporter/Converter/Algorithms/AbstractPomConverter.cs?rev=1098955&r1=1098954&r2=1098955&view=diff
==============================================================================
--- incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/NPanday/ProjectImporter/Converter/Algorithms/AbstractPomConverter.cs (original)
+++ incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/NPanday/ProjectImporter/Converter/Algorithms/AbstractPomConverter.cs Tue May 3 08:06:08 2011
@@ -128,7 +128,7 @@ namespace NPanday.ProjectImporter.Conver
if (projectDigest != null && projectDigest.EmbeddedResources != null && projectDigest.EmbeddedResources.Length > 0)
{
Plugin embeddedResourcePlugin = AddPlugin(
- "org.apache.npanday.plugin",
+ "org.apache.npanday.plugins",
"maven-resgen-plugin",
null,
false
@@ -204,7 +204,7 @@ namespace NPanday.ProjectImporter.Conver
if (projectDigest != null && projectDigest.WebReferenceUrls != null && projectDigest.WebReferenceUrls.Length > 0)
{
Plugin webReferencePlugin = AddPlugin(
- "org.apache.npanday.plugin",
+ "org.apache.npanday.plugins",
"maven-wsdl-plugin",
null,
false
Modified: incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/NPanday/ProjectImporter/Converter/Algorithms/NormalPomConverter.cs
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/NPanday/ProjectImporter/Converter/Algorithms/NormalPomConverter.cs?rev=1098955&r1=1098954&r2=1098955&view=diff
==============================================================================
--- incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/NPanday/ProjectImporter/Converter/Algorithms/NormalPomConverter.cs (original)
+++ incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/NPanday/ProjectImporter/Converter/Algorithms/NormalPomConverter.cs Tue May 3 08:06:08 2011
@@ -77,7 +77,7 @@ namespace NPanday.ProjectImporter.Conver
// Add NPanday compile plugin
Plugin compilePlugin = AddPlugin(
- "org.apache.npanday.plugin",
+ "org.apache.npanday.plugins",
"maven-compile-plugin",
null,
true
@@ -117,7 +117,7 @@ namespace NPanday.ProjectImporter.Conver
//add the MsBuild plugin to auto generate the .g.cs/g.vb files
if (!msBuildPluginAdded)
{
- Plugin msBuildPlugin = AddPlugin("org.apache.npanday.plugin", "NPanday.Plugin.Msbuild.JavaBinding", null, false);
+ Plugin msBuildPlugin = AddPlugin("org.apache.npanday.plugins", "NPanday.Plugin.Msbuild.JavaBinding", null, false);
AddPluginExecution(msBuildPlugin, "compile", "validate");
msBuildPluginAdded = true;
}
@@ -184,7 +184,7 @@ namespace NPanday.ProjectImporter.Conver
if (projectDigest.UnitTest)
{
Plugin testPlugin = AddPlugin(
- "org.apache.npanday.plugin",
+ "org.apache.npanday.plugins",
"maven-test-plugin",
null,
false
Modified: incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/NPanday/ProjectImporter/Converter/Algorithms/WebPomConverter.cs
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/NPanday/ProjectImporter/Converter/Algorithms/WebPomConverter.cs?rev=1098955&r1=1098954&r2=1098955&view=diff
==============================================================================
--- incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/NPanday/ProjectImporter/Converter/Algorithms/WebPomConverter.cs (original)
+++ incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/NPanday/ProjectImporter/Converter/Algorithms/WebPomConverter.cs Tue May 3 08:06:08 2011
@@ -148,7 +148,7 @@ namespace NPanday.ProjectImporter.Conver
}
// Add NPanday compile plugin
- Plugin aspxPlugin = AddPlugin("org.apache.npanday.plugin", "maven-aspx-plugin");
+ Plugin aspxPlugin = AddPlugin("org.apache.npanday.plugins", "maven-aspx-plugin");
if(!string.IsNullOrEmpty(projectDigest.TargetFramework))
AddPluginConfiguration(aspxPlugin, "frameworkVersion", projectDigest.TargetFramework);
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=1098955&r1=1098954&r2=1098955&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 Tue May 3 08:06:08 2011
@@ -70,11 +70,11 @@ namespace NPanday.ProjectImporter.Conver
Model.build.sourceDirectory = ".";
// change the outputDirectory of the plugin
- Plugin compilePlugin = FindPlugin("org.apache.npanday.plugin", "maven-compile-plugin");
+ Plugin compilePlugin = FindPlugin("org.apache.npanday.plugins", "maven-compile-plugin");
AddPluginConfiguration(compilePlugin, "outputDirectory", "bin");
// Add NPanday compile plugin
- Plugin aspxPlugin = AddPlugin("org.apache.npanday.plugin", "maven-aspx-plugin");
+ Plugin aspxPlugin = AddPlugin("org.apache.npanday.plugins", "maven-aspx-plugin");
if (!string.IsNullOrEmpty(projectDigest.TargetFramework))
AddPluginConfiguration(aspxPlugin, "frameworkVersion", projectDigest.TargetFramework);
Modified: incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/NPanday/ProjectImporter/Verifiers/VerifyProjectImportSyncronization.cs
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/NPanday/ProjectImporter/Verifiers/VerifyProjectImportSyncronization.cs?rev=1098955&r1=1098954&r2=1098955&view=diff
==============================================================================
--- incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/NPanday/ProjectImporter/Verifiers/VerifyProjectImportSyncronization.cs (original)
+++ incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/NPanday/ProjectImporter/Verifiers/VerifyProjectImportSyncronization.cs Tue May 3 08:06:08 2011
@@ -130,7 +130,7 @@ namespace NPanday.ProjectImporter.Verifi
{
Plugin plugin = FindPlugin(
model,
- "org.apache.npanday.plugin",
+ "org.apache.npanday.plugins",
"maven-test-plugin"
);
Modified: incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/EmbeddedResourcesTest/EmbeddedResourcesTest/pom.test
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/EmbeddedResourcesTest/EmbeddedResourcesTest/pom.test?rev=1098955&r1=1098954&r2=1098955&view=diff
==============================================================================
--- incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/EmbeddedResourcesTest/EmbeddedResourcesTest/pom.test (original)
+++ incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/EmbeddedResourcesTest/EmbeddedResourcesTest/pom.test Tue May 3 08:06:08 2011
@@ -40,7 +40,7 @@ under the License.
</resources>
<plugins>
<plugin>
- <groupId>org.apache.npanday.plugin</groupId>
+ <groupId>org.apache.npanday.plugins</groupId>
<artifactId>maven-compile-plugin</artifactId>
<extensions>true</extensions>
<configuration>
@@ -55,7 +55,7 @@ under the License.
</configuration>
</plugin>
<plugin>
- <groupId>org.apache.npanday.plugin</groupId>
+ <groupId>org.apache.npanday.plugins</groupId>
<artifactId>maven-resgen-plugin</artifactId>
<extensions>true</extensions>
<configuration>
Modified: incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/MavenTestProjectWithNUnit/MavenTestProjectWithNUnit/pom.test
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/MavenTestProjectWithNUnit/MavenTestProjectWithNUnit/pom.test?rev=1098955&r1=1098954&r2=1098955&view=diff
==============================================================================
--- incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/MavenTestProjectWithNUnit/MavenTestProjectWithNUnit/pom.test (original)
+++ incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/MavenTestProjectWithNUnit/MavenTestProjectWithNUnit/pom.test Tue May 3 08:06:08 2011
@@ -14,7 +14,7 @@
<sourceDirectory>./</sourceDirectory>
<plugins>
<plugin>
- <groupId>org.apache.npanday.plugin</groupId>
+ <groupId>org.apache.npanday.plugins</groupId>
<artifactId>maven-compile-plugin</artifactId>
<extensions>true</extensions>
<configuration>
Modified: incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/MavenTestProjectWithoutNUnit/MavenTestProjectWithoutNUnit/pom.test
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/MavenTestProjectWithoutNUnit/MavenTestProjectWithoutNUnit/pom.test?rev=1098955&r1=1098954&r2=1098955&view=diff
==============================================================================
--- incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/MavenTestProjectWithoutNUnit/MavenTestProjectWithoutNUnit/pom.test (original)
+++ incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/MavenTestProjectWithoutNUnit/MavenTestProjectWithoutNUnit/pom.test Tue May 3 08:06:08 2011
@@ -14,7 +14,7 @@
<sourceDirectory>./</sourceDirectory>
<plugins>
<plugin>
- <groupId>org.apache.npanday.plugin</groupId>
+ <groupId>org.apache.npanday.plugins</groupId>
<artifactId>maven-compile-plugin</artifactId>
<extensions>true</extensions>
<configuration>
Modified: incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/MultipleFolderLevelTest/MultipleFolderLevelExample/pom.test
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/MultipleFolderLevelTest/MultipleFolderLevelExample/pom.test?rev=1098955&r1=1098954&r2=1098955&view=diff
==============================================================================
--- incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/MultipleFolderLevelTest/MultipleFolderLevelExample/pom.test (original)
+++ incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/MultipleFolderLevelTest/MultipleFolderLevelExample/pom.test Tue May 3 08:06:08 2011
@@ -32,7 +32,7 @@ under the License.
<sourceDirectory>./</sourceDirectory>
<plugins>
<plugin>
- <groupId>org.apache.npanday.plugin</groupId>
+ <groupId>org.apache.npanday.plugins</groupId>
<artifactId>maven-compile-plugin</artifactId>
<extensions>true</extensions>
<configuration>
@@ -58,7 +58,7 @@ under the License.
</configuration>
</plugin>
<plugin>
- <groupId>org.apache.npanday.plugin</groupId>
+ <groupId>org.apache.npanday.plugins</groupId>
<artifactId>maven-resgen-plugin</artifactId>
<extensions>true</extensions>
<configuration>
Modified: incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/MultipleFolderLevelTest/SubLevelWebApplication/SubLevelWebApplication/pom.test
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/MultipleFolderLevelTest/SubLevelWebApplication/SubLevelWebApplication/pom.test?rev=1098955&r1=1098954&r2=1098955&view=diff
==============================================================================
--- incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/MultipleFolderLevelTest/SubLevelWebApplication/SubLevelWebApplication/pom.test (original)
+++ incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/MultipleFolderLevelTest/SubLevelWebApplication/SubLevelWebApplication/pom.test Tue May 3 08:06:08 2011
@@ -32,7 +32,7 @@ under the License.
<sourceDirectory>.</sourceDirectory>
<plugins>
<plugin>
- <groupId>org.apache.npanday.plugin</groupId>
+ <groupId>org.apache.npanday.plugins</groupId>
<artifactId>maven-compile-plugin</artifactId>
<extensions>true</extensions>
<configuration>
@@ -73,7 +73,7 @@ under the License.
</configuration>
</plugin>
<plugin>
- <groupId>org.apache.npanday.plugin</groupId>
+ <groupId>org.apache.npanday.plugins</groupId>
<artifactId>maven-resgen-plugin</artifactId>
<extensions>true</extensions>
<configuration>
Modified: incubator/npanday/trunk/dotnet/assemblies/NPanday.Utils/src/main/csharp/NPanday/Utils/PomHelperUtility.cs
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.Utils/src/main/csharp/NPanday/Utils/PomHelperUtility.cs?rev=1098955&r1=1098954&r2=1098955&view=diff
==============================================================================
--- incubator/npanday/trunk/dotnet/assemblies/NPanday.Utils/src/main/csharp/NPanday/Utils/PomHelperUtility.cs (original)
+++ incubator/npanday/trunk/dotnet/assemblies/NPanday.Utils/src/main/csharp/NPanday/Utils/PomHelperUtility.cs Tue May 3 08:06:08 2011
@@ -284,7 +284,7 @@ namespace NPanday.Utils
public string GetNPandayCompilerPluginConfigurationValue(string config)
{
- return GetPomXPathExprValue(@"//pom:project/pom:build/pom:plugins[./pom:plugin/pom:groupId = 'org.apache.npanday.plugin' and ./pom:plugin/pom:artifactId = 'maven-compile-plugin'][1]/pom:plugin/pom:configuration/pom:" + config);
+ return GetPomXPathExprValue(@"//pom:project/pom:build/pom:plugins[./pom:plugin/pom:groupId = 'org.apache.npanday.plugins' and ./pom:plugin/pom:artifactId = 'maven-compile-plugin'][1]/pom:plugin/pom:configuration/pom:" + config);
}
private string PomNamespaceURI
@@ -427,7 +427,7 @@ namespace NPanday.Utils
{
foreach (NPanday.Model.Pom.Plugin plugin in model.build.plugins)
{
- if ("org.apache.npanday.plugin".Equals(plugin.groupId)
+ if ("org.apache.npanday.plugins".Equals(plugin.groupId)
&& "maven-compile-plugin".Equals(plugin.artifactId))
{
compilePlugin = plugin;
@@ -441,7 +441,7 @@ namespace NPanday.Utils
if (compilePlugin == null)
{
compilePlugin = new NPanday.Model.Pom.Plugin();
- compilePlugin.groupId = "org.apache.npanday.plugin";
+ compilePlugin.groupId = "org.apache.npanday.plugins";
compilePlugin.artifactId = "maven-compile-plugin";
compilePlugin.extensions = true;
plugins.Add(compilePlugin);
@@ -505,7 +505,7 @@ namespace NPanday.Utils
- // @"//pom:project/pom:build/pom:plugins[./pom:plugin/pom:groupId = 'org.apache.npanday.plugin' and ./pom:plugin/pom:artifactId = 'maven-compile-plugin'][1]/pom:plugin/pom:configuration/pom:keyfile"
+ // @"//pom:project/pom:build/pom:plugins[./pom:plugin/pom:groupId = 'org.apache.npanday.plugins' and ./pom:plugin/pom:artifactId = 'maven-compile-plugin'][1]/pom:plugin/pom:configuration/pom:keyfile"
public string GetPomXPathExprValue(string xpath_expr)
{
@@ -985,7 +985,7 @@ namespace NPanday.Utils
if (!hasWSDLPlugin)
{
Plugin webReferencePlugin = addPlugin(model,
- "org.apache.npanday.plugin",
+ "org.apache.npanday.plugins",
"maven-wsdl-plugin",
null,
false
@@ -998,7 +998,7 @@ namespace NPanday.Utils
foreach (Plugin plugin in model.build.plugins)
{
- if ("org.apache.npanday.plugin".Equals(plugin.groupId.ToLower(), StringComparison.InvariantCultureIgnoreCase)
+ if ("org.apache.npanday.plugins".Equals(plugin.groupId.ToLower(), StringComparison.InvariantCultureIgnoreCase)
&& "maven-compile-plugin".Equals(plugin.artifactId.ToLower(), StringComparison.InvariantCultureIgnoreCase))
{
if (plugin.configuration == null && plugin.configuration.Any == null)
@@ -1497,7 +1497,7 @@ namespace NPanday.Utils
{
return (!string.IsNullOrEmpty(plugin.groupId) &&
!string.IsNullOrEmpty(plugin.artifactId) &&
- plugin.groupId.Equals("org.apache.npanday.plugin") &&
+ plugin.groupId.Equals("org.apache.npanday.plugins") &&
plugin.artifactId.Equals("maven-wsdl-plugin"));
}
@@ -1607,7 +1607,7 @@ namespace NPanday.Utils
}
}
- if ("org.apache.npanday.plugin".Equals(plugin.groupId.ToLower(), StringComparison.InvariantCultureIgnoreCase)
+ if ("org.apache.npanday.plugins".Equals(plugin.groupId.ToLower(), StringComparison.InvariantCultureIgnoreCase)
&& "maven-compile-plugin".Equals(plugin.artifactId.ToLower(), StringComparison.InvariantCultureIgnoreCase))
{
XmlElement[] elems = ((XmlElement[])plugin.configuration.Any);
Modified: incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/main/csharp/NPanday/VisualStudio/Addin/Connect.cs
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/main/csharp/NPanday/VisualStudio/Addin/Connect.cs?rev=1098955&r1=1098954&r2=1098955&view=diff
==============================================================================
--- incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/main/csharp/NPanday/VisualStudio/Addin/Connect.cs (original)
+++ incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/main/csharp/NPanday/VisualStudio/Addin/Connect.cs Tue May 3 08:06:08 2011
@@ -214,7 +214,7 @@ namespace NPanday.VisualStudio.Addin
if (projectItem.Name.Contains(".cs") || projectItem.Name.Contains(".vb"))
{
//change addpluginConfiguration to accept xmlElement instead
- pomUtil.AddMavenCompilePluginConfiguration("org.apache.npanday.plugin", "maven-compile-plugin", "includeSources", "includeSource", GetRelativePathToProject(projectItem, null));
+ pomUtil.AddMavenCompilePluginConfiguration("org.apache.npanday.plugins", "maven-compile-plugin", "includeSources", "includeSource", GetRelativePathToProject(projectItem, null));
}
if (projectItem.Name.Contains(".resx"))
@@ -222,7 +222,7 @@ namespace NPanday.VisualStudio.Addin
string resxName = projectItem.ContainingProject.Name + "." + projectItem.Name.Replace(".resx", "");
//check if resx plugin already exists
- if (!pomUtil.HasPlugin("org.apache.npanday.plugin", "maven-resgen-plugin"))
+ if (!pomUtil.HasPlugin("org.apache.npanday.plugins", "maven-resgen-plugin"))
{
try
{
@@ -245,7 +245,7 @@ namespace NPanday.VisualStudio.Addin
anyHolder.Add(nodeCollection);
pluginConf.Any = anyHolder.ToArray();
- pomUtil.AddPlugin("org.apache.npanday.plugin", "maven-resgen-plugin", null, true, pluginConf);
+ pomUtil.AddPlugin("org.apache.npanday.plugins", "maven-resgen-plugin", null, true, pluginConf);
}
catch (Exception e)
{
@@ -256,7 +256,7 @@ namespace NPanday.VisualStudio.Addin
//add plugin conifguration
else
{
- pomUtil.AddMavenResxPluginConfiguration("org.apache.npanday.plugin", "maven-resgen-plugin", "embeddedResources", "embeddedResource", projectItem.Name, resxName);
+ pomUtil.AddMavenResxPluginConfiguration("org.apache.npanday.plugins", "maven-resgen-plugin", "embeddedResources", "embeddedResource", projectItem.Name, resxName);
}
}
}
@@ -290,13 +290,13 @@ namespace NPanday.VisualStudio.Addin
if (projectItem.Name.Contains(".cs") || projectItem.Name.Contains(".vb"))
{
//change addpluginConfiguration to accept xmlElement instead
- pomUtil.RemoveMavenCompilePluginConfiguration("org.apache.npanday.plugin", "maven-compile-plugin", "includeSources", "includeSource", GetRelativePathToProject(projectItem, null));
+ pomUtil.RemoveMavenCompilePluginConfiguration("org.apache.npanday.plugins", "maven-compile-plugin", "includeSources", "includeSource", GetRelativePathToProject(projectItem, null));
}
if (projectItem.Name.Contains(".resx"))
{
string resxName = projectItem.ContainingProject.Name + "." + projectItem.Name.Replace(".resx", "");
- pomUtil.RemoveMavenResxPluginConfiguration("org.apache.npanday.plugin", "maven-resgen-plugin", "embeddedResources", "embeddedResource", projectItem.Name, resxName);
+ pomUtil.RemoveMavenResxPluginConfiguration("org.apache.npanday.plugins", "maven-resgen-plugin", "embeddedResources", "embeddedResource", projectItem.Name, resxName);
}
}
}
@@ -312,14 +312,14 @@ namespace NPanday.VisualStudio.Addin
if (projectItem.Name.Contains(".cs") || projectItem.Name.Contains(".vb"))
{
//change addpluginConfiguration to accept xmlElement instead
- pomUtil.RenameMavenCompilePluginConfiguration("org.apache.npanday.plugin", "maven-compile-plugin", "includeSources", "includeSource", GetRelativePathToProject(projectItem, oldName), GetRelativePathToProject(projectItem, null));
+ pomUtil.RenameMavenCompilePluginConfiguration("org.apache.npanday.plugins", "maven-compile-plugin", "includeSources", "includeSource", GetRelativePathToProject(projectItem, oldName), GetRelativePathToProject(projectItem, null));
}
if (projectItem.Name.Contains(".resx"))
{
string resxName = projectItem.ContainingProject.Name + "." + projectItem.Name.Replace(".resx", "");
string oldResxName = projectItem.ContainingProject.Name+"."+oldName.Replace(".resx","");
- pomUtil.RenameMavenResxPluginConfiguration("org.apache.npanday.plugin", "maven-resgen-plugin", "embeddedResources", "embeddedResource", oldName, oldResxName ,projectItem.Name,resxName);
+ pomUtil.RenameMavenResxPluginConfiguration("org.apache.npanday.plugins", "maven-resgen-plugin", "embeddedResources", "embeddedResource", oldName, oldResxName ,projectItem.Name,resxName);
}
}
@@ -1905,7 +1905,7 @@ namespace NPanday.VisualStudio.Addin
#region cbRunUnitTest_Click(CommandBarButton,bool)
private void cbRunUnitTest_Click(CommandBarButton btn, ref bool Cancel)
{
- executeBuildCommand(CurrentSelectedProjectPom, "org.apache.npanday.plugin:maven-test-plugin:test");
+ executeBuildCommand(CurrentSelectedProjectPom, "org.apache.npanday.plugins:maven-test-plugin:test");
}
#endregion
Modified: incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/test/csharp/NPanday.Utils-Test/MavenCompilePluginConfigurationTest.cs
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/test/csharp/NPanday.Utils-Test/MavenCompilePluginConfigurationTest.cs?rev=1098955&r1=1098954&r2=1098955&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/test/csharp/NPanday.Utils-Test/MavenResxPluginConfigurationTest.cs
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/test/csharp/NPanday.Utils-Test/MavenResxPluginConfigurationTest.cs?rev=1098955&r1=1098954&r2=1098955&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/test/resource/ClassLibrary1/ClassLibrary1/pom.xml
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/test/resource/ClassLibrary1/ClassLibrary1/pom.xml?rev=1098955&r1=1098954&r2=1098955&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.ProjectWizard/pom.xml
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.ProjectWizard/pom.xml?rev=1098955&r1=1098954&r2=1098955&view=diff
==============================================================================
--- incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.ProjectWizard/pom.xml (original)
+++ incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.ProjectWizard/pom.xml Tue May 3 08:06:08 2011
@@ -64,14 +64,14 @@ under the License.
<pluginManagement>
<plugins>
<plugin>
- <groupId>org.apache.npanday.plugin</groupId>
+ <groupId>org.apache.npanday.plugins</groupId>
<artifactId>maven-compile-plugin</artifactId>
<configuration>
<keyfile>sample.snk</keyfile>
</configuration>
</plugin>
<plugin>
- <groupId>org.apache.npanday.plugin</groupId>
+ <groupId>org.apache.npanday.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
<configuration>
<isGacInstall>true</isGacInstall>
Modified: incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio/pom.xml
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio/pom.xml?rev=1098955&r1=1098954&r2=1098955&view=diff
==============================================================================
--- incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio/pom.xml (original)
+++ incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio/pom.xml Tue May 3 08:06:08 2011
@@ -31,7 +31,7 @@ under the License.
<name>NPanday :: VisualStudio</name>
<dependencies>
<dependency>
- <groupId>org.apache.npanday.logging</groupId>
+ <groupId>org.apache.npanday</groupId>
<artifactId>NPanday.Logging</artifactId>
<version>1.3.1-incubating-SNAPSHOT</version>
<type>library</type>
Modified: incubator/npanday/trunk/dotnet/pom.xml
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/pom.xml?rev=1098955&r1=1098954&r2=1098955&view=diff
==============================================================================
--- incubator/npanday/trunk/dotnet/pom.xml (original)
+++ incubator/npanday/trunk/dotnet/pom.xml Tue May 3 08:06:08 2011
@@ -38,7 +38,7 @@ under the License.
<testSourceDirectory>src/test/csharp</testSourceDirectory>
<plugins>
<plugin>
- <groupId>org.apache.npanday.plugin</groupId>
+ <groupId>org.apache.npanday.plugins</groupId>
<artifactId>maven-compile-plugin</artifactId>
<extensions>true</extensions>
<configuration>
@@ -49,27 +49,27 @@ under the License.
<pluginManagement>
<plugins>
<plugin>
- <groupId>org.apache.npanday.plugin</groupId>
+ <groupId>org.apache.npanday.plugins</groupId>
<artifactId>maven-compile-plugin</artifactId>
<version>${bootstrap.npanday.version}</version>
</plugin>
<plugin>
- <groupId>org.apache.npanday.plugin</groupId>
+ <groupId>org.apache.npanday.plugins</groupId>
<artifactId>maven-resgen-plugin</artifactId>
<version>${bootstrap.npanday.version}</version>
</plugin>
<plugin>
- <groupId>org.apache.npanday.plugin</groupId>
+ <groupId>org.apache.npanday.plugins</groupId>
<artifactId>maven-repository-plugin</artifactId>
<version>${bootstrap.npanday.version}</version>
</plugin>
<plugin>
- <groupId>org.apache.npanday.plugin</groupId>
+ <groupId>org.apache.npanday.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
<version>${bootstrap.npanday.version}</version>
</plugin>
<plugin>
- <groupId>org.apache.npanday.plugin</groupId>
+ <groupId>org.apache.npanday.plugins</groupId>
<artifactId>maven-resolver-plugin</artifactId>
<version>${bootstrap.npanday.version}</version>
<configuration>
@@ -77,12 +77,12 @@ under the License.
</configuration>
</plugin>
<plugin>
- <groupId>org.apache.npanday.plugin</groupId>
+ <groupId>org.apache.npanday.plugins</groupId>
<artifactId>maven-xsd-plugin</artifactId>
<version>${bootstrap.npanday.version}</version>
</plugin>
<plugin>
- <groupId>org.apache.npanday.plugin</groupId>
+ <groupId>org.apache.npanday.plugins</groupId>
<artifactId>maven-test-plugin</artifactId>
<version>${bootstrap.npanday.version}</version>
<configuration>
@@ -90,12 +90,12 @@ under the License.
</configuration>
</plugin>
<plugin>
- <groupId>org.apache.npanday.plugin</groupId>
+ <groupId>org.apache.npanday.plugins</groupId>
<artifactId>maven-mojo-generator-plugin</artifactId>
<version>${bootstrap.npanday.version}</version>
</plugin>
<plugin>
- <groupId>org.apache.npanday.plugin</groupId>
+ <groupId>org.apache.npanday.plugins</groupId>
<artifactId>NPanday.Plugin.Settings.JavaBinding</artifactId>
<version>${bootstrap.npanday.version}</version>
<configuration>
@@ -152,49 +152,49 @@ under the License.
</dependency>
<dependency>
- <groupId>org.apache.npanday.model</groupId>
+ <groupId>org.apache.npanday</groupId>
<artifactId>NPanday.Model.Pom</artifactId>
<version>1.3.1-incubating-SNAPSHOT</version>
<type>library</type>
</dependency>
<dependency>
- <groupId>org.apache.npanday.model</groupId>
+ <groupId>org.apache.npanday</groupId>
<artifactId>NPanday.Model.AutomationExtensibility</artifactId>
<version>1.3.1-incubating-SNAPSHOT</version>
<type>library</type>
</dependency>
<dependency>
- <groupId>org.apache.npanday.model</groupId>
+ <groupId>org.apache.npanday</groupId>
<artifactId>NPanday.Model.Settings</artifactId>
<version>1.3.1-incubating-SNAPSHOT</version>
<type>library</type>
</dependency>
<dependency>
- <groupId>org.apache.npanday.logging</groupId>
+ <groupId>org.apache.npanday</groupId>
<artifactId>NPanday.Logging</artifactId>
<version>1.3.1-incubating-SNAPSHOT</version>
<type>library</type>
</dependency>
<dependency>
- <groupId>org.apache.npanday.artifact</groupId>
+ <groupId>org.apache.npanday</groupId>
<artifactId>NPanday.Artifact</artifactId>
<version>1.3.1-incubating-SNAPSHOT</version>
<type>library</type>
</dependency>
<dependency>
- <groupId>org.apache.npanday.utils</groupId>
+ <groupId>org.apache.npanday</groupId>
<artifactId>NPanday.Utils</artifactId>
<version>1.3.1-incubating-SNAPSHOT</version>
<type>library</type>
</dependency>
<dependency>
- <groupId>org.apache.npanday.plugin</groupId>
+ <groupId>org.apache.npanday.plugins</groupId>
<artifactId>NPanday.Plugin</artifactId>
<version>1.3.1-incubating-SNAPSHOT</version>
<type>library</type>
</dependency>
<dependency>
- <groupId>org.apache.npanday.projectimporter</groupId>
+ <groupId>org.apache.npanday.visualstudio</groupId>
<artifactId>NPanday.ProjectImporterEngine</artifactId>
<version>1.3.1-incubating-SNAPSHOT</version>
<type>library</type>