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 2013/03/02 01:08:31 UTC
svn commit: r1451802 - in
/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src:
main/csharp/Converter/Algorithms/AbstractPomConverter.cs
test/csharp/ImporterTests/ProjectImporterTestFixture.cs
Author: brett
Date: Sat Mar 2 01:08:31 2013
New Revision: 1451802
URL: http://svn.apache.org/r1451802
Log:
improve logging of resolution process
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Converter/Algorithms/AbstractPomConverter.cs
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/ProjectImporterTestFixture.cs
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=1451802&r1=1451801&r2=1451802&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 Sat Mar 2 01:08:31 2013
@@ -771,6 +771,9 @@ namespace NPanday.ProjectImporter.Conver
if (refDependency == null)
refDependency = ResolveDependencyFromGAC(reference);
+ if (refDependency == null)
+ log.DebugFormat("Unable to resolve {0}", reference.Name);
+
return refDependency;
}
@@ -779,6 +782,9 @@ namespace NPanday.ProjectImporter.Conver
Artifact.Artifact artifact = GetArtifact(reference);
if (artifact != null)
{
+ log.DebugFormat("Resolved {0} from local repository: {1}:{2}:{3}",
+ reference.Name, artifact.GroupId, artifact.ArtifactId, artifact.Version);
+
Dependency dependency = new Dependency();
dependency.artifactId = artifact.ArtifactId;
dependency.groupId = artifact.GroupId;
@@ -789,6 +795,19 @@ namespace NPanday.ProjectImporter.Conver
return null;
}
+ private void WarnNonPortableReference(string path)
+ {
+ log.WarnFormat("Adding non-portable reference to POM: {0}", path);
+
+ // TODO: need to show this to the user (logging not sufficient), but should not display message box in importer code. Pass in a handler instead?
+ MessageBox.Show(
+ string.Format("Warning: Build may not be portable if local references are used, Reference is not in Maven Repository or in GAC."
+ + "\nReference: {0}"
+ + "\nDeploying the reference to a Repository, will make the code portable to other machines",
+ path
+ ), "Add Reference", MessageBoxButtons.OK, MessageBoxIcon.Warning);
+ }
+
private Dependency ResolveDependencyFromHintPath(Reference reference)
{
if (!string.IsNullOrEmpty(reference.HintFullPath) && new FileInfo(reference.HintFullPath).Exists)
@@ -797,13 +816,7 @@ namespace NPanday.ProjectImporter.Conver
//verbose for new-import
if (!reference.HintFullPath.ToLower().StartsWith(prjRefPath.ToLower()) && !reference.Name.Contains("Interop"))
{
- // TODO: need to show this to the user (logging not sufficient), but should not display message box in importer code. Pass in a handler instead?
- MessageBox.Show(
- string.Format("Warning: Build may not be portable if local references are used, Reference is not in Maven Repository or in GAC."
- + "\nReference: {0}"
- + "\nDeploying the reference to a Repository, will make the code portable to other machines",
- reference.HintFullPath
- ), "Add Reference", MessageBoxButtons.OK, MessageBoxIcon.Warning);
+ WarnNonPortableReference(reference.HintFullPath);
Dependency refDependency = new Dependency();
refDependency.artifactId = reference.Name;
@@ -832,6 +845,10 @@ namespace NPanday.ProjectImporter.Conver
refDependency.groupId = pathTokens[pathTokens.Length - 3];
refDependency.version = pathTokens[pathTokens.Length-2].Replace(reference.Name+"-","") ?? "1.0.0.0";
refDependency.type = "dotnet-library";
+
+ log.DebugFormat("Resolved {0} from previously resolved references: {1}:{2}:{3}",
+ reference.Name, refDependency.groupId, refDependency.artifactId, refDependency.version);
+
return refDependency;
}
}
@@ -882,6 +899,9 @@ namespace NPanday.ProjectImporter.Conver
}
}
+ log.DebugFormat("Resolved {0} from GAC: {1}:{2}:{3}:{4}",
+ reference.Name, refDependency.groupId, refDependency.artifactId, refDependency.version, refDependency.classifier);
+
return refDependency;
}
Modified: incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/ProjectImporterTestFixture.cs
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/ProjectImporterTestFixture.cs?rev=1451802&r1=1451801&r2=1451802&view=diff
==============================================================================
--- incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/ProjectImporterTestFixture.cs (original)
+++ incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/csharp/ImporterTests/ProjectImporterTestFixture.cs Sat Mar 2 01:08:31 2013
@@ -22,6 +22,7 @@ using System.Text;
using System.IO;
using NUnit.Framework;
using log4net.Config;
+using log4net;
/// Author: Leopoldo Lee Agdeppa III
@@ -67,6 +68,7 @@ namespace NPanday.ProjectImporter.Import
public void FinalizationProcess()
{
// just incase we need to finilize after running some tests
+ LogManager.Shutdown();
}
}