You are viewing a plain text version of this content. The canonical link for it is here.
Posted to npanday-dev@incubator.apache.org by Brett Porter <br...@apache.org> on 2014/03/03 10:02:49 UTC

Re: svn commit: r1573504 - in /incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src: main/csharp/Converter/Algorithms/ test/resource/MvcApplication1/MvcApplication1/ test/resource/NPANDAY_480_AzureSupportOneWebRole/HelloWorld_WebRol...

Hi Lars,

I'm interested in your feedback here. I've made this change to be more inline with the previous behaviour which used contentPath. I picked up on this because it turns out the Resolve Web Roles mojo in the Azure plugin assumes a contentPath destination, and fails if you use iisApp.

Is this change correct, or should it in fact be iisApp now, and the resolve mojo adjusted?

(You can verify the behaviour through the Azure integration tests).

Cheers,
Brett

On 3 Mar 2014, at 8:55 pm, brett@apache.org wrote:

> Author: brett
> Date: Mon Mar  3 09:55:30 2014
> New Revision: 1573504
> 
> URL: http://svn.apache.org/r1573504
> Log:
> [NPANDAY-488] Use contentPath by default
> 
> This was the previous behaviour:
> http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/msdeploy-maven-plugin/src/main/java/npanday/plugin/msdeploy/create/CreateContentPackageMojo.java?r1=1333788&r2=1332286&pathrev=1333788
> 
> Also, there is a problem using iisApp with resolve web roles, since it
> expects the contentPath destination:
> http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/msdeploy-maven-plugin/src/main/java/npanday/plugin/msdeploy/create/CreateContentPackageMojo.java?r1=1333788&r2=1332286&pathrev=1333788
> 
> 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/resource/MvcApplication1/MvcApplication1/pom.test
>    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
>    incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/SilverlightApplication1/SilverlightApplication1.Web/pom.test
>    incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/SilverlightApplication5/SilverlightApplication5.Web/pom.test
>    incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/WebAppWithCultureRes/WebAppWithCultureRes/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=1573504&r1=1573503&r2=1573504&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 Mar  3 09:55:30 2014
> @@ -54,7 +54,7 @@ namespace NPanday.ProjectImporter.Conver
>             }
> 
>             Plugin msdeployPlugin = AddPlugin("org.apache.npanday.plugins", "msdeploy-maven-plugin", null, false);
> -            AddPluginExecution(msdeployPlugin, "create-msdeploy-package", new string[] { "create-iisApp-package" }, null);
> +            AddPluginExecution(msdeployPlugin, "create-msdeploy-package", new string[] { "create-content-package" }, null);
> 
>             if (projectDigest.SilverlightApplicationList != null)
>             {
> 
> Modified: incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/MvcApplication1/MvcApplication1/pom.test
> URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/MvcApplication1/MvcApplication1/pom.test?rev=1573504&r1=1573503&r2=1573504&view=diff
> ==============================================================================
> --- incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/MvcApplication1/MvcApplication1/pom.test (original)
> +++ incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/MvcApplication1/MvcApplication1/pom.test Mon Mar  3 09:55:30 2014
> @@ -50,7 +50,7 @@
>           <execution>
>             <id>create-msdeploy-package</id>
>             <goals>
> -              <goal>create-iisApp-package</goal>
> +              <goal>create-content-package</goal>
>             </goals>
>           </execution>
>         </executions>
> 
> 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=1573504&r1=1573503&r2=1573504&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 Mar  3 09:55:30 2014
> @@ -50,7 +50,7 @@
>           <execution>
>             <id>create-msdeploy-package</id>
>             <goals>
> -              <goal>create-iisApp-package</goal>
> +              <goal>create-content-package</goal>
>             </goals>
>           </execution>
>         </executions>
> 
> 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=1573504&r1=1573503&r2=1573504&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 Mar  3 09:55:30 2014
> @@ -50,7 +50,7 @@
>           <execution>
>             <id>create-msdeploy-package</id>
>             <goals>
> -              <goal>create-iisApp-package</goal>
> +              <goal>create-content-package</goal>
>             </goals>
>           </execution>
>         </executions>
> 
> 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=1573504&r1=1573503&r2=1573504&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 Mar  3 09:55:30 2014
> @@ -50,7 +50,7 @@
>           <execution>
>             <id>create-msdeploy-package</id>
>             <goals>
> -              <goal>create-iisApp-package</goal>
> +              <goal>create-content-package</goal>
>             </goals>
>           </execution>
>         </executions>
> 
> Modified: incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/SilverlightApplication1/SilverlightApplication1.Web/pom.test
> URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/SilverlightApplication1/SilverlightApplication1.Web/pom.test?rev=1573504&r1=1573503&r2=1573504&view=diff
> ==============================================================================
> --- incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/SilverlightApplication1/SilverlightApplication1.Web/pom.test (original)
> +++ incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/SilverlightApplication1/SilverlightApplication1.Web/pom.test Mon Mar  3 09:55:30 2014
> @@ -49,7 +49,7 @@
>           <execution>
>             <id>create-msdeploy-package</id>
>             <goals>
> -              <goal>create-iisApp-package</goal>
> +              <goal>create-content-package</goal>
>             </goals>
>           </execution>
>         </executions>
> 
> Modified: incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/SilverlightApplication5/SilverlightApplication5.Web/pom.test
> URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/SilverlightApplication5/SilverlightApplication5.Web/pom.test?rev=1573504&r1=1573503&r2=1573504&view=diff
> ==============================================================================
> --- incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/SilverlightApplication5/SilverlightApplication5.Web/pom.test (original)
> +++ incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/SilverlightApplication5/SilverlightApplication5.Web/pom.test Mon Mar  3 09:55:30 2014
> @@ -49,7 +49,7 @@
>           <execution>
>             <id>create-msdeploy-package</id>
>             <goals>
> -              <goal>create-iisApp-package</goal>
> +              <goal>create-content-package</goal>
>             </goals>
>           </execution>
>         </executions>
> 
> Modified: incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/WebAppWithCultureRes/WebAppWithCultureRes/pom.test
> URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/WebAppWithCultureRes/WebAppWithCultureRes/pom.test?rev=1573504&r1=1573503&r2=1573504&view=diff
> ==============================================================================
> --- incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/WebAppWithCultureRes/WebAppWithCultureRes/pom.test (original)
> +++ incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/WebAppWithCultureRes/WebAppWithCultureRes/pom.test Mon Mar  3 09:55:30 2014
> @@ -81,7 +81,7 @@
>           <execution>
>             <id>create-msdeploy-package</id>
>             <goals>
> -              <goal>create-iisApp-package</goal>
> +              <goal>create-content-package</goal>
>             </goals>
>           </execution>
>         </executions>
> 
>