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/03/20 13:09:27 UTC
svn commit: r1302871 - in /incubator/npanday/trunk/dotnet/assemblies:
NPanday.ProjectImporter/Engine/src/main/csharp/
NPanday.ProjectImporter/Engine/src/main/csharp/Converter/Algorithms/
NPanday.ProjectImporter/Engine/src/main/csharp/Digest/ NPanday.Pr...
Author: brett
Date: Tue Mar 20 13:09:26 2012
New Revision: 1302871
URL: http://svn.apache.org/viewvc?rev=1302871&view=rev
Log:
[NPANDAY-548] POM generator should set <define> configuration if they are declared in the MSBuild file
[NPANDAY-549] POM generator should honour the selected configuration for all projects, not just web projects, and use it for evaluating conditions when importing
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/AbstractPomConverter.cs
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Converter/Algorithms/NormalPomConverter.cs
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Digest/Algorithms/NormalProjectDigestAlgorithm.cs
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Digest/Algorithms/WebProjectDigestAlgorithm.cs
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Digest/Model/ProjectDigest.cs
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Digest/ProjectDigester.cs
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/NPandayImporter.cs
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/AbstractProjectImportTest.cs
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/ComReferenceNormalProjectTest.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/MvcApplication1/MvcApplication1/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/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
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/NPANDAY_537_WindowsExecutableTest/WindowsFormsApplication1/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/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/SingleModuleCSharp/SingleModuleCSharp/pom.test
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/WebSiteWithCSProj/WebApplication1/pom.test
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/WpfApplication1/WpfApplication1/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.VisualStudio.Addin/src/main/csharp/NPandayImportProjectForm.Designer.cs
incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/main/csharp/NPandayImportProjectForm.cs
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=1302871&r1=1302870&r2=1302871&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 Tue Mar 20 13:09:26 2012
@@ -48,9 +48,9 @@ namespace NPanday.ProjectImporter.Conver
if (!string.IsNullOrEmpty(projectDigest.TargetFramework))
AddPluginConfiguration(aspnetPlugin, "frameworkVersion", projectDigest.TargetFramework);
- if (!string.IsNullOrEmpty(projectDigest.WebConfig))
+ if (!string.IsNullOrEmpty(projectDigest.Configuration))
{
- AddPluginConfiguration(aspnetPlugin, "transformationHint", projectDigest.WebConfig);
+ AddPluginConfiguration(aspnetPlugin, "transformationHint", projectDigest.Configuration);
}
Plugin msdeployPlugin = AddPlugin("org.apache.npanday.plugins", "msdeploy-maven-plugin", null, false);
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=1302871&r1=1302870&r2=1302871&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 Tue Mar 20 13:09:26 2012
@@ -983,12 +983,15 @@ namespace NPanday.ProjectImporter.Conver
}
-
-
- protected string GetDefineConfigurationValue()
+ protected string GetVBDefineConfigurationValue()
{
List<string> defines = new List<string>();
+ if (!string.IsNullOrEmpty(projectDigest.DefineConstants))
+ {
+ defines.Add(projectDigest.DefineConstants);
+ }
+
if (!string.IsNullOrEmpty(projectDigest.MyType))
{
defines.Add(string.Format("_MyType=\"{0}\"", projectDigest.MyType));
Modified: incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Converter/Algorithms/NormalPomConverter.cs
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Converter/Algorithms/NormalPomConverter.cs?rev=1302871&r1=1302870&r2=1302871&view=diff
==============================================================================
--- incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Converter/Algorithms/NormalPomConverter.cs (original)
+++ incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Converter/Algorithms/NormalPomConverter.cs Tue Mar 20 13:09:26 2012
@@ -88,18 +88,22 @@ namespace NPanday.ProjectImporter.Conver
);
if(!string.IsNullOrEmpty(projectDigest.TargetFramework))
AddPluginConfiguration(compilePlugin, "frameworkVersion", projectDigest.TargetFramework);
-
- if(projectDigest.Language.Equals("vb",StringComparison.OrdinalIgnoreCase))
+ if (projectDigest.Language.Equals("vb", StringComparison.OrdinalIgnoreCase))
{
AddPluginConfiguration(compilePlugin, "language", "VB");
AddPluginConfiguration(compilePlugin, "rootNamespace", projectDigest.RootNamespace);
- string define = GetDefineConfigurationValue();
+ string define = GetVBDefineConfigurationValue();
if (!string.IsNullOrEmpty(define))
{
AddPluginConfiguration(compilePlugin, "define", define);
}
}
+ else
+ {
+ if (!string.IsNullOrEmpty(projectDigest.DefineConstants))
+ AddPluginConfiguration(compilePlugin, "define", projectDigest.DefineConstants);
+ }
if (projectDigest.StartupObject != "Sub Main")
AddPluginConfiguration(compilePlugin, "main", projectDigest.StartupObject);
Modified: incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Digest/Algorithms/NormalProjectDigestAlgorithm.cs
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Digest/Algorithms/NormalProjectDigestAlgorithm.cs?rev=1302871&r1=1302870&r2=1302871&view=diff
==============================================================================
--- incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Digest/Algorithms/NormalProjectDigestAlgorithm.cs (original)
+++ incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Digest/Algorithms/NormalProjectDigestAlgorithm.cs Tue Mar 20 13:09:26 2012
@@ -28,6 +28,7 @@ using NPanday.Artifact;
using NPanday.ProjectImporter.Digest.Model;
using NPanday.ProjectImporter.Parser.VisualStudioProjectTypes;
using NPanday.Utils;
+using System.Text.RegularExpressions;
/// Author: Leopoldo Lee Agdeppa III
@@ -60,6 +61,8 @@ namespace NPanday.ProjectImporter.Digest
projectDigest.ProjectType = (VisualStudioProjectTypeEnum)projectMap["ProjectType"];
projectDigest.FullFileName = project.FullFileName;
projectDigest.FullDirectoryName = Path.GetDirectoryName(project.FullFileName);
+ if (projectMap.ContainsKey("Configuration"))
+ projectDigest.Configuration = projectMap["Configuration"].ToString();
FileInfo existingPomFile = new FileInfo(Path.Combine(projectDigest.FullDirectoryName, "pom.xml"));
if (existingPomFile.Exists)
@@ -126,7 +129,6 @@ namespace NPanday.ProjectImporter.Digest
projectDigest.GlobalNamespaceImports = globalNamespaceImports.ToArray();
projectDigest.ComReferenceList = comReferenceList.ToArray();
-
return projectDigest;
@@ -489,240 +491,298 @@ namespace NPanday.ProjectImporter.Digest
{
foreach (BuildPropertyGroup buildPropertyGroup in project.PropertyGroups)
{
- foreach (BuildProperty buildProperty in buildPropertyGroup)
+ if (string.IsNullOrEmpty(buildPropertyGroup.Condition) || evaluateCondition(projectDigest, buildPropertyGroup.Condition))
{
- if (!buildProperty.IsImported)
+ foreach (BuildProperty buildProperty in buildPropertyGroup)
{
-
- if ("RootNameSpace".Equals(buildProperty.Name, StringComparison.OrdinalIgnoreCase))
- {
- projectDigest.RootNamespace = buildProperty.Value;
- }
- else if ("AssemblyName".Equals(buildProperty.Name, StringComparison.OrdinalIgnoreCase))
- {
- projectDigest.AssemblyName = buildProperty.Value;
- }
- else if ("Name".Equals(buildProperty.Name, StringComparison.OrdinalIgnoreCase))
- {
- projectDigest.Name = buildProperty.Value;
- }
- else if ("StartupObject".Equals(buildProperty.Name, StringComparison.OrdinalIgnoreCase))
- {
- projectDigest.StartupObject = buildProperty.Value;
- }
- else if ("OutputType".Equals(buildProperty.Name, StringComparison.OrdinalIgnoreCase))
- {
- projectDigest.OutputType = buildProperty.Value;
- }
- else if ("SilverlightApplication".Equals(buildProperty.Name, StringComparison.OrdinalIgnoreCase))
- {
- projectDigest.SilverlightApplication = bool.Parse(buildProperty.Value);
- }
- else if ("SilverlightApplicationList".Equals(buildProperty.Name, StringComparison.OrdinalIgnoreCase))
- {
- projectDigest.SilverlightApplicationList = SilverlightApplicationReference.parseApplicationList(buildProperty.Value);
- }
- else if ("RoleType".Equals(buildProperty.Name, StringComparison.OrdinalIgnoreCase))
- {
- projectDigest.RoleType = buildProperty.Value;
- }
- else if ("SignAssembly".Equals(buildProperty.Name, StringComparison.OrdinalIgnoreCase))
- {
- projectDigest.SignAssembly = buildProperty.Value;
- }
- else if ("AssemblyOriginatorKeyFile".Equals(buildProperty.Name, StringComparison.OrdinalIgnoreCase))
- {
- projectDigest.AssemblyOriginatorKeyFile = buildProperty.Value;
- }
- else if ("DelaySign".Equals(buildProperty.Name, StringComparison.OrdinalIgnoreCase))
- {
- projectDigest.DelaySign = buildProperty.Value;
- }
- else if ("Optimize".Equals(buildProperty.Name, StringComparison.OrdinalIgnoreCase))
- {
- projectDigest.Optimize = buildProperty.Value;
- }
- else if ("AllowUnsafeBlocks".Equals(buildProperty.Name, StringComparison.OrdinalIgnoreCase))
- {
- projectDigest.AllowUnsafeBlocks = buildProperty.Value;
- }
- else if ("DefineConstants".Equals(buildProperty.Name, StringComparison.OrdinalIgnoreCase))
- {
- projectDigest.DefineConstants = buildProperty.Value;
- }
- else if ("ApplicationIcon".Equals(buildProperty.Name, StringComparison.OrdinalIgnoreCase))
- {
- projectDigest.ApplicationIcon = buildProperty.Value;
- }
- else if ("Win32Resource".Equals(buildProperty.Name, StringComparison.OrdinalIgnoreCase))
- {
- projectDigest.Win32Resource = buildProperty.Value;
- }
- else if ("ProjectGuid".Equals(buildProperty.Name, StringComparison.OrdinalIgnoreCase))
- {
- projectDigest.ProjectGuid = buildProperty.Value;
- }
- else if ("Configuration".Equals(buildProperty.Name, StringComparison.OrdinalIgnoreCase))
- {
- projectDigest.Configuration = buildProperty.Value;
- }
- else if ("BaseIntermediateOutputPath".Equals(buildProperty.Name, StringComparison.OrdinalIgnoreCase))
- {
- projectDigest.BaseIntermediateOutputPath = buildProperty.Value;
- }
- else if ("OutputPath".Equals(buildProperty.Name, StringComparison.OrdinalIgnoreCase))
- {
- projectDigest.OutputPath = buildProperty.Value;
- }
- else if ("TreatWarningsAsErrors".Equals(buildProperty.Name, StringComparison.OrdinalIgnoreCase))
- {
- projectDigest.TreatWarningsAsErrors = buildProperty.Value;
- }
- else if ("Platform".Equals(buildProperty.Name, StringComparison.OrdinalIgnoreCase))
- {
- projectDigest.Platform = buildProperty.Value;
- }
- else if ("ProductVersion".Equals(buildProperty.Name, StringComparison.OrdinalIgnoreCase))
+ if (!buildProperty.IsImported)
{
- projectDigest.ProductVersion = buildProperty.Value;
- }
- else if ("SchemaVersion".Equals(buildProperty.Name, StringComparison.OrdinalIgnoreCase))
- {
- projectDigest.SchemaVersion = buildProperty.Value;
- }
- else if ("TargetFrameworkVersion".Equals(buildProperty.Name, StringComparison.OrdinalIgnoreCase))
- {
- // changed the version to the more specific version
- string frameworkVersion = buildProperty.Value.Substring(1);
-
- if ("2.0".Equals(buildProperty.Value.Substring(1)))
+ if (!string.IsNullOrEmpty(buildProperty.Condition))
{
- frameworkVersion = "2.0.50727";
+ log.DebugFormat("Property {0} = {1} if {2}", buildProperty.Name, buildProperty.Value, buildProperty.Condition);
+ if (evaluateCondition(projectDigest, buildProperty.Condition))
+ {
+ processProperty(projectDigest, buildProperty);
+ }
}
-
- projectDigest.TargetFramework = frameworkVersion;
- }
- else if ("AppDesignerFolder".Equals(buildProperty.Name, StringComparison.OrdinalIgnoreCase))
- {
- projectDigest.AppDesignerFolder = buildProperty.Value;
- }
- else if ("DebugSymbols".Equals(buildProperty.Name, StringComparison.OrdinalIgnoreCase))
- {
- projectDigest.DebugSymbols = buildProperty.Value;
- }
- else if ("DebugType".Equals(buildProperty.Name, StringComparison.OrdinalIgnoreCase))
- {
- projectDigest.DebugType = buildProperty.Value;
- }
- else if ("ErrorReport".Equals(buildProperty.Name, StringComparison.OrdinalIgnoreCase))
- {
- projectDigest.ErrorReport = buildProperty.Value;
- }
- else if ("WarningLevel".Equals(buildProperty.Name, StringComparison.OrdinalIgnoreCase))
- {
- projectDigest.WarningLevel = buildProperty.Value;
- }
- else if ("DocumentationFile".Equals(buildProperty.Name, StringComparison.OrdinalIgnoreCase))
- {
- projectDigest.DocumentationFile = buildProperty.Value;
- }
- else if ("PostBuildEvent".Equals(buildProperty.Name, StringComparison.OrdinalIgnoreCase))
- {
- projectDigest.PostBuildEvent = buildProperty.Value;
- }
- else if ("PublishUrl".Equals(buildProperty.Name, StringComparison.OrdinalIgnoreCase))
- {
- projectDigest.PublishUrl = buildProperty.Value;
- }
- else if ("Install".Equals(buildProperty.Name, StringComparison.OrdinalIgnoreCase))
- {
- projectDigest.Install = buildProperty.Value;
- }
- else if ("InstallFrom".Equals(buildProperty.Name, StringComparison.OrdinalIgnoreCase))
- {
- projectDigest.InstallFrom = buildProperty.Value;
- }
- else if ("UpdateEnabled".Equals(buildProperty.Name, StringComparison.OrdinalIgnoreCase))
- {
- projectDigest.UpdateEnabled = buildProperty.Value;
- }
- else if ("UpdateMode".Equals(buildProperty.Name, StringComparison.OrdinalIgnoreCase))
- {
- projectDigest.UpdateMode = buildProperty.Value;
- }
- else if ("UpdateInterval".Equals(buildProperty.Name, StringComparison.OrdinalIgnoreCase))
- {
- projectDigest.UpdateInterval = buildProperty.Value;
- }
- else if ("UpdateIntervalUnits".Equals(buildProperty.Name, StringComparison.OrdinalIgnoreCase))
- {
- projectDigest.UpdateIntervalUnits = buildProperty.Value;
- }
- else if ("UpdatePeriodically".Equals(buildProperty.Name, StringComparison.OrdinalIgnoreCase))
- {
- projectDigest.UpdatePeriodically = buildProperty.Value;
- }
- else if ("UpdateRequired".Equals(buildProperty.Name, StringComparison.OrdinalIgnoreCase))
- {
- projectDigest.UpdateRequired = buildProperty.Value;
- }
- else if ("MapFileExtensions".Equals(buildProperty.Name, StringComparison.OrdinalIgnoreCase))
- {
- projectDigest.MapFileExtensions = buildProperty.Value;
- }
- else if ("ApplicationVersion".Equals(buildProperty.Name, StringComparison.OrdinalIgnoreCase))
- {
- projectDigest.ApplicationVersion = buildProperty.Value;
- }
- else if ("IsWebBootstrapper".Equals(buildProperty.Name, StringComparison.OrdinalIgnoreCase))
- {
- projectDigest.IsWebBootstrapper = buildProperty.Value;
- }
- else if ("BootstrapperEnabled".Equals(buildProperty.Name, StringComparison.OrdinalIgnoreCase))
- {
- projectDigest.BootstrapperEnabled = buildProperty.Value;
- }
- else if ("PreBuildEvent".Equals(buildProperty.Name, StringComparison.OrdinalIgnoreCase))
- {
- projectDigest.PreBuildEvent = buildProperty.Value;
- }
- else if ("MyType".Equals(buildProperty.Name, StringComparison.OrdinalIgnoreCase))
- {
- projectDigest.MyType = buildProperty.Value;
- }
- else if ("DefineDebug".Equals(buildProperty.Name, StringComparison.OrdinalIgnoreCase))
- {
- projectDigest.DefineDebug = buildProperty.Value;
- }
- else if ("DefineTrace".Equals(buildProperty.Name, StringComparison.OrdinalIgnoreCase))
- {
- projectDigest.DefineTrace = buildProperty.Value;
- }
- else if ("NoWarn".Equals(buildProperty.Name, StringComparison.OrdinalIgnoreCase))
- {
- projectDigest.NoWarn = buildProperty.Value;
- }
- else if ("WarningsAsErrors".Equals(buildProperty.Name, StringComparison.OrdinalIgnoreCase))
- {
- projectDigest.WarningsAsErrors = buildProperty.Value;
- }
- else if ("ProjectTypeGuids".Equals(buildProperty.Name, StringComparison.OrdinalIgnoreCase))
- {
- if (!string.IsNullOrEmpty(buildProperty.Value))
+ else
{
- projectDigest.ProjectType = VisualStudioProjectType.GetVisualStudioProjectType(buildProperty.Value);
+ log.DebugFormat("Property {0} = {1}", buildProperty.Name, buildProperty.Value);
+ processProperty(projectDigest, buildProperty);
}
}
- else
- {
- log.Debug("Unhandled Property:" + buildProperty.Name);
- }
-
}
+ }
+ }
+ }
+
+ private static bool evaluateCondition(ProjectDigest projectDigest, string condition)
+ {
+ // basic evaluation of conditions, unable to find a MSBuild API to do it - many will not be supported
+ bool val = true;
+
+ string newCond = condition.Replace("$(Configuration)", projectDigest.Configuration);
+ newCond = newCond.Replace("$(Platform)", projectDigest.Platform);
+ newCond = newCond.Replace("$(Language)", projectDigest.Language);
+
+ if (newCond.Contains("$("))
+ {
+ log.DebugFormat("Unable to evaluation condition: {0}, unrecognized expression, assuming 'true'", newCond);
+ return true;
+ }
+
+ Match match = Regex.Match(newCond, @"^\s*'(.*)'\s*(==|!=)\s*'(.*)'\s*$");
+ if (match.Success)
+ {
+ string op = match.Groups[2].Value;
+ if (op == "==")
+ {
+ val = match.Groups[1].Value == match.Groups[3].Value;
+ }
+ else if (op == "!=")
+ {
+ val = match.Groups[1].Value != match.Groups[3].Value;
+ }
+ else
+ {
+ log.WarnFormat("Unable to evaluate condition: {0}, unrecognized operator {1}, assuming 'true'", condition, op);
}
}
+ else
+ {
+ log.WarnFormat("Unable to parse condition: {0}, assuming 'true'", condition);
+ }
+
+ log.DebugFormat("Condition = {0}, Substituted = {1}, Result = {2}", condition, newCond, val);
+ return val;
}
+ private static void processProperty(ProjectDigest projectDigest, BuildProperty buildProperty)
+ {
+ if ("RootNameSpace".Equals(buildProperty.Name, StringComparison.OrdinalIgnoreCase))
+ {
+ projectDigest.RootNamespace = buildProperty.Value;
+ }
+ else if ("AssemblyName".Equals(buildProperty.Name, StringComparison.OrdinalIgnoreCase))
+ {
+ projectDigest.AssemblyName = buildProperty.Value;
+ }
+ else if ("Name".Equals(buildProperty.Name, StringComparison.OrdinalIgnoreCase))
+ {
+ projectDigest.Name = buildProperty.Value;
+ }
+ else if ("StartupObject".Equals(buildProperty.Name, StringComparison.OrdinalIgnoreCase))
+ {
+ projectDigest.StartupObject = buildProperty.Value;
+ }
+ else if ("OutputType".Equals(buildProperty.Name, StringComparison.OrdinalIgnoreCase))
+ {
+ projectDigest.OutputType = buildProperty.Value;
+ }
+ else if ("SilverlightApplication".Equals(buildProperty.Name, StringComparison.OrdinalIgnoreCase))
+ {
+ projectDigest.SilverlightApplication = bool.Parse(buildProperty.Value);
+ }
+ else if ("SilverlightApplicationList".Equals(buildProperty.Name, StringComparison.OrdinalIgnoreCase))
+ {
+ projectDigest.SilverlightApplicationList = SilverlightApplicationReference.parseApplicationList(buildProperty.Value);
+ }
+ else if ("RoleType".Equals(buildProperty.Name, StringComparison.OrdinalIgnoreCase))
+ {
+ projectDigest.RoleType = buildProperty.Value;
+ }
+ else if ("SignAssembly".Equals(buildProperty.Name, StringComparison.OrdinalIgnoreCase))
+ {
+ projectDigest.SignAssembly = buildProperty.Value;
+ }
+ else if ("AssemblyOriginatorKeyFile".Equals(buildProperty.Name, StringComparison.OrdinalIgnoreCase))
+ {
+ projectDigest.AssemblyOriginatorKeyFile = buildProperty.Value;
+ }
+ else if ("DelaySign".Equals(buildProperty.Name, StringComparison.OrdinalIgnoreCase))
+ {
+ projectDigest.DelaySign = buildProperty.Value;
+ }
+ else if ("Optimize".Equals(buildProperty.Name, StringComparison.OrdinalIgnoreCase))
+ {
+ projectDigest.Optimize = buildProperty.Value;
+ }
+ else if ("AllowUnsafeBlocks".Equals(buildProperty.Name, StringComparison.OrdinalIgnoreCase))
+ {
+ projectDigest.AllowUnsafeBlocks = buildProperty.Value;
+ }
+ else if ("DefineConstants".Equals(buildProperty.Name, StringComparison.OrdinalIgnoreCase))
+ {
+ projectDigest.DefineConstants = buildProperty.Value;
+ }
+ else if ("ApplicationIcon".Equals(buildProperty.Name, StringComparison.OrdinalIgnoreCase))
+ {
+ projectDigest.ApplicationIcon = buildProperty.Value;
+ }
+ else if ("Win32Resource".Equals(buildProperty.Name, StringComparison.OrdinalIgnoreCase))
+ {
+ projectDigest.Win32Resource = buildProperty.Value;
+ }
+ else if ("ProjectGuid".Equals(buildProperty.Name, StringComparison.OrdinalIgnoreCase))
+ {
+ projectDigest.ProjectGuid = buildProperty.Value;
+ }
+ else if ("Configuration".Equals(buildProperty.Name, StringComparison.OrdinalIgnoreCase))
+ {
+ projectDigest.Configuration = buildProperty.Value;
+ }
+ else if ("BaseIntermediateOutputPath".Equals(buildProperty.Name, StringComparison.OrdinalIgnoreCase))
+ {
+ projectDigest.BaseIntermediateOutputPath = buildProperty.Value;
+ }
+ else if ("OutputPath".Equals(buildProperty.Name, StringComparison.OrdinalIgnoreCase))
+ {
+ projectDigest.OutputPath = buildProperty.Value;
+ }
+ else if ("TreatWarningsAsErrors".Equals(buildProperty.Name, StringComparison.OrdinalIgnoreCase))
+ {
+ projectDigest.TreatWarningsAsErrors = buildProperty.Value;
+ }
+ else if ("Platform".Equals(buildProperty.Name, StringComparison.OrdinalIgnoreCase))
+ {
+ projectDigest.Platform = buildProperty.Value;
+ }
+ else if ("ProductVersion".Equals(buildProperty.Name, StringComparison.OrdinalIgnoreCase))
+ {
+ projectDigest.ProductVersion = buildProperty.Value;
+ }
+ else if ("SchemaVersion".Equals(buildProperty.Name, StringComparison.OrdinalIgnoreCase))
+ {
+ projectDigest.SchemaVersion = buildProperty.Value;
+ }
+ else if ("TargetFrameworkVersion".Equals(buildProperty.Name, StringComparison.OrdinalIgnoreCase))
+ {
+ // changed the version to the more specific version
+ string frameworkVersion = buildProperty.Value.Substring(1);
+
+ if ("2.0".Equals(buildProperty.Value.Substring(1)))
+ {
+ frameworkVersion = "2.0.50727";
+ }
+
+ projectDigest.TargetFramework = frameworkVersion;
+ }
+ else if ("AppDesignerFolder".Equals(buildProperty.Name, StringComparison.OrdinalIgnoreCase))
+ {
+ projectDigest.AppDesignerFolder = buildProperty.Value;
+ }
+ else if ("DebugSymbols".Equals(buildProperty.Name, StringComparison.OrdinalIgnoreCase))
+ {
+ projectDigest.DebugSymbols = buildProperty.Value;
+ }
+ else if ("DebugType".Equals(buildProperty.Name, StringComparison.OrdinalIgnoreCase))
+ {
+ projectDigest.DebugType = buildProperty.Value;
+ }
+ else if ("ErrorReport".Equals(buildProperty.Name, StringComparison.OrdinalIgnoreCase))
+ {
+ projectDigest.ErrorReport = buildProperty.Value;
+ }
+ else if ("WarningLevel".Equals(buildProperty.Name, StringComparison.OrdinalIgnoreCase))
+ {
+ projectDigest.WarningLevel = buildProperty.Value;
+ }
+ else if ("DocumentationFile".Equals(buildProperty.Name, StringComparison.OrdinalIgnoreCase))
+ {
+ projectDigest.DocumentationFile = buildProperty.Value;
+ }
+ else if ("PostBuildEvent".Equals(buildProperty.Name, StringComparison.OrdinalIgnoreCase))
+ {
+ projectDigest.PostBuildEvent = buildProperty.Value;
+ }
+ else if ("PublishUrl".Equals(buildProperty.Name, StringComparison.OrdinalIgnoreCase))
+ {
+ projectDigest.PublishUrl = buildProperty.Value;
+ }
+ else if ("Install".Equals(buildProperty.Name, StringComparison.OrdinalIgnoreCase))
+ {
+ projectDigest.Install = buildProperty.Value;
+ }
+ else if ("InstallFrom".Equals(buildProperty.Name, StringComparison.OrdinalIgnoreCase))
+ {
+ projectDigest.InstallFrom = buildProperty.Value;
+ }
+ else if ("UpdateEnabled".Equals(buildProperty.Name, StringComparison.OrdinalIgnoreCase))
+ {
+ projectDigest.UpdateEnabled = buildProperty.Value;
+ }
+ else if ("UpdateMode".Equals(buildProperty.Name, StringComparison.OrdinalIgnoreCase))
+ {
+ projectDigest.UpdateMode = buildProperty.Value;
+ }
+ else if ("UpdateInterval".Equals(buildProperty.Name, StringComparison.OrdinalIgnoreCase))
+ {
+ projectDigest.UpdateInterval = buildProperty.Value;
+ }
+ else if ("UpdateIntervalUnits".Equals(buildProperty.Name, StringComparison.OrdinalIgnoreCase))
+ {
+ projectDigest.UpdateIntervalUnits = buildProperty.Value;
+ }
+ else if ("UpdatePeriodically".Equals(buildProperty.Name, StringComparison.OrdinalIgnoreCase))
+ {
+ projectDigest.UpdatePeriodically = buildProperty.Value;
+ }
+ else if ("UpdateRequired".Equals(buildProperty.Name, StringComparison.OrdinalIgnoreCase))
+ {
+ projectDigest.UpdateRequired = buildProperty.Value;
+ }
+ else if ("MapFileExtensions".Equals(buildProperty.Name, StringComparison.OrdinalIgnoreCase))
+ {
+ projectDigest.MapFileExtensions = buildProperty.Value;
+ }
+ else if ("ApplicationVersion".Equals(buildProperty.Name, StringComparison.OrdinalIgnoreCase))
+ {
+ projectDigest.ApplicationVersion = buildProperty.Value;
+ }
+ else if ("IsWebBootstrapper".Equals(buildProperty.Name, StringComparison.OrdinalIgnoreCase))
+ {
+ projectDigest.IsWebBootstrapper = buildProperty.Value;
+ }
+ else if ("BootstrapperEnabled".Equals(buildProperty.Name, StringComparison.OrdinalIgnoreCase))
+ {
+ projectDigest.BootstrapperEnabled = buildProperty.Value;
+ }
+ else if ("PreBuildEvent".Equals(buildProperty.Name, StringComparison.OrdinalIgnoreCase))
+ {
+ projectDigest.PreBuildEvent = buildProperty.Value;
+ }
+ else if ("MyType".Equals(buildProperty.Name, StringComparison.OrdinalIgnoreCase))
+ {
+ projectDigest.MyType = buildProperty.Value;
+ }
+ else if ("DefineDebug".Equals(buildProperty.Name, StringComparison.OrdinalIgnoreCase))
+ {
+ projectDigest.DefineDebug = buildProperty.Value;
+ }
+ else if ("DefineTrace".Equals(buildProperty.Name, StringComparison.OrdinalIgnoreCase))
+ {
+ projectDigest.DefineTrace = buildProperty.Value;
+ }
+ else if ("NoWarn".Equals(buildProperty.Name, StringComparison.OrdinalIgnoreCase))
+ {
+ projectDigest.NoWarn = buildProperty.Value;
+ }
+ else if ("WarningsAsErrors".Equals(buildProperty.Name, StringComparison.OrdinalIgnoreCase))
+ {
+ projectDigest.WarningsAsErrors = buildProperty.Value;
+ }
+ else if ("ProjectTypeGuids".Equals(buildProperty.Name, StringComparison.OrdinalIgnoreCase))
+ {
+ if (!string.IsNullOrEmpty(buildProperty.Value))
+ {
+ projectDigest.ProjectType = VisualStudioProjectType.GetVisualStudioProjectType(buildProperty.Value);
+ }
+ }
+ else
+ {
+ log.Debug("Unhandled Property:" + buildProperty.Name);
+ }
+ }
}
}
Modified: incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Digest/Algorithms/WebProjectDigestAlgorithm.cs
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Digest/Algorithms/WebProjectDigestAlgorithm.cs?rev=1302871&r1=1302870&r2=1302871&view=diff
==============================================================================
--- incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Digest/Algorithms/WebProjectDigestAlgorithm.cs (original)
+++ incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Digest/Algorithms/WebProjectDigestAlgorithm.cs Tue Mar 20 13:09:26 2012
@@ -46,6 +46,8 @@ namespace NPanday.ProjectImporter.Digest
projectDigest.FullDirectoryName = projectDigest.FullFileName;
if (projectMap.ContainsKey("TargetFramework"))
projectDigest.TargetFramework = projectMap["TargetFramework"].ToString();
+ if (projectMap.ContainsKey("Configuration"))
+ projectDigest.Configuration = projectMap["Configuration"].ToString();
FileInfo existingPomFile = new FileInfo(Path.Combine(projectDigest.FullDirectoryName, "pom.xml"));
if(existingPomFile.Exists)
Modified: incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Digest/Model/ProjectDigest.cs
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Digest/Model/ProjectDigest.cs?rev=1302871&r1=1302870&r2=1302871&view=diff
==============================================================================
--- incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Digest/Model/ProjectDigest.cs (original)
+++ incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Digest/Model/ProjectDigest.cs Tue Mar 20 13:09:26 2012
@@ -574,13 +574,6 @@ namespace NPanday.ProjectImporter.Digest
set { useMsDeploy = value; }
}
- private string webConfig;
- public string WebConfig
- {
- get { return webConfig; }
- set { webConfig = value; }
- }
-
private string cloudConfig;
public string CloudConfig
{
Modified: incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Digest/ProjectDigester.cs
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Digest/ProjectDigester.cs?rev=1302871&r1=1302870&r2=1302871&view=diff
==============================================================================
--- incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Digest/ProjectDigester.cs (original)
+++ incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Digest/ProjectDigester.cs Tue Mar 20 13:09:26 2012
@@ -94,6 +94,8 @@ namespace NPanday.ProjectImporter.Digest
throw new Exception("Projects with duplicated assembly names are not supported: " + projDigest.ProjectName);
}
+ log.DebugFormat("Digested project Name = {0}, GUID = {1}", projDigest.ProjectName, projDigest.ProjectGuid);
+
projDigestDictionary.Add(projDigest.ProjectName, projDigest);
projDigestGuidDictionary.Add(projDigest.ProjectGuid, projDigest);
}
Modified: incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/NPandayImporter.cs
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/NPandayImporter.cs?rev=1302871&r1=1302870&r2=1302871&view=diff
==============================================================================
--- incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/NPandayImporter.cs (original)
+++ incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/NPandayImporter.cs Tue Mar 20 13:09:26 2012
@@ -121,10 +121,10 @@ namespace NPanday.ProjectImporter
return ImportProject(solutionFile, groupId, artifactId, version, scmTag, verifyTests, useMsDeploy, null, null, ref warningMsg);
}
- public static string[] ImportProject(string solutionFile, string groupId, string artifactId, string version, string scmTag, bool verifyTests, bool useMsDeploy, string webConfig, string cloudConfig, ref string warningMsg)
+ public static string[] ImportProject(string solutionFile, string groupId, string artifactId, string version, string scmTag, bool verifyTests, bool useMsDeploy, string configuration, string cloudConfig, ref string warningMsg)
{
VerifyProjectToImport method = verifyTests ? VerifyUnitTestsToUser.VerifyTests : (VerifyProjectToImport)null;
- return ImportProject(solutionFile, groupId, artifactId, version, scmTag, method, useMsDeploy, webConfig, cloudConfig, ref warningMsg);
+ return ImportProject(solutionFile, groupId, artifactId, version, scmTag, method, useMsDeploy, configuration, cloudConfig, ref warningMsg);
}
/// <summary>
@@ -184,7 +184,7 @@ namespace NPanday.ProjectImporter
/// <param name="verifyProjectToImport">A delegate That will Accept a method for verifying Projects To Import</param>
/// <param name="scmTag">adds scm tags to parent pom.xml if not string.empty or null</param>
/// <returns>An array of generated pom.xml filenames</returns>
- public static string[] ImportProject(string solutionFile, string groupId, string artifactId, string version, string scmTag, VerifyProjectToImport verifyProjectToImport, bool useMsDeploy, string webConfig, string cloudConfig, ref string warningMsg)
+ public static string[] ImportProject(string solutionFile, string groupId, string artifactId, string version, string scmTag, VerifyProjectToImport verifyProjectToImport, bool useMsDeploy, string configuration, string cloudConfig, ref string warningMsg)
{
string[] result = null;
@@ -192,6 +192,14 @@ namespace NPanday.ProjectImporter
List<Dictionary<string, object>> list = ParseSolution(solutionFileInfo, ref warningMsg);
+ if (configuration != null)
+ {
+ foreach (Dictionary<string, object> projectMap in list)
+ {
+ projectMap.Add("Configuration", configuration);
+ }
+ }
+
//Checks for Invalid folder structure
HasValidFolderStructure(list);
@@ -213,7 +221,6 @@ namespace NPanday.ProjectImporter
// set the project flag so that converters can look at it later
pDigest.UseMsDeploy = useMsDeploy;
pDigest.CloudConfig = cloudConfig;
- pDigest.WebConfig = webConfig;
filteredPrjDigests.Add(pDigest);
}
else
@@ -294,12 +301,6 @@ namespace NPanday.ProjectImporter
return ProjectDigester.DigestProjects(projects, ref warningMsg);
}
-
-
-
-
-
-
/// <summary>
/// Facade for Getting the Project Type.
/// calls NPanday.ProjectImporter.Validator.ProjectValidator.GetProjectStructureType(...)
Modified: incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/AbstractProjectImportTest.cs
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/AbstractProjectImportTest.cs?rev=1302871&r1=1302870&r2=1302871&view=diff
==============================================================================
--- incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/AbstractProjectImportTest.cs (original)
+++ incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/AbstractProjectImportTest.cs Tue Mar 20 13:09:26 2012
@@ -50,6 +50,16 @@ namespace NPanday.ProjectImporter.Import
get { return false; }
}
+ public virtual string SelectedConfiguration
+ {
+ get { return null; }
+ }
+
+ public virtual string CloudConfiguration
+ {
+ get { return null; }
+ }
+
[Test]
[TestFixtureSetUp]
public void ShouldBeAbleImportProject()
@@ -66,7 +76,7 @@ namespace NPanday.ProjectImporter.Import
try
{
string warnMsg = string.Empty;
- generatedPomFiles = NPandayImporter.ImportProject(solutionFile, "test.group", "test-parent", "1.2.3-SNAPSHOT", string.Empty, false, UseMsDeploy, ref warnMsg);
+ generatedPomFiles = NPandayImporter.ImportProject(solutionFile, "test.group", "test-parent", "1.2.3-SNAPSHOT", string.Empty, false, UseMsDeploy, SelectedConfiguration, CloudConfiguration, ref warnMsg);
}
catch (Exception e)
Modified: incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/ComReferenceNormalProjectTest.cs
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/ComReferenceNormalProjectTest.cs?rev=1302871&r1=1302870&r2=1302871&view=diff
==============================================================================
--- incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/ComReferenceNormalProjectTest.cs (original)
+++ incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/ComReferenceNormalProjectTest.cs Tue Mar 20 13:09:26 2012
@@ -32,6 +32,15 @@ namespace NPanday.ProjectImporter.Import
get { return @"Shell32Example\Shell32Example.sln"; }
}
+ public override string SelectedConfiguration
+ {
+ // Test a release configuration
+ get
+ {
+ return "Release";
+ }
+ }
+
[Test]
public override void ShouldGenerateTheExpectedNumberOfPoms()
{
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=1302871&r1=1302870&r2=1302871&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 Tue Mar 20 13:09:26 2012
@@ -26,6 +26,7 @@
<artifactId>maven-compile-plugin</artifactId>
<extensions>true</extensions>
<configuration>
+ <define>DEBUG;TRACE</define>
<includeSources>
<includeSource>Form1.cs</includeSource>
<includeSource>Form1.Designer.cs</includeSource>
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=1302871&r1=1302870&r2=1302871&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 Tue Mar 20 13:09:26 2012
@@ -18,6 +18,7 @@
<artifactId>maven-compile-plugin</artifactId>
<extensions>true</extensions>
<configuration>
+ <define>DEBUG;TRACE</define>
<includeSources>
<includeSource>Program.cs</includeSource>
<includeSource>Properties\AssemblyInfo.cs</includeSource>
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=1302871&r1=1302870&r2=1302871&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 Tue Mar 20 13:09:26 2012
@@ -18,6 +18,7 @@
<artifactId>maven-compile-plugin</artifactId>
<extensions>true</extensions>
<configuration>
+ <define>DEBUG;TRACE</define>
<includeSources>
<includeSource>Items.cs</includeSource>
<includeSource>Properties\AssemblyInfo.cs</includeSource>
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=1302871&r1=1302870&r2=1302871&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 Tue Mar 20 13:09:26 2012
@@ -19,6 +19,7 @@
<extensions>true</extensions>
<configuration>
<frameworkVersion>4.0</frameworkVersion>
+ <define>DEBUG;TRACE</define>
<includeSources>
<includeSource>Global.asax.cs</includeSource>
<includeSource>Properties\AssemblyInfo.cs</includeSource>
@@ -39,6 +40,7 @@
</executions>
<configuration>
<frameworkVersion>4.0</frameworkVersion>
+ <transformationHint>Debug</transformationHint>
</configuration>
</plugin>
<plugin>
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=1302871&r1=1302870&r2=1302871&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 Tue Mar 20 13:09:26 2012
@@ -19,6 +19,7 @@
<extensions>true</extensions>
<configuration>
<frameworkVersion>4.0</frameworkVersion>
+ <define>DEBUG;TRACE</define>
<includeSources>
<includeSource>Class1.cs</includeSource>
<includeSource>Properties\AssemblyInfo.cs</includeSource>
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=1302871&r1=1302870&r2=1302871&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 Tue Mar 20 13:09:26 2012
@@ -19,6 +19,7 @@
<extensions>true</extensions>
<configuration>
<frameworkVersion>4.0</frameworkVersion>
+ <define>DEBUG;TRACE</define>
<includeSources>
<includeSource>Default.aspx.cs</includeSource>
<includeSource>Default.aspx.designer.cs</includeSource>
@@ -39,6 +40,7 @@
</executions>
<configuration>
<frameworkVersion>4.0</frameworkVersion>
+ <transformationHint>Debug</transformationHint>
</configuration>
</plugin>
<plugin>
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=1302871&r1=1302870&r2=1302871&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 Tue Mar 20 13:09:26 2012
@@ -19,6 +19,7 @@
<extensions>true</extensions>
<configuration>
<frameworkVersion>4.0</frameworkVersion>
+ <define>DEBUG;TRACE</define>
<includeSources>
<includeSource>Default.aspx.cs</includeSource>
<includeSource>Default.aspx.designer.cs</includeSource>
@@ -39,6 +40,7 @@
</executions>
<configuration>
<frameworkVersion>4.0</frameworkVersion>
+ <transformationHint>Debug</transformationHint>
</configuration>
</plugin>
<plugin>
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=1302871&r1=1302870&r2=1302871&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 Tue Mar 20 13:09:26 2012
@@ -19,6 +19,7 @@
<extensions>true</extensions>
<configuration>
<frameworkVersion>4.0</frameworkVersion>
+ <define>DEBUG;TRACE</define>
<includeSources>
<includeSource>Properties\AssemblyInfo.cs</includeSource>
<includeSource>WorkerRole.cs</includeSource>
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=1302871&r1=1302870&r2=1302871&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 Tue Mar 20 13:09:26 2012
@@ -19,6 +19,7 @@
<extensions>true</extensions>
<configuration>
<frameworkVersion>4.0</frameworkVersion>
+ <define>DEBUG;TRACE</define>
<includeSources>
<includeSource>Properties\AssemblyInfo.cs</includeSource>
<includeSource>WorkerRole.cs</includeSource>
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=1302871&r1=1302870&r2=1302871&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 Tue Mar 20 13:09:26 2012
@@ -19,6 +19,7 @@
<extensions>true</extensions>
<configuration>
<frameworkVersion>4.0</frameworkVersion>
+ <define>DEBUG;TRACE</define>
<includeSources>
<includeSource>Default.aspx.cs</includeSource>
<includeSource>Default.aspx.designer.cs</includeSource>
@@ -39,6 +40,7 @@
</executions>
<configuration>
<frameworkVersion>4.0</frameworkVersion>
+ <transformationHint>Debug</transformationHint>
</configuration>
</plugin>
<plugin>
Modified: incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/NPANDAY_537_WindowsExecutableTest/WindowsFormsApplication1/pom.test
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/NPANDAY_537_WindowsExecutableTest/WindowsFormsApplication1/pom.test?rev=1302871&r1=1302870&r2=1302871&view=diff
==============================================================================
--- incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/NPANDAY_537_WindowsExecutableTest/WindowsFormsApplication1/pom.test (original)
+++ incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/NPANDAY_537_WindowsExecutableTest/WindowsFormsApplication1/pom.test Tue Mar 20 13:09:26 2012
@@ -19,6 +19,7 @@
<extensions>true</extensions>
<configuration>
<frameworkVersion>4.0</frameworkVersion>
+ <define>DEBUG;TRACE</define>
<includeSources>
<includeSource>Form1.cs</includeSource>
<includeSource>Form1.Designer.cs</includeSource>
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=1302871&r1=1302870&r2=1302871&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 Tue Mar 20 13:09:26 2012
@@ -18,6 +18,7 @@
<artifactId>maven-compile-plugin</artifactId>
<extensions>true</extensions>
<configuration>
+ <define>TRACE</define>
<includeSources>
<includeSource>Form1.cs</includeSource>
<includeSource>Form1.Designer.cs</includeSource>
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=1302871&r1=1302870&r2=1302871&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 Tue Mar 20 13:09:26 2012
@@ -19,6 +19,7 @@
<extensions>true</extensions>
<configuration>
<frameworkVersion>4.0</frameworkVersion>
+ <define>DEBUG;TRACE</define>
<includeSources>
<includeSource>Properties\AssemblyInfo.cs</includeSource>
</includeSources>
@@ -38,6 +39,7 @@
</executions>
<configuration>
<frameworkVersion>4.0</frameworkVersion>
+ <transformationHint>Debug</transformationHint>
</configuration>
</plugin>
<plugin>
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=1302871&r1=1302870&r2=1302871&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 Tue Mar 20 13:09:26 2012
@@ -19,6 +19,7 @@
<extensions>true</extensions>
<configuration>
<frameworkVersion>4.0</frameworkVersion>
+ <define>DEBUG;TRACE</define>
<includeSources>
<includeSource>Properties\AssemblyInfo.cs</includeSource>
</includeSources>
@@ -38,6 +39,7 @@
</executions>
<configuration>
<frameworkVersion>4.0</frameworkVersion>
+ <transformationHint>Debug</transformationHint>
</configuration>
</plugin>
<plugin>
@@ -77,4 +79,4 @@
<classifier>31bf3856ad364e35</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=1302871&r1=1302870&r2=1302871&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 Tue Mar 20 13:09:26 2012
@@ -18,6 +18,7 @@
<artifactId>maven-compile-plugin</artifactId>
<extensions>true</extensions>
<configuration>
+ <define>DEBUG;TRACE</define>
<includeSources>
<includeSource>Form1.cs</includeSource>
<includeSource>Form1.Designer.cs</includeSource>
Modified: incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/WebSiteWithCSProj/WebApplication1/pom.test
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/WebSiteWithCSProj/WebApplication1/pom.test?rev=1302871&r1=1302870&r2=1302871&view=diff
==============================================================================
--- incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/WebSiteWithCSProj/WebApplication1/pom.test (original)
+++ incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/WebSiteWithCSProj/WebApplication1/pom.test Tue Mar 20 13:09:26 2012
@@ -18,6 +18,7 @@
<artifactId>maven-compile-plugin</artifactId>
<extensions>true</extensions>
<configuration>
+ <define>DEBUG;TRACE</define>
<includeSources>
<includeSource>Default.aspx.cs</includeSource>
<includeSource>Default.aspx.designer.cs</includeSource>
Modified: incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/WpfApplication1/WpfApplication1/pom.test
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/WpfApplication1/WpfApplication1/pom.test?rev=1302871&r1=1302870&r2=1302871&view=diff
==============================================================================
--- incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/WpfApplication1/WpfApplication1/pom.test (original)
+++ incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/WpfApplication1/WpfApplication1/pom.test Tue Mar 20 13:09:26 2012
@@ -19,6 +19,7 @@
<extensions>true</extensions>
<configuration>
<frameworkVersion>4.0</frameworkVersion>
+ <define>DEBUG;TRACE</define>
<includeSources>
<includeSource>App.xaml.cs</includeSource>
<includeSource>obj\x86\Debug\App.g.cs</includeSource>
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=1302871&r1=1302870&r2=1302871&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 Tue Mar 20 13:09:26 2012
@@ -14,6 +14,7 @@
<artifactId>maven-compile-plugin</artifactId>
<extensions>true</extensions>
<configuration>
+ <define>DEBUG;TRACE</define>
<includeSources>
<includeSource>Class1.cs</includeSource>
<includeSource>Properties\AssemblyInfo.cs</includeSource>
Modified: incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/main/csharp/NPandayImportProjectForm.Designer.cs
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/main/csharp/NPandayImportProjectForm.Designer.cs?rev=1302871&r1=1302870&r2=1302871&view=diff
==============================================================================
--- incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/main/csharp/NPandayImportProjectForm.Designer.cs (original)
+++ incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/main/csharp/NPandayImportProjectForm.Designer.cs Tue Mar 20 13:09:26 2012
@@ -62,7 +62,7 @@ namespace NPanday.VisualStudio.Addin
this.useMsDeployCheckBox = new System.Windows.Forms.CheckBox();
this.label3 = new System.Windows.Forms.Label();
this.label4 = new System.Windows.Forms.Label();
- this.webConfigComboBox = new System.Windows.Forms.ComboBox();
+ this.configComboBox = new System.Windows.Forms.ComboBox();
this.cloudConfigComboBox = new System.Windows.Forms.ComboBox();
this.SuspendLayout();
//
@@ -188,9 +188,10 @@ namespace NPanday.VisualStudio.Addin
this.label3.AutoSize = true;
this.label3.Location = new System.Drawing.Point(10, 145);
this.label3.Name = "label3";
- this.label3.Size = new System.Drawing.Size(97, 13);
+ this.label3.Size = new System.Drawing.Size(72, 13);
this.label3.TabIndex = 17;
- this.label3.Text = "Web configuration:";
+ this.label3.Text = "Configuration:";
+ this.label3.Click += new System.EventHandler(this.label3_Click);
//
// label4
//
@@ -201,14 +202,14 @@ namespace NPanday.VisualStudio.Addin
this.label4.TabIndex = 18;
this.label4.Text = "Cloud configuration:";
//
- // webConfigComboBox
+ // configComboBox
//
- this.webConfigComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
- this.webConfigComboBox.FormattingEnabled = true;
- this.webConfigComboBox.Location = new System.Drawing.Point(119, 142);
- this.webConfigComboBox.Name = "webConfigComboBox";
- this.webConfigComboBox.Size = new System.Drawing.Size(171, 21);
- this.webConfigComboBox.TabIndex = 19;
+ this.configComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+ this.configComboBox.FormattingEnabled = true;
+ this.configComboBox.Location = new System.Drawing.Point(119, 142);
+ this.configComboBox.Name = "configComboBox";
+ this.configComboBox.Size = new System.Drawing.Size(171, 21);
+ this.configComboBox.TabIndex = 19;
//
// cloudConfigComboBox
//
@@ -226,7 +227,7 @@ namespace NPanday.VisualStudio.Addin
this.ClientSize = new System.Drawing.Size(526, 280);
this.ControlBox = false;
this.Controls.Add(this.cloudConfigComboBox);
- this.Controls.Add(this.webConfigComboBox);
+ this.Controls.Add(this.configComboBox);
this.Controls.Add(this.label4);
this.Controls.Add(this.label3);
this.Controls.Add(this.useMsDeployCheckBox);
@@ -267,7 +268,7 @@ namespace NPanday.VisualStudio.Addin
private System.Windows.Forms.CheckBox useMsDeployCheckBox;
private System.Windows.Forms.Label label3;
private System.Windows.Forms.Label label4;
- private System.Windows.Forms.ComboBox webConfigComboBox;
+ private System.Windows.Forms.ComboBox configComboBox;
private System.Windows.Forms.ComboBox cloudConfigComboBox;
}
}
Modified: incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/main/csharp/NPandayImportProjectForm.cs
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/main/csharp/NPandayImportProjectForm.cs?rev=1302871&r1=1302870&r2=1302871&view=diff
==============================================================================
--- incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/main/csharp/NPandayImportProjectForm.cs (original)
+++ incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/main/csharp/NPandayImportProjectForm.cs Tue Mar 20 13:09:26 2012
@@ -117,7 +117,7 @@ namespace NPanday.VisualStudio.Addin
List<string> cloudConfigurations = new List<string>();
// these could be per project, but assume they match up for now
- List<string> webConfigurations = new List<string>();
+ List<string> availableConfigurations = new List<string>();
bool hasWebProjects = false, hasCloudProjects = false;
Solution2 solution = (Solution2)applicationObject.Solution;
@@ -127,18 +127,19 @@ namespace NPanday.VisualStudio.Addin
bool web = isWebProject(project);
bool cloud = isCloudProject(project);
- if (web)
+ foreach (object c in ((object[])project.ConfigurationManager.ConfigurationRowNames))
{
- hasWebProjects = true;
- foreach (object c in ((object[])project.ConfigurationManager.ConfigurationRowNames))
+ string configuration = (string)c;
+ if (!availableConfigurations.Contains(configuration))
{
- string configuration = (string) c;
- if (!webConfigurations.Contains(configuration))
- {
- webConfigurations.Add(configuration);
- }
+ availableConfigurations.Add(configuration);
}
}
+
+ if (web)
+ {
+ hasWebProjects = true;
+ }
if (cloud)
{
hasCloudProjects = true;
@@ -165,13 +166,12 @@ namespace NPanday.VisualStudio.Addin
cloudConfigComboBox.Items.Add("(Default)");
cloudConfigComboBox.Items.AddRange(cloudConfigurations.ToArray());
cloudConfigComboBox.SelectedItem = "(Default)";
- webConfigComboBox.Enabled = hasWebProjects && webConfigurations.Count > 0;
- webConfigComboBox.Items.Add("(Default)");
- webConfigComboBox.Items.AddRange(webConfigurations.ToArray());
- webConfigComboBox.SelectedItem = "(Default)";
+ configComboBox.Enabled = availableConfigurations.Count > 0;
+ configComboBox.Items.Add("(Default)");
+ configComboBox.Items.AddRange(availableConfigurations.ToArray());
+ configComboBox.SelectedItem = "(Default)";
- if (hasWebProjects)
- log.Debug("Web configurations: " + string.Join(", ", webConfigurations.ToArray()));
+ log.Debug("Configurations: " + string.Join(", ", availableConfigurations.ToArray()));
if (hasCloudProjects)
log.Debug("Cloud configuration files: " + string.Join(", ", cloudConfigurations.ToArray()));
}
@@ -238,10 +238,10 @@ namespace NPanday.VisualStudio.Addin
private void btnGenerate_Click(object sender, EventArgs e)
{
- string webConfig = null;
- if (webConfigComboBox.SelectedItem != "(Default)")
+ string configuration = null;
+ if (configComboBox.SelectedItem != "(Default)")
{
- webConfig = (string) webConfigComboBox.SelectedItem;
+ configuration = (string) configComboBox.SelectedItem;
}
string cloudConfig = null;
@@ -253,7 +253,7 @@ namespace NPanday.VisualStudio.Addin
//Refactored code for easier Unit Testing
try
{
- GeneratePom(txtBrowseDotNetSolutionFile.Text, txtGroupId.Text.Trim(), txtVersion.Text.Trim(), txtSCMTag.Text, useMsDeployCheckBox.Checked, webConfig, cloudConfig);
+ GeneratePom(txtBrowseDotNetSolutionFile.Text, txtGroupId.Text.Trim(), txtVersion.Text.Trim(), txtSCMTag.Text, useMsDeployCheckBox.Checked, configuration, cloudConfig);
}
catch (Exception exception)
{
@@ -267,7 +267,7 @@ namespace NPanday.VisualStudio.Addin
GeneratePom(solutionFile, groupId, version, scmTag, useMsDeploy, null, null);
}
- protected void GeneratePom(String solutionFile, String groupId, String version, String scmTag, bool useMsDeploy, string webConfig, string cloudConfig)
+ protected void GeneratePom(String solutionFile, String groupId, String version, String scmTag, bool useMsDeploy, string configuration, string cloudConfig)
{
string warningMsg = string.Empty;
String mavenVerRegex = "^[0-9]+(" + Regex.Escape(".") + "?[0-9]+){0,3}$";
@@ -351,7 +351,7 @@ namespace NPanday.VisualStudio.Addin
validateSolutionStructure();
resyncAllArtifacts();
// TODO: nicer to have some sort of structure / flags for the Msdeploy bit, or this dialog will get out of control over time - perhaps a "project configuration" dialog can replace the test popup
- string[] generatedPoms = ProjectImporter.NPandayImporter.ImportProject(file.FullName, groupId, artifactId, version, scmTag, true, useMsDeploy, webConfig, cloudConfig, ref warningMsg);
+ string[] generatedPoms = ProjectImporter.NPandayImporter.ImportProject(file.FullName, groupId, artifactId, version, scmTag, true, useMsDeploy, configuration, cloudConfig, ref warningMsg);
string str = string.Format("NPanday Import Project has Successfully Generated Pom Files!\n");
foreach (string pom in generatedPoms)
@@ -552,10 +552,5 @@ namespace NPanday.VisualStudio.Addin
// TODO: better location for utility
return Connect.IsFolder(project);
}
-
- private void useMsDeployCheckBox_CheckedChanged(object sender, EventArgs e)
- {
- webConfigComboBox.Enabled = useMsDeployCheckBox.Enabled;
- }
}
}