Author: brett Date: Thu Mar 7 03:11:58 2013 New Revision: 1453671 URL: http://svn.apache.org/r1453671 Log: update remaining references to dotnet-library
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/main/csharp/Converter/Algorithms/AzurePomConverter.cs 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/SampleVBDependency/Project2/pom.test incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/SilverlightApplication1/SilverlightApplication1/pom.test incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/flat-multi-module-web-application-vb/pom.test incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/sample_web_project/SampleWeb/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=1453671&r1=1453670&r2=1453671&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 Thu Mar 7 03:11:58 2013 @@ -467,7 +467,10 @@ namespace NPanday.ProjectImporter.Conver if (digest != null && !string.IsNullOrEmpty(digest.OutputType)) { - interDependency.type = digest.OutputType.ToLower(); + string type = digest.OutputType.ToLower(); + if (npandayTypeMap.ContainsKey(type)) + type = npandayTypeMap[type]; + interDependency.type = type; } return interDependency; } Modified: incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Converter/Algorithms/AzurePomConverter.cs URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Converter/Algorithms/AzurePomConverter.cs?rev=1453671&r1=1453670&r2=1453671&view=diff ============================================================================== --- incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Converter/Algorithms/AzurePomConverter.cs (original) +++ incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Converter/Algorithms/AzurePomConverter.cs Thu Mar 7 03:11:58 2013 @@ -114,7 +114,10 @@ namespace NPanday.ProjectImporter.Conver if (projectRef.ProjectReferenceDigest != null && !string.IsNullOrEmpty(projectRef.ProjectReferenceDigest.OutputType)) { - dependency.type = projectRef.ProjectReferenceDigest.OutputType.ToLower(); + string type = projectRef.ProjectReferenceDigest.OutputType.ToLower(); + if (npandayTypeMap.ContainsKey(type)) + type = npandayTypeMap[type]; + dependency.type = type; } if (projectRef.RoleType != null) { 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=1453671&r1=1453670&r2=1453671&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 Thu Mar 7 03:11:58 2013 @@ -32,7 +32,7 @@ <groupId>test.group</groupId> <artifactId>SAClassLibrary</artifactId> <version>1.2.3-SNAPSHOT</version> - <type>library</type> + <type>dotnet-library</type> </dependency> </dependencies> </project> 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=1453671&r1=1453670&r2=1453671&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 Thu Mar 7 03:11:58 2013 @@ -58,7 +58,7 @@ <groupId>test.group</groupId> <artifactId>Project1</artifactId> <version>1.2.3-SNAPSHOT</version> - <type>library</type> + <type>dotnet-library</type> </dependency> </dependencies> </project> Modified: incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/SilverlightApplication1/SilverlightApplication1/pom.test URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/SilverlightApplication1/SilverlightApplication1/pom.test?rev=1453671&r1=1453670&r2=1453671&view=diff ============================================================================== --- incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/SilverlightApplication1/SilverlightApplication1/pom.test (original) +++ incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/SilverlightApplication1/SilverlightApplication1/pom.test Thu Mar 7 03:11:58 2013 @@ -25,7 +25,7 @@ <groupId>test.group</groupId> <artifactId>SilverlightClassLibrary1</artifactId> <version>1.2.3-SNAPSHOT</version> - <type>library</type> + <type>dotnet-library</type> </dependency> <dependency> <groupId>System.Windows</groupId> Modified: incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/flat-multi-module-web-application-vb/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/pom.test?rev=1453671&r1=1453670&r2=1453671&view=diff ============================================================================== --- incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/flat-multi-module-web-application-vb/pom.test (original) +++ incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/flat-multi-module-web-application-vb/pom.test Thu Mar 7 03:11:58 2013 @@ -25,7 +25,7 @@ <groupId>test.group</groupId> <artifactId>MyLibrary</artifactId> <version>1.2.3-SNAPSHOT</version> - <type>library</type> + <type>dotnet-library</type> </dependency> </dependencies> </project> Modified: incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/sample_web_project/SampleWeb/pom.test URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/sample_web_project/SampleWeb/pom.test?rev=1453671&r1=1453670&r2=1453671&view=diff ============================================================================== --- incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/sample_web_project/SampleWeb/pom.test (original) +++ incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/sample_web_project/SampleWeb/pom.test Thu Mar 7 03:11:58 2013 @@ -25,13 +25,13 @@ <groupId>test.group</groupId> <artifactId>SampleInterProject111</artifactId> <version>1.2.3-SNAPSHOT</version> - <type>library</type> + <type>dotnet-library</type> </dependency> <dependency> <groupId>test.group</groupId> <artifactId>BongClassLib</artifactId> <version>1.2.3-SNAPSHOT</version> - <type>library</type> + <type>dotnet-library</type> </dependency> <dependency> <groupId>Microsoft.Build.Engine</groupId>