Author: brett
Date: Mon Jan 2 17:35:35 2012
New Revision: 1226489
URL: http://svn.apache.org/viewvc?rev=1226489&view=rev
Log:
[NPANDAY-488] adjust default config behaviour until XDT is in place, so that a
reasonable Web/app.config is
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/main/csharp/Converter/Algorithms/AzureWorkerPomConverter.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_480_CloudServiceWithMultipleRoles/HelloWorld_WorkerRole/pom.test
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/NPANDAY_480_CloudServiceWithWorkerRole/HelloWorld_WorkerRole/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=1226489&r1=1226488&r2=1226489&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 17:35:35 2012
@@ -40,17 +40,14 @@ namespace NPanday.ProjectImporter.Conver
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");
- }
- }
+ goals.Add("process-web-config");
Plugin aspnetPlugin = AddPlugin("org.apache.npanday.plugins",
"aspnet-maven-plugin", null, false);
AddPluginExecution(aspnetPlugin, "prepare-package",
goals.ToArray(), null);
+ // TODO: until XDT works, just use Web.config itself
+ AddPluginConfiguration(aspnetPlugin, "webConfig", "Web.config");
+
Plugin msdeployPlugin = AddPlugin("org.apache.npanday.plugins",
"msdeploy-maven-plugin", null, false);
AddPluginExecution(msdeployPlugin, "create-msdeploy-package", new
string[] { "create-package" }, null);
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Converter/Algorithms/AzureWorkerPomConverter.cs
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Converter/Algorithms/AzureWorkerPomConverter.cs?rev=1226489&r1=1226488&r2=1226489&view=diff
==============================================================================
---
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Converter/Algorithms/AzureWorkerPomConverter.cs
(original)
+++
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Converter/Algorithms/AzureWorkerPomConverter.cs
Mon Jan 2 17:35:35 2012
@@ -40,18 +40,15 @@ namespace NPanday.ProjectImporter.Conver
List<string> goals = new List<string>();
goals.Add("assemble-package-files");
- foreach (Content content in projectDigest.Contents)
- {
- if (content.IncludePath.Equals("app.package.config",
System.StringComparison.InvariantCultureIgnoreCase))
- {
- goals.Add("process-app-config");
- }
- }
+ goals.Add("process-app-config");
goals.Add("package");
Plugin plugin = AddPlugin("org.apache.npanday.plugins",
"application-maven-plugin", null, false);
AddPluginExecution(plugin, "package-application", goals.ToArray(),
null);
+ // TODO: until XDT works, just use Web.config itself
+ AddPluginConfiguration(plugin, "appConfig", "app.config");
+
if (writePom)
{
PomHelperUtility.WriteModelToPom(new
FileInfo(Path.GetDirectoryName(projectDigest.FullFileName) + @"\pom.xml"),
Model);
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=1226489&r1=1226488&r2=1226489&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 Jan 2 17:35:35 2012
@@ -33,9 +33,13 @@
<id>prepare-package</id>
<goals>
<goal>assemble-package-files</goal>
+ <goal>process-web-config</goal>
</goals>
</execution>
</executions>
+ <configuration>
+ <webConfig>Web.config</webConfig>
+ </configuration>
</plugin>
<plugin>
<groupId>org.apache.npanday.plugins</groupId>
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=1226489&r1=1226488&r2=1226489&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 17:35:35 2012
@@ -37,6 +37,9 @@
</goals>
</execution>
</executions>
+ <configuration>
+ <webConfig>Web.config</webConfig>
+ </configuration>
</plugin>
<plugin>
<groupId>org.apache.npanday.plugins</groupId>
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=1226489&r1=1226488&r2=1226489&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 17:35:35 2012
@@ -37,6 +37,9 @@
</goals>
</execution>
</executions>
+ <configuration>
+ <webConfig>Web.config</webConfig>
+ </configuration>
</plugin>
<plugin>
<groupId>org.apache.npanday.plugins</groupId>
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/NPANDAY_480_CloudServiceWithMultipleRoles/HelloWorld_WorkerRole/pom.test
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/NPANDAY_480_CloudServiceWithMultipleRoles/HelloWorld_WorkerRole/pom.test?rev=1226489&r1=1226488&r2=1226489&view=diff
==============================================================================
---
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/NPANDAY_480_CloudServiceWithMultipleRoles/HelloWorld_WorkerRole/pom.test
(original)
+++
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/NPANDAY_480_CloudServiceWithMultipleRoles/HelloWorld_WorkerRole/pom.test
Mon Jan 2 17:35:35 2012
@@ -33,10 +33,14 @@
<id>package-application</id>
<goals>
<goal>assemble-package-files</goal>
+ <goal>process-app-config</goal>
<goal>package</goal>
</goals>
</execution>
</executions>
+ <configuration>
+ <appConfig>app.config</appConfig>
+ </configuration>
</plugin>
</plugins>
</build>
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/NPANDAY_480_CloudServiceWithWorkerRole/HelloWorld_WorkerRole/pom.test
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/NPANDAY_480_CloudServiceWithWorkerRole/HelloWorld_WorkerRole/pom.test?rev=1226489&r1=1226488&r2=1226489&view=diff
==============================================================================
---
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/NPANDAY_480_CloudServiceWithWorkerRole/HelloWorld_WorkerRole/pom.test
(original)
+++
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/NPANDAY_480_CloudServiceWithWorkerRole/HelloWorld_WorkerRole/pom.test
Mon Jan 2 17:35:35 2012
@@ -33,10 +33,14 @@
<id>package-application</id>
<goals>
<goal>assemble-package-files</goal>
+ <goal>process-app-config</goal>
<goal>package</goal>
</goals>
</execution>
</executions>
+ <configuration>
+ <appConfig>app.config</appConfig>
+ </configuration>
</plugin>
</plugins>
</build>
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=1226489&r1=1226488&r2=1226489&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 17:35:35 2012
@@ -33,9 +33,13 @@
<id>prepare-package</id>
<goals>
<goal>assemble-package-files</goal>
+ <goal>process-web-config</goal>
</goals>
</execution>
</executions>
+ <configuration>
+ <webConfig>Web.config</webConfig>
+ </configuration>
</plugin>
<plugin>
<groupId>org.apache.npanday.plugins</groupId>
