bloritsch 2003/06/24 10:34:53
Modified: csframework/src/cs/Logger Log4netLogger.cs
Added: csframework AvalonFramework.build GETTING-STARTED.txt
csframework/bin log4net-net-1.1.dll log4net-sdk-net-1.1.chm
log4net.LICENSE
csframework/src/cs Attributes.cs
Removed: csframework build.xml
csframework/bin log4net.dll
Log:
update Log4Net dll, provide licensing info, and help file
Revision Changes Path
1.1 avalon-sandbox/csframework/AvalonFramework.build
Index: AvalonFramework.build
===================================================================
<project name="Avalon Framework - C#" default="build">
<property name="name" value="AvalonFramework"/>
<property name="version" value="1.0"/>
<property name="library.name" value="${name}-${version}"/>
<property name="build.debug" value="true"/>
<target name="build">
<csc target="library"
output="${library.name}.dll"
debug="${build.debug}">
<references basedir="bin">
<includes name="*.dll"/>
</references>
<sources basedir="src/cs">
<includes name="**.cs"/>
</sources>
</csc>
</target>
<target name="clean">
<delete file="${library.name}.dll"/>
<delete file="${library.name}.pdb"/>
<delete file="${library.name}.xml"/>
</target>
</project>
1.1 avalon-sandbox/csframework/GETTING-STARTED.txt
Index: GETTING-STARTED.txt
===================================================================
To get started with the .NET implementations of Avalon,
you have to install the following tools:
Nant -> http://nant.sourceforge.net
Nunit -> http://nunit.org
We cannot provide them for you due to licensing issues.
Nant is a 100% .NET implmented build tool inspired by
ANT (http://ant.apache.org). It is licensed under the
GPL, but if you install it separately as a tool (preferred)
then all is well. NUnit is a testing framework inspired
by JUnit (http://junit.org), and has an installer for
you.
Once everything is installed, you can type:
> nant
to build the Avalon project.
1.1 avalon-sandbox/csframework/bin/log4net-net-1.1.dll
<<Binary file>>
1.1 avalon-sandbox/csframework/bin/log4net-sdk-net-1.1.chm
<<Binary file>>
1.1 avalon-sandbox/csframework/bin/log4net.LICENSE
Index: log4net.LICENSE
===================================================================
/*
* ============================================================================
* The Apache Software License, Version 1.1
* ============================================================================
*
* Copyright (C) 1999 The Apache Software Foundation. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without modifica-
* tion, are permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
*
* 3. The end-user documentation included with the redistribution, if any, must
* include the following acknowledgment: "This product includes software
* developed by the Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself, if
* and wherever such third-party acknowledgments normally appear.
*
* 4. The names "log4j" and "Apache Software Foundation" must not be used to
* endorse or promote products derived from this software without prior
* written permission. For written permission, please contact
* [EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called "Apache", nor may
* "Apache" appear in their name, without prior written permission of the
* Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
* INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU-
* DING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
* OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* This software consists of voluntary contributions made by many individuals
* on behalf of the Apache Software Foundation. For more information on the
* Apache Software Foundation, please see <http://www.apache.org/>.
*
*/
1.1 avalon-sandbox/csframework/src/cs/Attributes.cs
Index: Attributes.cs
===================================================================
// ============================================================================
// The Apache Software License, Version 1.1
// ============================================================================
//
// Copyright (C) 2002-2003 The Apache Software Foundation. All rights reserved.
//
// Redistribution and use in source and binary forms, with or without modifica-
// tion, are permitted provided that the following conditions are met:
//
// 1. Redistributions of source code must retain the above copyright notice,
// this list of conditions and the following disclaimer.
//
// 2. Redistributions in binary form must reproduce the above copyright notice,
// this list of conditions and the following disclaimer in the documentation
// and/or other materials provided with the distribution.
//
// 3. The end-user documentation included with the redistribution, if any, must
// include the following acknowledgment: "This product includes software
// developed by the Apache Software Foundation (http://www.apache.org/)."
// Alternately, this acknowledgment may appear in the software itself, if
// and wherever such third-party acknowledgments normally appear.
//
// 4. The names "Jakarta", "Avalon", "Excalibur" and "Apache Software Foundation"
// must not be used to endorse or promote products derived from this software
// without prior written permission. For written permission, please contact
// [EMAIL PROTECTED]
//
// 5. Products derived from this software may not be called "Apache", nor may
// "Apache" appear in their name, without prior written permission of the
// Apache Software Foundation.
//
// THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
// INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
// FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
// APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
// INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU-
// DING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
// OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
// ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
// THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
//
// This software consists of voluntary contributions made by many individuals
// on behalf of the Apache Software Foundation. For more information on the
// Apache Software Foundation, please see <http://www.apache.org/>.
// ============================================================================
using System;
namespace Apache.Avalon.Framework
{
[AttributeUsage(AttributeTargets.Class,AllowMultiple=true)]
public sealed class AvalonService : Attribute
{
private string m_name;
public AvalonService(string name)
{
m_name = name;
}
public string GetName()
{
return m_name;
}
}
[AttributeUsage(AttributeTargets.Class,AllowMultiple=true)]
public sealed class AvalonDependency : Attribute
{
private string m_name;
public bool isOptional;
public AvalonDependency(string name)
{
m_name = name;
isOptional = false;
}
public string GetName()
{
return m_name;
}
}
[AttributeUsage(AttributeTargets.Class,AllowMultiple=false)]
public sealed class AvalonComponent : Attribute
{}
}
1.7 +23 -21 avalon-sandbox/csframework/src/cs/Logger/Log4netLogger.cs
Index: Log4netLogger.cs
===================================================================
RCS file: /home/cvs/avalon-sandbox/csframework/src/cs/Logger/Log4netLogger.cs,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Log4netLogger.cs 24 Jun 2003 12:18:25 -0000 1.6
+++ Log4netLogger.cs 24 Jun 2003 17:34:53 -0000 1.7
@@ -58,15 +58,17 @@
{
//underlying implementation
- private Category logger;
+ private ILog m_logger;
+ private string m_name;
/// <summary>
- /// Creates a logger that delegates to specified category.
+ /// Creates a m_logger that delegates to specified category.
/// </summary>
/// <param name="logImpl">The Category to delegate to.</param>
- public Log4netLogger(Category logImpl)
+ public Log4netLogger(ILog logImpl, string name)
{
- logger = logImpl;
+ m_logger = logImpl;
+ m_name = name;
}
/// <summary>
@@ -75,7 +77,7 @@
/// <param name="message">The Message</param>
public void Debug(string message )
{
- logger.Debug(message);
+ m_logger.Debug(message);
}
/// <summary>
@@ -85,7 +87,7 @@
/// <param name="exception">The Exception</param>
public void Debug(string message, Exception exception)
{
- logger.Debug( message, exception );
+ m_logger.Debug( message, exception );
}
/// <summary>
@@ -96,7 +98,7 @@
{
get
{
- return logger.IsDebugEnabled;
+ return m_logger.IsDebugEnabled;
}
}
@@ -107,7 +109,7 @@
/// <param name="message">The Message</param>
public void Info( string message )
{
- logger.Info(message);
+ m_logger.Info(message);
}
/// <summary>
@@ -117,7 +119,7 @@
/// <param name="exception">The Exception</param>
public void Info( string message, Exception exception)
{
- logger.Info( message, exception);
+ m_logger.Info( message, exception);
}
/// <summary>
@@ -128,7 +130,7 @@
{
get
{
- return logger.IsInfoEnabled;
+ return m_logger.IsInfoEnabled;
}
}
@@ -138,7 +140,7 @@
/// <param name="message">The Message</param>
public void Warn(string message )
{
- logger.Warn( message );
+ m_logger.Warn( message );
}
/// <summary>
@@ -148,7 +150,7 @@
/// <param name="exception">The Exception</param>
public void Warn(string message, Exception exception)
{
- logger.Warn( message, exception );
+ m_logger.Warn( message, exception );
}
/// <summary>
@@ -159,7 +161,7 @@
{
get
{
- return logger.IsWarnEnabled;
+ return m_logger.IsWarnEnabled;
}
}
@@ -169,7 +171,7 @@
/// <param name="message">The Message</param>
public void Error(string message )
{
- logger.Error( message );
+ m_logger.Error( message );
}
/// <summary>
@@ -179,7 +181,7 @@
/// <param name="exception">The Exception</param>
public void Error(string message, Exception exception)
{
- logger.Error( message, exception );
+ m_logger.Error( message, exception );
}
/// <summary>
@@ -190,7 +192,7 @@
{
get
{
- return logger.IsErrorEnabled;
+ return m_logger.IsErrorEnabled;
}
}
@@ -200,7 +202,7 @@
/// <param name="message">The Message</param>
public void FatalError(string message )
{
- logger.Fatal( message );
+ m_logger.Fatal( message );
}
/// <summary>
@@ -210,7 +212,7 @@
/// <param name="exception">The Exception</param>
public void FatalError(string message, Exception exception)
{
- logger.Fatal( message, exception);
+ m_logger.Fatal( message, exception);
}
/// <summary>
@@ -221,7 +223,7 @@
{
get
{
- return logger.IsFatalEnabled;
+ return m_logger.IsFatalEnabled;
}
}
@@ -234,7 +236,7 @@
/// <exception cref="System.ArgumentException">If the name has an
empty element name.</exception>
public ILogger CreateChildLogger(string name )
{
- return new Log4netLogger( Category.GetInstance( logger.Name +
"." + name ) );
+ return new Log4netLogger( LogManager.GetLogger( m_name + "." +
name ) );
}
}
-}
\ No newline at end of file
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
