Author: brett
Date: Fri Jan 13 18:41:47 2012
New Revision: 1231234
URL: http://svn.apache.org/viewvc?rev=1231234&view=rev
Log:
make sure log4net is loaded even when NPanday is built with NPanday
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/pom.xml
incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/main/csharp/Connect.cs
incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/main/csharp/NPanday.VisualStudio.Addin.csproj
incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/test/csharp/NPanday.VisualStudio.Addin-Test.csproj
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/pom.xml?rev=1231234&r1=1231233&r2=1231234&view=diff
==============================================================================
---
incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/pom.xml
(original)
+++
incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/pom.xml
Fri Jan 13 18:41:47 2012
@@ -124,6 +124,17 @@
<type>dotnet-library</type>
</dependency>
</dependencies>
+ <build>
+ <resources>
+ <resource>
+ <!-- So VS can see it too -->
+ <directory>src/main/csharp</directory>
+ <includes>
+ <include>log4net.xml</include>
+ </includes>
+ </resource>
+ </resources>
+ </build>
<profiles>
<profile>
<id>partcover</id>
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=1231234&r1=1231233&r2=1231234&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 18:41:47 2012
@@ -355,11 +355,20 @@ namespace NPanday.VisualStudio.Addin
try
{
+ // Currently, MSBuild uses the namespace
NPanday.VisualStudio, while NPanday uses the artifactID
NPanday.VisualStudio.AddIn for embedded resources. Workaround...
Stream fileStream =
Assembly.GetExecutingAssembly().GetManifestResourceStream("NPanday.VisualStudio.log4net.xml");
+ if (fileStream == null)
+ {
+ fileStream =
Assembly.GetExecutingAssembly().GetManifestResourceStream("NPanday.VisualStudio.Addin.log4net.xml");
+ }
if (fileStream != null)
{
XmlConfigurator.Configure(fileStream);
}
+ else
+ {
+ outputWindowPane.OutputString("Failed to configure
logging subsystem: No log4net.xml configuration found\n");
+ }
}
catch (Exception e)
{
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=1231234&r1=1231233&r2=1231234&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 18:41:47 2012
@@ -67,11 +67,6 @@
</None>
</ItemGroup>
<ItemGroup>
- <EmbeddedResource Include="log4net.xml">
- <SubType>Designer</SubType>
- </EmbeddedResource>
- </ItemGroup>
- <ItemGroup>
<Compile Include="AddArtifactsForm.cs">
<SubType>Form</SubType>
</Compile>
@@ -195,5 +190,8 @@
<ItemGroup>
<Folder Include="Properties\" />
</ItemGroup>
+ <ItemGroup>
+ <EmbeddedResource Include="log4net.xml" />
+ </ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" />
</Project>
\ No newline at end of file
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/test/csharp/NPanday.VisualStudio.Addin-Test.csproj
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/test/csharp/NPanday.VisualStudio.Addin-Test.csproj?rev=1231234&r1=1231233&r2=1231234&view=diff
==============================================================================
---
incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/test/csharp/NPanday.VisualStudio.Addin-Test.csproj
(original)
+++
incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/test/csharp/NPanday.VisualStudio.Addin-Test.csproj
Fri Jan 13 18:41:47 2012
@@ -69,6 +69,7 @@
<Compile Include="AddLocalMavenArtifactTest.cs" />
<Compile Include="AddWebReferenceTest.cs" />
<Compile Include="FileUtils.cs" />
+ <Compile Include="Log4NetConfigTest.cs" />
<Compile Include="MavenCompilePluginConfigurationTest.cs" />
<Compile Include="MavenResxPluginConfigurationTest.cs" />
<Compile Include="ProjectImporterValidationTest.cs" />
