You are viewing a plain text version of this content. The canonical link for it is here.
Posted to npanday-commits@incubator.apache.org by br...@apache.org on 2012/01/13 11:07:57 UTC
svn commit: r1230998 - in /incubator/npanday/trunk/dotnet/assemblies:
NPanday.ProjectImporter/Engine/src/main/csharp/Converter/Algorithms/
NPanday.ProjectImporter/Engine/src/main/csharp/Digest/Algorithms/
NPanday.Utils/src/main/csharp/ NPanday.VisualSt...
Author: brett
Date: Fri Jan 13 11:07:57 2012
New Revision: 1230998
URL: http://svn.apache.org/viewvc?rev=1230998&view=rev
Log:
[NPANDAY-532] replace Console.WriteLine calls with logging calls
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/main/csharp/Converter/Algorithms/AzurePomConverter.cs
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Digest/Algorithms/NormalProjectDigestAlgorithm.cs
incubator/npanday/trunk/dotnet/assemblies/NPanday.Utils/src/main/csharp/GacUtility.cs
incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/main/csharp/Connect.cs
incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/main/csharp/ReferenceManager.cs
incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/main/csharp/WebServicesReferenceWatcher.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=1230998&r1=1230997&r2=1230998&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 Fri Jan 13 11:07:57 2012
@@ -20,18 +20,14 @@
#endregion
using System;
using System.Collections.Generic;
-using System.Text;
-using System.Xml;
using System.IO;
-
-
-using NPanday.ProjectImporter.Digest;
+using System.Windows.Forms;
+using System.Xml;
+using log4net;
+using NPanday.Artifact;
+using NPanday.Model.Pom;
using NPanday.ProjectImporter.Digest.Model;
using NPanday.Utils;
-using NPanday.Model.Pom;
-
-using NPanday.Artifact;
-using System.Windows.Forms;
/// Author: Leopoldo Lee Agdeppa III
@@ -39,6 +35,8 @@ namespace NPanday.ProjectImporter.Conver
{
public abstract class AbstractPomConverter : IPomConverter
{
+ private static readonly ILog log = LogManager.GetLogger(typeof(AbstractPomConverter));
+
public static Dictionary<string, string> npandayTypeMap = new Dictionary<string, string>();
static AbstractPomConverter()
{
Modified: incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Converter/Algorithms/AzurePomConverter.cs
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Converter/Algorithms/AzurePomConverter.cs?rev=1230998&r1=1230997&r2=1230998&view=diff
==============================================================================
--- incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Converter/Algorithms/AzurePomConverter.cs (original)
+++ incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Converter/Algorithms/AzurePomConverter.cs Fri Jan 13 11:07:57 2012
@@ -19,8 +19,8 @@
//
#endregion
using System;
-using System.Collections.Generic;
using System.IO;
+using log4net;
using NPanday.Model.Pom;
using NPanday.ProjectImporter.Digest.Model;
using NPanday.Utils;
@@ -29,6 +29,7 @@ namespace NPanday.ProjectImporter.Conver
{
public class AzurePomConverter : AbstractPomConverter
{
+ private static readonly ILog log = LogManager.GetLogger(typeof(AzurePomConverter));
public AzurePomConverter(ProjectDigest projectDigest, string mainPomFile, NPanday.Model.Pom.Model parent, string groupId)
: base(projectDigest,mainPomFile,parent, groupId)
@@ -118,7 +119,7 @@ namespace NPanday.ProjectImporter.Conver
dependency.type = "dotnet-application";
break;
default:
- Console.WriteLine("Unknown role type '" + projectRef.RoleType + "' - treating as a dotnet-library");
+ log.Warn("Unknown role type '" + projectRef.RoleType + "' - treating as a dotnet-library");
break;
}
}
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=1230998&r1=1230997&r2=1230998&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 Fri Jan 13 11:07:57 2012
@@ -20,17 +20,14 @@
#endregion
using System;
using System.Collections.Generic;
-using System.Collections;
using System.IO;
using System.Reflection;
+using log4net;
using Microsoft.Build.BuildEngine;
-using NPanday.ProjectImporter.Parser.VisualStudioProjectTypes;
+using NPanday.Artifact;
using NPanday.ProjectImporter.Digest.Model;
-
+using NPanday.ProjectImporter.Parser.VisualStudioProjectTypes;
using NPanday.Utils;
-using NPanday.Artifact;
-
-
/// Author: Leopoldo Lee Agdeppa III
@@ -38,11 +35,10 @@ namespace NPanday.ProjectImporter.Digest
{
public class NormalProjectDigestAlgorithm : BaseProjectDigestAlgorithm, IProjectDigestAlgorithm
{
+ private static readonly ILog log = LogManager.GetLogger(typeof(NormalProjectDigestAlgorithm));
public ProjectDigest DigestProject(Dictionary<string, object> projectMap)
{
-
-
Project project = (Project)projectMap["Project"];
@@ -228,7 +224,7 @@ namespace NPanday.ProjectImporter.Digest
}
if (a == null || string.IsNullOrEmpty(path))
{
- Console.WriteLine("Cannot find or download the artifact " + dll.Name + ", project may not build properly.");
+ log.Warn("Cannot find or download the artifact " + dll.Name + ", project may not build properly.");
return;
}
}
@@ -308,7 +304,7 @@ namespace NPanday.ProjectImporter.Digest
List<string> refs = GacUtility.GetInstance().GetAssemblyInfo(buildItem.Include, null, null);
if (refs.Count == 0)
{
- Console.WriteLine("Unable to find reference '" + buildItem.Include + "' in " + string.Join("; ", refs.ToArray()));
+ log.Warn("Unable to find reference '" + buildItem.Include + "' in " + string.Join("; ", refs.ToArray()));
}
else if (refs.Count > 1)
{
@@ -329,7 +325,7 @@ namespace NPanday.ProjectImporter.Digest
catch (Exception e)
{
// skip this assembly
- Console.WriteLine("An error occurred loading assembly '" + s + "' - check that your PATH to gacutil matches your runtime environment: " + e.Message);
+ log.Error("An error occurred loading assembly '" + s + "' - check that your PATH to gacutil matches your runtime environment: " + e.Message);
}
}
reference.SetAssemblyInfoValues(best);
@@ -465,7 +461,7 @@ namespace NPanday.ProjectImporter.Digest
projectDigest.BaseApplicationManifest = buildItem.Include;
break;
default:
- Console.WriteLine("Unhandled ItemGroup: " + buildItem.Name);
+ log.Debug("Unhandled ItemGroup: " + buildItem.Name);
break;
}
}
@@ -718,7 +714,7 @@ namespace NPanday.ProjectImporter.Digest
}
else
{
- Console.WriteLine("Unhandled Property:" + buildProperty.Name);
+ log.Debug("Unhandled Property:" + buildProperty.Name);
}
}
Modified: incubator/npanday/trunk/dotnet/assemblies/NPanday.Utils/src/main/csharp/GacUtility.cs
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.Utils/src/main/csharp/GacUtility.cs?rev=1230998&r1=1230997&r2=1230998&view=diff
==============================================================================
--- incubator/npanday/trunk/dotnet/assemblies/NPanday.Utils/src/main/csharp/GacUtility.cs (original)
+++ incubator/npanday/trunk/dotnet/assemblies/NPanday.Utils/src/main/csharp/GacUtility.cs Fri Jan 13 11:07:57 2012
@@ -20,21 +20,19 @@
#endregion
using System;
using System.Collections.Generic;
-using System.Collections;
-using System.Text;
-
using System.Diagnostics;
-
-using System.Text.RegularExpressions;
-
-using System.Reflection;
using System.IO;
+using System.Reflection;
+using System.Text.RegularExpressions;
+using log4net;
using Microsoft.Win32;
namespace NPanday.Utils
{
public class GacUtility
{
+ private static readonly ILog log = LogManager.GetLogger(typeof(GacUtility));
+
private string gacs;
private static GacUtility instance;
@@ -88,14 +86,14 @@ namespace NPanday.Utils
{
KeyValuePair<string, string> pair = paths[s];
gacutil = pair.Value;
- Console.WriteLine("Found gacutil from SDK " + pair.Key + " at " + gacutil);
+ log.Info("Found gacutil from SDK " + pair.Key + " at " + gacutil);
break;
}
}
}
catch (Exception e)
{
- Console.WriteLine("Unable to find gacutil in the registry due to an exception: " + e);
+ log.Error("Unable to find gacutil in the registry due to an exception: " + e.Message);
}
Process p = new Process();
Modified: incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/main/csharp/Connect.cs
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/main/csharp/Connect.cs?rev=1230998&r1=1230997&r2=1230998&view=diff
==============================================================================
--- incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/main/csharp/Connect.cs (original)
+++ incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/main/csharp/Connect.cs Fri Jan 13 11:07:57 2012
@@ -583,7 +583,7 @@ namespace NPanday.VisualStudio.Addin
}
catch (Exception e)
{
- Console.WriteLine(e.Message);
+ log.Error(e.Message);
}
@@ -632,7 +632,7 @@ namespace NPanday.VisualStudio.Addin
}
catch (Exception e)
{
- Console.WriteLine(e.Message);
+ log.Error(e.Message);
}
try
{
@@ -673,7 +673,7 @@ namespace NPanday.VisualStudio.Addin
}
catch (Exception e)
{
- Console.WriteLine(e.Message);
+ log.Error(e.Message);
}
}
}
Modified: incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/main/csharp/ReferenceManager.cs
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/main/csharp/ReferenceManager.cs?rev=1230998&r1=1230997&r2=1230998&view=diff
==============================================================================
--- incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/main/csharp/ReferenceManager.cs (original)
+++ incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/main/csharp/ReferenceManager.cs Fri Jan 13 11:07:57 2012
@@ -20,8 +20,9 @@
#endregion
using System;
using System.IO;
-using NPanday.Model.Pom;
using EnvDTE;
+using log4net;
+using NPanday.Model.Pom;
namespace NPanday.VisualStudio.Addin
{
@@ -36,6 +37,8 @@ namespace NPanday.VisualStudio.Addin
string projectPath;
Solution solution;
+ private static readonly ILog log = LogManager.GetLogger(typeof(ReferenceManager));
+
#region IReferenceManager Members
public Artifact.Artifact Add(IReferenceInfo reference)
Modified: incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/main/csharp/WebServicesReferenceWatcher.cs
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/main/csharp/WebServicesReferenceWatcher.cs?rev=1230998&r1=1230997&r2=1230998&view=diff
==============================================================================
--- incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/main/csharp/WebServicesReferenceWatcher.cs (original)
+++ incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/main/csharp/WebServicesReferenceWatcher.cs Fri Jan 13 11:07:57 2012
@@ -20,6 +20,7 @@
#endregion
using System;
using System.IO;
+using log4net;
namespace NPanday.VisualStudio.Addin
{
@@ -29,6 +30,8 @@ namespace NPanday.VisualStudio.Addin
public event EventHandler<WebReferenceEventArgs> Created;
public event EventHandler<WebReferenceEventArgs> Deleted;
+ private static readonly ILog log = LogManager.GetLogger(typeof(WebServicesReferenceWatcher));
+
FileSystemWatcher watcher;
string folderPath;
@@ -65,7 +68,7 @@ namespace NPanday.VisualStudio.Addin
void watcher_Changed(object sender, FileSystemEventArgs e)
{
- Console.WriteLine(e.FullPath);
+ log.Debug("web service changed: " + e.FullPath);
}
void watcher_Error(object sender, ErrorEventArgs e)