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 br...@apache.org on 2011/12/31 15:50:35 UTC
svn commit: r1226115 - in
/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src:
main/csharp/Converter/Algorithms/
test/resource/EmbeddedResourcesTest/EmbeddedResourcesTest/
test/resource/InterModuleDependency/SA110/ test/resour...
Author: brett
Date: Sat Dec 31 15:50:34 2011
New Revision: 1226115
URL: http://svn.apache.org/viewvc?rev=1226115&view=rev
Log:
adjust packaging types and fix execution declaration too include phase and ID
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Converter/Algorithms/AbstractPomConverter.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/InterModuleDependency/SA110/pom.test
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/InterModuleDependency/SAClassLibrary/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/NPANDAY-445-NET40GAC/NPANDAY-445-NET40GAC/pom.test
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/SampleVBDependency/Project1/pom.test
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/SampleVBDependency/Project2/pom.test
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/Shell32Example/Shell32Example/pom.test
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/SingleModuleCSharp/SingleModuleCSharp/pom.test
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/flat-multi-module-web-application-vb/MyLibrary/pom.test
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/flat-multi-module/consoleApp2/pom.test
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/flat-multi-module/pom.test
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/flat-single-module-cs/pom.test
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/flat-single-module-vb/pom.test
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/sample_web_project/BongClassLib/pom.test
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/sample_web_project/SampleInterProject111/pom.test
Modified: incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Converter/Algorithms/AbstractPomConverter.cs
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Converter/Algorithms/AbstractPomConverter.cs?rev=1226115&r1=1226114&r2=1226115&view=diff
==============================================================================
--- incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Converter/Algorithms/AbstractPomConverter.cs (original)
+++ incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Converter/Algorithms/AbstractPomConverter.cs Sat Dec 31 15:50:34 2011
@@ -39,6 +39,16 @@ namespace NPanday.ProjectImporter.Conver
{
public abstract class AbstractPomConverter : IPomConverter
{
+ public static Dictionary<string, string> npandayTypeMap = new Dictionary<string, string>();
+ static AbstractPomConverter()
+ {
+ // reverse of ArtifactType in dotnet-core
+ npandayTypeMap.Add("library", "dotnet-library");
+ npandayTypeMap.Add("module", "dotnet-module");
+ npandayTypeMap.Add("exe", "dotnet-executable");
+ npandayTypeMap.Add("winexe", "dotnet-executable");
+ }
+
protected RspUtility rspUtil;
protected ArtifactContext artifactContext;
protected List<Artifact.Artifact> localArtifacts;
@@ -64,7 +74,6 @@ namespace NPanday.ProjectImporter.Conver
get { return model; }
}
-
public AbstractPomConverter(ProjectDigest projectDigest, string mainPomFile, NPanday.Model.Pom.Model parent, string groupId)
{
@@ -302,7 +311,7 @@ namespace NPanday.ProjectImporter.Conver
}
- protected void GenerateHeader(string packaging)
+ protected void GenerateHeader(string defaultPackaging)
{
// Add Parent Header
if (parent != null)
@@ -333,19 +342,16 @@ namespace NPanday.ProjectImporter.Conver
projectName = f.Name.Substring(0, f.Name.Length - f.Extension.Length);
}
-
- model.artifactId = FilterID(projectName);
-
-
-
-
model.modelVersion = "4.0.0";
- model.packaging = packaging;
-
+ model.artifactId = FilterID(projectName);
model.name = string.Format("{0} : {1}", !string.IsNullOrEmpty(groupId) ? groupId : FilterID(projectDigest.AssemblyName), FilterID(projectDigest.AssemblyName));
+
+ model.packaging = defaultPackaging;
if (!string.IsNullOrEmpty(projectDigest.OutputType))
{
- model.packaging = projectDigest.OutputType.ToLower();
+ string type = projectDigest.OutputType.ToLower();
+ if (npandayTypeMap.ContainsKey(type))
+ model.packaging = npandayTypeMap[type];
}
}
@@ -517,11 +523,13 @@ namespace NPanday.ProjectImporter.Conver
/// <param name="phase"></param>
protected void AddPluginExecution(Plugin plugin, string goal, string phase)
{
- if (string.IsNullOrEmpty(goal))
- {
- // there is nothing to write
- return;
- }
+ AddPluginExecution(plugin, goal, new string[] { goal }, phase);
+ }
+
+ protected void AddPluginExecution(Plugin plugin, string id, string[] goals, string phase)
+ {
+ if (goals.Length == 0)
+ throw new Exception("Plugin execution must contain goals");
List<PluginExecution> list = new List<PluginExecution>();
if (plugin.executions == null)
@@ -532,7 +540,9 @@ namespace NPanday.ProjectImporter.Conver
PluginExecution exe = new PluginExecution();
- exe.goals = new string[] { goal };
+ exe.id = id;
+ exe.goals = goals;
+ exe.phase = phase;
list.Add(exe);
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=1226115&r1=1226114&r2=1226115&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 Sat Dec 31 15:50:34 2011
@@ -8,7 +8,7 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>EmbeddedResourcesTest</artifactId>
- <packaging>winexe</packaging>
+ <packaging>dotnet-executable</packaging>
<name>test.group : EmbeddedResourcesTest</name>
<build>
<sourceDirectory>./</sourceDirectory>
@@ -50,4 +50,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
Modified: incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/InterModuleDependency/SA110/pom.test
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/InterModuleDependency/SA110/pom.test?rev=1226115&r1=1226114&r2=1226115&view=diff
==============================================================================
--- incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/InterModuleDependency/SA110/pom.test (original)
+++ incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/InterModuleDependency/SA110/pom.test Sat Dec 31 15:50:34 2011
@@ -8,7 +8,7 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>SA110</artifactId>
- <packaging>exe</packaging>
+ <packaging>dotnet-executable</packaging>
<name>test.group : SA110</name>
<build>
<sourceDirectory>./</sourceDirectory>
@@ -34,4 +34,4 @@
<type>library</type>
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
Modified: incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/InterModuleDependency/SAClassLibrary/pom.test
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/InterModuleDependency/SAClassLibrary/pom.test?rev=1226115&r1=1226114&r2=1226115&view=diff
==============================================================================
--- incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/InterModuleDependency/SAClassLibrary/pom.test (original)
+++ incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/InterModuleDependency/SAClassLibrary/pom.test Sat Dec 31 15:50:34 2011
@@ -8,7 +8,7 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>SAClassLibrary</artifactId>
- <packaging>library</packaging>
+ <packaging>dotnet-library</packaging>
<name>test.group : SAClassLibrary</name>
<build>
<sourceDirectory>./</sourceDirectory>
@@ -26,4 +26,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
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=1226115&r1=1226114&r2=1226115&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 Sat Dec 31 15:50:34 2011
@@ -8,7 +8,7 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>MavenTestProjectWithNUnit</artifactId>
- <packaging>library</packaging>
+ <packaging>dotnet-library</packaging>
<name>Microsoft.MavenTestProjectWithNUnit : MavenTestProjectWithNUnit</name>
<build>
<sourceDirectory>./</sourceDirectory>
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=1226115&r1=1226114&r2=1226115&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 Sat Dec 31 15:50:34 2011
@@ -8,7 +8,7 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>MavenTestProjectWithoutNUnit</artifactId>
- <packaging>library</packaging>
+ <packaging>dotnet-library</packaging>
<name>Microsoft.MavenTestProjectWithoutNUnit : MavenTestProjectWithoutNUnit</name>
<build>
<sourceDirectory>./</sourceDirectory>
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=1226115&r1=1226114&r2=1226115&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 Sat Dec 31 15:50:34 2011
@@ -8,7 +8,7 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>MultipleFolderLevelExample</artifactId>
- <packaging>library</packaging>
+ <packaging>dotnet-library</packaging>
<name>test.group : MultipleFolderLevelExample</name>
<build>
<sourceDirectory>./</sourceDirectory>
Modified: incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/NPANDAY-445-NET40GAC/NPANDAY-445-NET40GAC/pom.test
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/NPANDAY-445-NET40GAC/NPANDAY-445-NET40GAC/pom.test?rev=1226115&r1=1226114&r2=1226115&view=diff
==============================================================================
--- incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/NPANDAY-445-NET40GAC/NPANDAY-445-NET40GAC/pom.test (original)
+++ incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/NPANDAY-445-NET40GAC/NPANDAY-445-NET40GAC/pom.test Sat Dec 31 15:50:34 2011
@@ -8,7 +8,7 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>NPANDAY-445-NET40GAC</artifactId>
- <packaging>library</packaging>
+ <packaging>dotnet-library</packaging>
<name>test.group : NPANDAY-445-NET40GAC</name>
<build>
<sourceDirectory>./</sourceDirectory>
Modified: incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/SampleVBDependency/Project1/pom.test
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/SampleVBDependency/Project1/pom.test?rev=1226115&r1=1226114&r2=1226115&view=diff
==============================================================================
--- incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/SampleVBDependency/Project1/pom.test (original)
+++ incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/SampleVBDependency/Project1/pom.test Sat Dec 31 15:50:34 2011
@@ -8,7 +8,7 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>Project1</artifactId>
- <packaging>library</packaging>
+ <packaging>dotnet-library</packaging>
<name>test.group : Project1</name>
<build>
<sourceDirectory>./</sourceDirectory>
Modified: incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/SampleVBDependency/Project2/pom.test
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/SampleVBDependency/Project2/pom.test?rev=1226115&r1=1226114&r2=1226115&view=diff
==============================================================================
--- incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/SampleVBDependency/Project2/pom.test (original)
+++ incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/SampleVBDependency/Project2/pom.test Sat Dec 31 15:50:34 2011
@@ -8,7 +8,7 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>Project2</artifactId>
- <packaging>library</packaging>
+ <packaging>dotnet-library</packaging>
<name>test.group : Project2</name>
<build>
<sourceDirectory>./</sourceDirectory>
Modified: incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/Shell32Example/Shell32Example/pom.test
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/Shell32Example/Shell32Example/pom.test?rev=1226115&r1=1226114&r2=1226115&view=diff
==============================================================================
--- incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/Shell32Example/Shell32Example/pom.test (original)
+++ incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/Shell32Example/Shell32Example/pom.test Sat Dec 31 15:50:34 2011
@@ -8,7 +8,7 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>Shell32Example</artifactId>
- <packaging>winexe</packaging>
+ <packaging>dotnet-executable</packaging>
<name>test.group : Shell32Example</name>
<build>
<sourceDirectory>./</sourceDirectory>
@@ -55,4 +55,4 @@
<classifier>{50A7E9B0-70EF-11D1-B75A-00A0C90564FE}-1.0-0</classifier>
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
Modified: incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/SingleModuleCSharp/SingleModuleCSharp/pom.test
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/SingleModuleCSharp/SingleModuleCSharp/pom.test?rev=1226115&r1=1226114&r2=1226115&view=diff
==============================================================================
--- incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/SingleModuleCSharp/SingleModuleCSharp/pom.test (original)
+++ incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/SingleModuleCSharp/SingleModuleCSharp/pom.test Sat Dec 31 15:50:34 2011
@@ -8,7 +8,7 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>SingleModuleCSharp</artifactId>
- <packaging>winexe</packaging>
+ <packaging>dotnet-executable</packaging>
<name>test.group : SingleModuleCSharp</name>
<build>
<sourceDirectory>./</sourceDirectory>
@@ -42,4 +42,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
Modified: incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/flat-multi-module-web-application-vb/MyLibrary/pom.test
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/flat-multi-module-web-application-vb/MyLibrary/pom.test?rev=1226115&r1=1226114&r2=1226115&view=diff
==============================================================================
--- incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/flat-multi-module-web-application-vb/MyLibrary/pom.test (original)
+++ incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/flat-multi-module-web-application-vb/MyLibrary/pom.test Sat Dec 31 15:50:34 2011
@@ -8,7 +8,7 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>MyLibrary</artifactId>
- <packaging>library</packaging>
+ <packaging>dotnet-library</packaging>
<name>test.group : MyLibrary</name>
<build>
<sourceDirectory>./</sourceDirectory>
@@ -53,4 +53,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
Modified: incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/flat-multi-module/consoleApp2/pom.test
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/flat-multi-module/consoleApp2/pom.test?rev=1226115&r1=1226114&r2=1226115&view=diff
==============================================================================
--- incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/flat-multi-module/consoleApp2/pom.test (original)
+++ incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/flat-multi-module/consoleApp2/pom.test Sat Dec 31 15:50:34 2011
@@ -8,7 +8,7 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>consoleApp2</artifactId>
- <packaging>exe</packaging>
+ <packaging>dotnet-executable</packaging>
<name>test.group : consoleApp2</name>
<build>
<sourceDirectory>./</sourceDirectory>
@@ -54,4 +54,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
Modified: incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/flat-multi-module/pom.test
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/flat-multi-module/pom.test?rev=1226115&r1=1226114&r2=1226115&view=diff
==============================================================================
--- incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/flat-multi-module/pom.test (original)
+++ incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/flat-multi-module/pom.test Sat Dec 31 15:50:34 2011
@@ -8,7 +8,7 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>flatVBproj</artifactId>
- <packaging>exe</packaging>
+ <packaging>dotnet-executable</packaging>
<name>test.group : flatVBproj</name>
<build>
<sourceDirectory>./</sourceDirectory>
Modified: incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/flat-single-module-cs/pom.test
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/flat-single-module-cs/pom.test?rev=1226115&r1=1226114&r2=1226115&view=diff
==============================================================================
--- incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/flat-single-module-cs/pom.test (original)
+++ incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/flat-single-module-cs/pom.test Sat Dec 31 15:50:34 2011
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>test.group</groupId>
<artifactId>FlatSingleModule</artifactId>
- <packaging>library</packaging>
+ <packaging>dotnet-library</packaging>
<name>test.group : FlatSingleModule</name>
<version>1.0-SNAPSHOT</version>
<build>
@@ -22,4 +22,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
Modified: incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/flat-single-module-vb/pom.test
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/flat-single-module-vb/pom.test?rev=1226115&r1=1226114&r2=1226115&view=diff
==============================================================================
--- incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/flat-single-module-vb/pom.test (original)
+++ incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/flat-single-module-vb/pom.test Sat Dec 31 15:50:34 2011
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>test.group</groupId>
<artifactId>FlatSingleModuleVB</artifactId>
- <packaging>library</packaging>
+ <packaging>dotnet-library</packaging>
<name>test.group : FlatSingleModuleVB</name>
<version>1.0-SNAPSHOT</version>
<build>
@@ -49,4 +49,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
Modified: incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/sample_web_project/BongClassLib/pom.test
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/sample_web_project/BongClassLib/pom.test?rev=1226115&r1=1226114&r2=1226115&view=diff
==============================================================================
--- incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/sample_web_project/BongClassLib/pom.test (original)
+++ incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/sample_web_project/BongClassLib/pom.test Sat Dec 31 15:50:34 2011
@@ -8,7 +8,7 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>BongClassLibRenamedHehehe</artifactId>
- <packaging>library</packaging>
+ <packaging>dotnet-library</packaging>
<name>test.group : BongClassLibRenamedHehehe</name>
<build>
<sourceDirectory>./</sourceDirectory>
Modified: incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/sample_web_project/SampleInterProject111/pom.test
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/sample_web_project/SampleInterProject111/pom.test?rev=1226115&r1=1226114&r2=1226115&view=diff
==============================================================================
--- incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/sample_web_project/SampleInterProject111/pom.test (original)
+++ incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/sample_web_project/SampleInterProject111/pom.test Sat Dec 31 15:50:34 2011
@@ -8,7 +8,7 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>SampleInterProject111</artifactId>
- <packaging>library</packaging>
+ <packaging>dotnet-library</packaging>
<name>test.group : SampleInterProject111</name>
<build>
<sourceDirectory>./</sourceDirectory>