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 2012/01/02 04:39:00 UTC
svn commit: r1226343 - in
/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src:
main/csharp/Converter/Algorithms/ test/csharp/ImporterTests/
test/resource/NPANDAY_480_AzureSupportOneWebRole/HelloWorld_WebRole/
test/resource/NPA...
Author: brett
Date: Mon Jan 2 04:38:59 2012
New Revision: 1226343
URL: http://svn.apache.org/viewvc?rev=1226343&view=rev
Log:
[NPANDAY-480][NPANDAY-488] clean up generated POMs, and make sure Azure tests use MSDeploy
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Converter/Algorithms/ASPNetPomConverter.cs
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/AzureImportMultipleRolesTest.cs
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/AzureImportOneWebRoleTest.cs
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/AzureImportWorkerRoleTest.cs
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/NPANDAY_480_AzureSupportOneWebRole/HelloWorld_WebRole/pom.test
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/NPANDAY_480_CloudServiceWithMultipleRoles/HelloWorld_WebRole/pom.test
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/NPANDAY_488/NPANDAY_488_MSDeployPackageSimpleWebApp/pom.test
Modified: incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Converter/Algorithms/ASPNetPomConverter.cs
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Converter/Algorithms/ASPNetPomConverter.cs?rev=1226343&r1=1226342&r2=1226343&view=diff
==============================================================================
--- incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Converter/Algorithms/ASPNetPomConverter.cs (original)
+++ incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Converter/Algorithms/ASPNetPomConverter.cs Mon Jan 2 04:38:59 2012
@@ -22,6 +22,7 @@ using System.IO;
using NPanday.Model.Pom;
using NPanday.ProjectImporter.Digest.Model;
using NPanday.Utils;
+using System.Collections.Generic;
namespace NPanday.ProjectImporter.Converter.Algorithms
{
@@ -36,12 +37,22 @@ namespace NPanday.ProjectImporter.Conver
{
// just call the base, but dont write it we still need some minor adjustments for it
base.ConvertProjectToPomModel(false,scmTag);
-
+
+ List<string> goals = new List<string>();
+ goals.Add("assemble-package-files");
+ foreach (Content content in projectDigest.Contents)
+ {
+ if (content.IncludePath.Equals("web.package.config", System.StringComparison.InvariantCultureIgnoreCase))
+ {
+ goals.Add("process-web-config");
+ }
+ }
+
Plugin aspnetPlugin = AddPlugin("org.apache.npanday.plugins", "aspnet-maven-plugin", null, false);
- AddPluginExecution(aspnetPlugin, "prepare-package", new string[] { "assemble-package-files" }, "prepare-package");
+ AddPluginExecution(aspnetPlugin, "prepare-package", goals.ToArray(), null);
Plugin msdeployPlugin = AddPlugin("org.apache.npanday.plugins", "msdeploy-maven-plugin", null, false);
- AddPluginExecution(msdeployPlugin, "create-msdeploy-package", new string[] { "create-package" }, "package");
+ AddPluginExecution(msdeployPlugin, "create-msdeploy-package", new string[] { "create-package" }, null);
if (writePom)
{
Modified: incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/AzureImportMultipleRolesTest.cs
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/AzureImportMultipleRolesTest.cs?rev=1226343&r1=1226342&r2=1226343&view=diff
==============================================================================
--- incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/AzureImportMultipleRolesTest.cs (original)
+++ incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/AzureImportMultipleRolesTest.cs Mon Jan 2 04:38:59 2012
@@ -35,6 +35,11 @@ namespace NPanday.ProjectImporter.Import
}
}
+ public override bool UseMsDeploy
+ {
+ get { return true; }
+ }
+
public override string SolutionFileRelativePath
{
get { return @"NPANDAY_480_CloudServiceWithMultipleRoles\HelloWorld.sln"; }
@@ -43,7 +48,7 @@ namespace NPanday.ProjectImporter.Import
[Test]
public override void ShouldGenerateTheExpectedNumberOfPoms()
{
- ProjectImporterAssertions.AssertPomCount(3, GeneratedPomFiles);
+ ProjectImporterAssertions.AssertPomCount(4, GeneratedPomFiles);
}
public override string TestResourcePath
Modified: incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/AzureImportOneWebRoleTest.cs
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/AzureImportOneWebRoleTest.cs?rev=1226343&r1=1226342&r2=1226343&view=diff
==============================================================================
--- incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/AzureImportOneWebRoleTest.cs (original)
+++ incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/AzureImportOneWebRoleTest.cs Mon Jan 2 04:38:59 2012
@@ -35,6 +35,11 @@ namespace NPanday.ProjectImporter.Import
}
}
+ public override bool UseMsDeploy
+ {
+ get { return true; }
+ }
+
public override string SolutionFileRelativePath
{
get { return @"NPANDAY_480_AzureSupportOneWebRole\HelloWorld.sln"; }
@@ -43,7 +48,7 @@ namespace NPanday.ProjectImporter.Import
[Test]
public override void ShouldGenerateTheExpectedNumberOfPoms()
{
- ProjectImporterAssertions.AssertPomCount(2, GeneratedPomFiles);
+ ProjectImporterAssertions.AssertPomCount(3, GeneratedPomFiles);
}
public override string TestResourcePath
Modified: incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/AzureImportWorkerRoleTest.cs
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/AzureImportWorkerRoleTest.cs?rev=1226343&r1=1226342&r2=1226343&view=diff
==============================================================================
--- incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/AzureImportWorkerRoleTest.cs (original)
+++ incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/AzureImportWorkerRoleTest.cs Mon Jan 2 04:38:59 2012
@@ -43,7 +43,12 @@ namespace NPanday.ProjectImporter.Import
[Test]
public override void ShouldGenerateTheExpectedNumberOfPoms()
{
- ProjectImporterAssertions.AssertPomCount(2, GeneratedPomFiles);
+ ProjectImporterAssertions.AssertPomCount(3, GeneratedPomFiles);
+ }
+
+ public override bool UseMsDeploy
+ {
+ get { return true; }
}
public override string TestResourcePath
Modified: incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/NPANDAY_480_AzureSupportOneWebRole/HelloWorld_WebRole/pom.test
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/NPANDAY_480_AzureSupportOneWebRole/HelloWorld_WebRole/pom.test?rev=1226343&r1=1226342&r2=1226343&view=diff
==============================================================================
--- incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/NPANDAY_480_AzureSupportOneWebRole/HelloWorld_WebRole/pom.test (original)
+++ incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/NPANDAY_480_AzureSupportOneWebRole/HelloWorld_WebRole/pom.test Mon Jan 2 04:38:59 2012
@@ -11,7 +11,7 @@
<packaging>dotnet-library</packaging>
<name>test.group : HelloWorldWebRole</name>
<build>
- <sourceDirectory>.</sourceDirectory>
+ <sourceDirectory>./</sourceDirectory>
<plugins>
<plugin>
<groupId>org.apache.npanday.plugins</groupId>
@@ -23,7 +23,6 @@
<includeSource>Default.aspx.cs</includeSource>
<includeSource>Default.aspx.designer.cs</includeSource>
</includeSources>
- <outputDirectory>bin</outputDirectory>
</configuration>
</plugin>
<plugin>
@@ -31,6 +30,7 @@
<artifactId>aspnet-maven-plugin</artifactId>
<executions>
<execution>
+ <id>prepare-package</id>
<goals>
<goal>assemble-package-files</goal>
<goal>process-web-config</goal>
@@ -43,6 +43,7 @@
<artifactId>msdeploy-maven-plugin</artifactId>
<executions>
<execution>
+ <id>create-msdeploy-package</id>
<goals>
<goal>create-package</goal>
</goals>
Modified: incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/NPANDAY_480_CloudServiceWithMultipleRoles/HelloWorld_WebRole/pom.test
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/NPANDAY_480_CloudServiceWithMultipleRoles/HelloWorld_WebRole/pom.test?rev=1226343&r1=1226342&r2=1226343&view=diff
==============================================================================
--- incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/NPANDAY_480_CloudServiceWithMultipleRoles/HelloWorld_WebRole/pom.test (original)
+++ incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/NPANDAY_480_CloudServiceWithMultipleRoles/HelloWorld_WebRole/pom.test Mon Jan 2 04:38:59 2012
@@ -11,7 +11,7 @@
<packaging>dotnet-library</packaging>
<name>test.group : HelloWorldWebRole</name>
<build>
- <sourceDirectory>.</sourceDirectory>
+ <sourceDirectory>./</sourceDirectory>
<plugins>
<plugin>
<groupId>org.apache.npanday.plugins</groupId>
@@ -23,7 +23,6 @@
<includeSource>Default.aspx.cs</includeSource>
<includeSource>Default.aspx.designer.cs</includeSource>
</includeSources>
- <outputDirectory>bin</outputDirectory>
</configuration>
</plugin>
<plugin>
@@ -31,6 +30,7 @@
<artifactId>aspnet-maven-plugin</artifactId>
<executions>
<execution>
+ <id>prepare-package</id>
<goals>
<goal>assemble-package-files</goal>
<goal>process-web-config</goal>
@@ -43,6 +43,7 @@
<artifactId>msdeploy-maven-plugin</artifactId>
<executions>
<execution>
+ <id>create-msdeploy-package</id>
<goals>
<goal>create-package</goal>
</goals>
Modified: incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/NPANDAY_488/NPANDAY_488_MSDeployPackageSimpleWebApp/pom.test
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/NPANDAY_488/NPANDAY_488_MSDeployPackageSimpleWebApp/pom.test?rev=1226343&r1=1226342&r2=1226343&view=diff
==============================================================================
--- incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/NPANDAY_488/NPANDAY_488_MSDeployPackageSimpleWebApp/pom.test (original)
+++ incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/NPANDAY_488/NPANDAY_488_MSDeployPackageSimpleWebApp/pom.test Mon Jan 2 04:38:59 2012
@@ -31,7 +31,6 @@
<executions>
<execution>
<id>prepare-package</id>
- <phase>prepare-package</phase>
<goals>
<goal>assemble-package-files</goal>
</goals>
@@ -44,7 +43,6 @@
<executions>
<execution>
<id>create-msdeploy-package</id>
- <phase>package</phase>
<goals>
<goal>create-package</goal>
</goals>