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:09:29 UTC
svn commit: r1231003 - in /incubator/npanday/trunk/dotnet/assemblies:
NPanday.Artifact/ NPanday.Artifact/src/main/csharp/
NPanday.ProjectImporter/Engine/src/main/csharp/Converter/
NPanday.ProjectImporter/Engine/src/main/csharp/Converter/Algorithms/ NPa...
Author: brett
Date: Fri Jan 13 11:09:29 2012
New Revision: 1231003
URL: http://svn.apache.org/viewvc?rev=1231003&view=rev
Log:
[NPANDAY-532] replace MessageBox calls outside of the addin with logging, where appropriate - and mark others for replacement
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.Artifact/pom.xml
incubator/npanday/trunk/dotnet/assemblies/NPanday.Artifact/src/main/csharp/ArtifactRepository.cs
incubator/npanday/trunk/dotnet/assemblies/NPanday.Artifact/src/main/csharp/NPanday.Artifact.csproj
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/PomConverter.cs
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Digest/Model/Reference.cs
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Digest/ProjectDigester.cs
incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/main/csharp/NPanday.VisualStudio.Addin.csproj
Modified: incubator/npanday/trunk/dotnet/assemblies/NPanday.Artifact/pom.xml
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.Artifact/pom.xml?rev=1231003&r1=1231002&r2=1231003&view=diff
==============================================================================
--- incubator/npanday/trunk/dotnet/assemblies/NPanday.Artifact/pom.xml (original)
+++ incubator/npanday/trunk/dotnet/assemblies/NPanday.Artifact/pom.xml Fri Jan 13 11:09:29 2012
@@ -31,6 +31,13 @@
<name>NPanday :: .NET Artifact</name>
<dependencies>
<dependency>
+ <groupId>org.apache.logging</groupId>
+ <artifactId>log4net</artifactId>
+ <version>1.2.11</version>
+ <type>dotnet-library</type>
+ <classifier>net-2.0</classifier>
+ </dependency>
+ <dependency>
<groupId>org.apache.npanday</groupId>
<artifactId>NPanday.Model.Pom</artifactId>
<version>1.5.0-incubating-SNAPSHOT</version>
Modified: incubator/npanday/trunk/dotnet/assemblies/NPanday.Artifact/src/main/csharp/ArtifactRepository.cs
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.Artifact/src/main/csharp/ArtifactRepository.cs?rev=1231003&r1=1231002&r2=1231003&view=diff
==============================================================================
--- incubator/npanday/trunk/dotnet/assemblies/NPanday.Artifact/src/main/csharp/ArtifactRepository.cs (original)
+++ incubator/npanday/trunk/dotnet/assemblies/NPanday.Artifact/src/main/csharp/ArtifactRepository.cs Fri Jan 13 11:09:29 2012
@@ -23,14 +23,13 @@ using System;
using System.Collections.Generic;
using System.IO;
using System.Text;
-using System.Xml;
-using System.Xml.Serialization;
-using System.Windows.Forms;
+using log4net;
namespace NPanday.Artifact
{
public sealed class ArtifactRepository
{
+ private static readonly ILog log = LogManager.GetLogger(typeof(ArtifactRepository));
public string Tokenize(string id)
{
@@ -117,7 +116,7 @@ namespace NPanday.Artifact
}
catch (Exception e)
{
- MessageBox.Show(e.StackTrace, e.Message);
+ log.Error(e.Message, e);
}
return artifacts;
}
Modified: incubator/npanday/trunk/dotnet/assemblies/NPanday.Artifact/src/main/csharp/NPanday.Artifact.csproj
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.Artifact/src/main/csharp/NPanday.Artifact.csproj?rev=1231003&r1=1231002&r2=1231003&view=diff
==============================================================================
--- incubator/npanday/trunk/dotnet/assemblies/NPanday.Artifact/src/main/csharp/NPanday.Artifact.csproj (original)
+++ incubator/npanday/trunk/dotnet/assemblies/NPanday.Artifact/src/main/csharp/NPanday.Artifact.csproj Fri Jan 13 11:09:29 2012
@@ -34,6 +34,7 @@
<OutputPath>..\..\..\target\</OutputPath>
</PropertyGroup>
<ItemGroup>
+ <Reference Include="log4net, Version=1.2.11.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL" />
<Reference Include="NPanday.Model.Pom, Version=0.14.0.0, Culture=neutral, PublicKeyToken=4b435f4d76e2f0e6, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\NPanday.Model.Pom\target\NPanday.Model.Pom.dll</HintPath>
@@ -67,4 +68,4 @@
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" />
-</Project>
\ No newline at end of file
+</Project>
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=1231003&r1=1231002&r2=1231003&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:09:29 2012
@@ -780,6 +780,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}"
Modified: incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Converter/PomConverter.cs
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Converter/PomConverter.cs?rev=1231003&r1=1231002&r2=1231003&view=diff
==============================================================================
--- incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Converter/PomConverter.cs (original)
+++ incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Converter/PomConverter.cs Fri Jan 13 11:09:29 2012
@@ -20,21 +20,13 @@
#endregion
using System;
using System.Collections.Generic;
-using System.Text;
using System.IO;
-using System.Windows.Forms;
-
-
-
-using NPanday.ProjectImporter.Digest;
-using NPanday.ProjectImporter.Digest.Model;
-using NPanday.Utils;
+using log4net;
using NPanday.Model.Pom;
-
-using NPanday.Artifact;
-
using NPanday.ProjectImporter.Converter.Algorithms;
+using NPanday.ProjectImporter.Digest.Model;
using NPanday.ProjectImporter.Parser.VisualStudioProjectTypes;
+using NPanday.Utils;
/// Author: Leopoldo Lee Agdeppa III
@@ -43,6 +35,8 @@ namespace NPanday.ProjectImporter.Conver
{
public class PomConverter
{
+ private static readonly ILog log = LogManager.GetLogger(typeof(PomConverter));
+
// Converter Algorithm Registry
public static Dictionary<VisualStudioProjectTypeEnum, Type> __converterAlgorithms;
static PomConverter()
@@ -200,7 +194,7 @@ namespace NPanday.ProjectImporter.Conver
catch(Exception)
{
isValidUrl=false;
- //MessageBox.Show(string.Format("SCM Tag was not added, because the url {0} was not accessible",scmTag), "NPanday Project Import", MessageBoxButtons.OK, MessageBoxIcon.Warning);
+ log.InfoFormat("SCM Tag was not added, because the url {0} was not accessible", scmTag);
}
Modified: incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Digest/Model/Reference.cs
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Digest/Model/Reference.cs?rev=1231003&r1=1231002&r2=1231003&view=diff
==============================================================================
--- incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Digest/Model/Reference.cs (original)
+++ incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Digest/Model/Reference.cs Fri Jan 13 11:09:29 2012
@@ -193,7 +193,7 @@ namespace NPanday.ProjectImporter.Digest
}
catch (Exception e)
{
- MessageBox.Show("Cannot add reference of " + artifact.ArtifactId + ", an exception occurred trying to download it: " + e.Message);
+ log.Error("Cannot add reference of " + artifact.ArtifactId + ", an exception occurred trying to download it: " + e.Message);
return false;
}
}
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=1231003&r1=1231002&r2=1231003&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 Fri Jan 13 11:09:29 2012
@@ -126,6 +126,7 @@ namespace NPanday.ProjectImporter.Digest
projectDigest.ProjectName,
prjRefDigest.ProjectName);
+ // TODO: should not be in the importer
DialogResult includeResult = MessageBox.Show(errMsg, "Include Project in Pom Generation:",
MessageBoxButtons.YesNo,
MessageBoxIcon.Question);
Modified: incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/main/csharp/NPanday.VisualStudio.Addin.csproj
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/main/csharp/NPanday.VisualStudio.Addin.csproj?rev=1231003&r1=1231002&r2=1231003&view=diff
==============================================================================
--- incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/main/csharp/NPanday.VisualStudio.Addin.csproj (original)
+++ incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/main/csharp/NPanday.VisualStudio.Addin.csproj Fri Jan 13 11:09:29 2012
@@ -38,7 +38,7 @@
<Reference Include="EnvDTE" />
<Reference Include="EnvDTE80" />
<Reference Include="Extensibility" />
- <Reference Include="log4net, Version=1.2.11.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL"/>
+ <Reference Include="log4net, Version=1.2.11.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL" />
<Reference Include="Microsoft.Build.Engine" />
<Reference Include="Microsoft.VisualStudio.CommandBars" />
<Reference Include="NPanday.Model.Pom, Version=0.14.0.0, Culture=neutral, PublicKeyToken=4b435f4d76e2f0e6, processorArchitecture=MSIL">
@@ -67,7 +67,9 @@
</None>
</ItemGroup>
<ItemGroup>
- <EmbeddedResource Include="log4net.xml" />
+ <EmbeddedResource Include="log4net.xml">
+ <SubType>Designer</SubType>
+ </EmbeddedResource>
</ItemGroup>
<ItemGroup>
<Compile Include="AddArtifactsForm.cs">