avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hamm...@apache.org
Subject cvs commit: avalon-sandbox/avalon-net ApacheAvalonPublic.snk
Date Thu, 25 Sep 2003 01:42:35 GMT
hammett     2003/09/24 18:42:35

  Modified:    avalon-net/cscontainer/AvalonContainerTest/Module
                        PicoContainerExtension.cs
               avalon-net/cscontainer/AvalonContainerTest
                        PicoContainerExtensionTestCase.cs
               avalon-net/cscontainer/AvalonContainer AssemblyInfo.cs
                        AvalonContainer.csproj DefaultContainer.cs
                        LifestyleManager.cs
               avalon-net/cscontainer/AvalonContainer/Lookup
                        BlindLookupManager.cs
               avalon-net/cscontainer/Samples/bin/Samples
                        Samples.Components.dll
               avalon-net/cscontainer/bin Apache.Avalon.Container.Test.dll
                        Apache.Avalon.Container.dll
                        Apache.Avalon.Framework.Test.dll
                        Apache.Avalon.Framework.dll
               avalon-net/csframework AvalonFramework.build
               avalon-net/csframework/AvalonFrameworkTest
                        AvalonFrameworkTest.csproj
               avalon-net/csframework/AvalonFramework AssemblyInfo.cs
                        AvalonFramework.csproj LookupException.cs
               avalon-net/csframework/bin Apache.Avalon.Framework.Test.dll
                        Apache.Avalon.Framework.dll
  Added:       avalon-net/csframework/bin log4net-1-1.dll log4net-1.0.dll
               avalon-net ApacheAvalonPublic.snk
  Removed:     avalon-net/csframework/bin log4net-net-1.1.dll
  Log:
  Few corrections. Strong name support - private key not available yet.
  
  Revision  Changes    Path
  1.2       +47 -0     avalon-sandbox/avalon-net/cscontainer/AvalonContainerTest/Module/PicoContainerExtension.cs
  
  Index: PicoContainerExtension.cs
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/avalon-net/cscontainer/AvalonContainerTest/Module/PicoContainerExtension.cs,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- PicoContainerExtension.cs	22 Sep 2003 23:49:23 -0000	1.1
  +++ PicoContainerExtension.cs	25 Sep 2003 01:42:34 -0000	1.2
  @@ -1,3 +1,50 @@
  +// ============================================================================
  +//                   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
  +//    apache@apache.org.
  +//
  +// 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/>.
  +// ============================================================================
  +
   namespace Apache.Avalon.Container.Test.Module
   {
   	using System;
  
  
  
  1.2       +47 -0     avalon-sandbox/avalon-net/cscontainer/AvalonContainerTest/PicoContainerExtensionTestCase.cs
  
  Index: PicoContainerExtensionTestCase.cs
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/avalon-net/cscontainer/AvalonContainerTest/PicoContainerExtensionTestCase.cs,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- PicoContainerExtensionTestCase.cs	22 Sep 2003 23:49:23 -0000	1.1
  +++ PicoContainerExtensionTestCase.cs	25 Sep 2003 01:42:34 -0000	1.2
  @@ -1,3 +1,50 @@
  +// ============================================================================
  +//                   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
  +//    apache@apache.org.
  +//
  +// 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/>.
  +// ============================================================================
  +
   namespace Apache.Avalon.Container.Test
   {
   	using System;
  
  
  
  1.2       +6 -1      avalon-sandbox/avalon-net/cscontainer/AvalonContainer/AssemblyInfo.cs
  
  Index: AssemblyInfo.cs
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/avalon-net/cscontainer/AvalonContainer/AssemblyInfo.cs,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- AssemblyInfo.cs	22 Sep 2003 23:49:23 -0000	1.1
  +++ AssemblyInfo.cs	25 Sep 2003 01:42:34 -0000	1.2
  @@ -46,4 +46,9 @@
   // ============================================================================
   
   using System.Reflection;
using System.Runtime.CompilerServices;
  -//
// General Information about an assembly is controlled through the following 
// set
of attributes. Change these attribute values to modify the information
// associated with
an assembly.
//
[assembly: AssemblyTitle("AvalonContainer")]
[assembly: AssemblyDescription("The
core structure and code to set up and run components.")]
[assembly: AssemblyConfiguration("")]
[assembly:
AssemblyCompany("Apache Software Foundation (ASF)")]
[assembly: AssemblyProduct("Avalon Container")]
[assembly:
AssemblyCopyright("Copyright (c) 2003 Apache Software Foundation")]
[assembly: AssemblyTrademark("")]
[assembly:
AssemblyCulture("")]		

//
// Version information for an assembly consists of the following
four values:
//
//      Major Version
//      Minor Version 
//      Build Number
//     
Revision
//
// You can specify all the values or you can default the Revision and Build Numbers

// by using the '*' as shown below:

[assembly: AssemblyVersion("1.0.0.0")]

//
// In order
to sign your assembly you must specify a key to use. Refer to the 
// Microsoft .NET Framework
documentation for more information on assembly signing.
//
// Use the attributes below to
control which key is used for signing. 
//
// Notes: 
//   (*) If no key is specified, the
assembly is not signed.
//   (*) KeyName refers to a key that has been installed in the Crypto
Service
//       Provider (CSP) on your machine. KeyFile refers to a file which contains
//
      a key.
//   (*) If the KeyFile and the KeyName values are both specified, the 
//  
    following processing occurs:
//       (1) If the KeyName can be found in the CSP, that
key is used.
//       (2) If the KeyName does not exist and the KeyFile does exist, the key

//           in the KeyFile is installed into the CSP and used.
//   (*) In order to create
a KeyFile, you can use the sn.exe (Strong Name) utility.
//       When specifying the KeyFile,
the location of the KeyFile should be
//       relative to the project output directory which
is
//       %Project Directory%\obj\<configuration>. For example, if your KeyFile is
//
      located in the project directory, you would specify the AssemblyKeyFile 
//       attribute
as [assembly: AssemblyKeyFile("..\\..\\mykey.snk")]
//   (*) Delay Signing is an advanced
option - see the Microsoft .NET Framework
//       documentation for more information on this.
//
[assembly:
AssemblyDelaySign(false)]
[assembly: AssemblyKeyFile("")]
[assembly: AssemblyKeyName("")]
  \ No newline at end of file
  +//
// General Information about an assembly is controlled through the following 
// set
of attributes. Change these attribute values to modify the information
// associated with
an assembly.
//
[assembly: AssemblyTitle("AvalonContainer")]
[assembly: AssemblyDescription("The
core structure and code to set up and run components.")]
[assembly: AssemblyConfiguration("")]
[assembly:
AssemblyCompany("Apache Software Foundation (ASF)")]
[assembly: AssemblyProduct("Avalon Container")]
[assembly:
AssemblyCopyright("Copyright (c) 2003 Apache Software Foundation")]
[assembly: AssemblyTrademark("")]
[assembly:
AssemblyCulture("")]		

//
// Version information for an assembly consists of the following
four values:
//
//      Major Version
//      Minor Version 
//      Build Number
//     
Revision
//
// You can specify all the values or you can default the Revision and Build Numbers

// by using the '*' as shown below:

[assembly: AssemblyVersion("1.0.0.0")]

//
// In order
to sign your assembly you must specify a key to use. Refer to the 
// Microsoft .NET Framework
documentation for more information on assembly signing.
//
// Use the attributes below to
control which key is used for signing. 
//
// Notes: 
//   (*) If no key is specified, the
assembly is not signed.
//   (*) KeyName refers to a key that has been installed in the Crypto
Service
//       Provider (CSP) on your machine. KeyFile refers to a file which contains
//
      a key.
//   (*) If the KeyFile and the KeyName values are both specified, the 
//  
    following processing occurs:
//       (1) If the KeyName can be found in the CSP, that
key is used.
//       (2) If the KeyName does not exist and the KeyFile does exist, the key

//           in the KeyFile is installed into the CSP and used.
//   (*) In order to create
a KeyFile, you can use the sn.exe (Strong Name) utility.
//       When specifying the KeyFile,
the location of the KeyFile should be
//       relative to the project output directory which
is
//       %Project Directory%\obj\<configuration>. For example, if your KeyFile is
//
      located in the project directory, you would specify the AssemblyKeyFile 
//       attribute
as [assembly: AssemblyKeyFile("..\\..\\mykey.snk")]
//   (*) Delay Signing is an advanced
option - see the Microsoft .NET Framework
//       documentation for more information on this.
//
  +#if STRONG
  +[assembly: AssemblyDelaySign(false)]
  +[assembly: AssemblyKeyFile("../../../../ApacheAvalon.snk")]
  +[assembly: AssemblyKeyName("")]
  +#endif
  
  
  
  1.2       +1 -1      avalon-sandbox/avalon-net/cscontainer/AvalonContainer/AvalonContainer.csproj
  
  Index: AvalonContainer.csproj
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/avalon-net/cscontainer/AvalonContainer/AvalonContainer.csproj,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- AvalonContainer.csproj	22 Sep 2003 23:49:23 -0000	1.1
  +++ AvalonContainer.csproj	25 Sep 2003 01:42:34 -0000	1.2
  @@ -28,7 +28,7 @@
                       BaseAddress = "285212672"
                       CheckForOverflowUnderflow = "false"
                       ConfigurationOverrideFile = ""
  -                    DefineConstants = "DEBUG;TRACE"
  +                    DefineConstants = "DEBUG;TRACE;STRONG"
                       DocumentationFile = ""
                       DebugSymbols = "true"
                       FileAlignment = "4096"
  
  
  
  1.2       +2 -2      avalon-sandbox/avalon-net/cscontainer/AvalonContainer/DefaultContainer.cs
  
  Index: DefaultContainer.cs
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/avalon-net/cscontainer/AvalonContainer/DefaultContainer.cs,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- DefaultContainer.cs	22 Sep 2003 23:49:23 -0000	1.1
  +++ DefaultContainer.cs	25 Sep 2003 01:42:34 -0000	1.2
  @@ -283,7 +283,7 @@
   			InternalComponentHandler handler = 
   				new InternalComponentHandler( logger, extensionsConfiguration, lifecycleManager );
   
  -			BlindLookupManager lookUpManager = new BlindLookupManager();
  +			BlindLookupManager lookUpManager = new BlindLookupManager(LookupManager);
   			lookUpManager.Add( typeof(IComponentFactoryManager).FullName, m_factoryManager );
   			lookUpManager.Add( typeof(ILoggerManager).FullName, m_loggerManager );
   			lookUpManager.Add( "Container", this );
  @@ -296,7 +296,7 @@
   		{
   			foreach(Assembly assembly in assemblies)
   			{
  -				 Pair[] pairs = AssemblyUtil.FindTypesUsingAttribute(
  +				Pair[] pairs = AssemblyUtil.FindTypesUsingAttribute(
   					assembly, typeof( AvalonServiceAttribute ));
   
   				foreach(Pair pair in pairs)
  
  
  
  1.2       +1 -1      avalon-sandbox/avalon-net/cscontainer/AvalonContainer/LifestyleManager.cs
  
  Index: LifestyleManager.cs
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/avalon-net/cscontainer/AvalonContainer/LifestyleManager.cs,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- LifestyleManager.cs	22 Sep 2003 23:49:23 -0000	1.1
  +++ LifestyleManager.cs	25 Sep 2003 01:42:34 -0000	1.2
  @@ -138,7 +138,7 @@
   					ContainerUtil.EnableLogging(instance, m_loggerManager[entry.LoggerName]);
   				}
   
  -				BlindLookupManager lookupManager = new BlindLookupManager();
  +				BlindLookupManager lookupManager = new BlindLookupManager(m_container.LookupManager);
   
   				if (entry.Dependencies.Length != 0)
   				{
  
  
  
  1.2       +43 -4     avalon-sandbox/avalon-net/cscontainer/AvalonContainer/Lookup/BlindLookupManager.cs
  
  Index: BlindLookupManager.cs
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/avalon-net/cscontainer/AvalonContainer/Lookup/BlindLookupManager.cs,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- BlindLookupManager.cs	22 Sep 2003 23:49:24 -0000	1.1
  +++ BlindLookupManager.cs	25 Sep 2003 01:42:34 -0000	1.2
  @@ -53,16 +53,33 @@
   	using Apache.Avalon.Framework;
   
   	/// <summary>
  -	/// A blind LookupManager exposes only dependencies instances.
  +	/// A blind LookupManager should exposes only dependencies instances.
   	/// </summary>
  +	/// <remarks>
  +	/// Unfortunatelly there are situations where look-up only
  +	/// dependents components is not enough. So a BlindLookupManager can
  +	/// receive a parent <see cref="Apache.Avalon.Framework.ILookupManager"/> 
  +	/// used to delegate the look-up.
  +	/// </remarks>
   	public class BlindLookupManager : ILookupManager
   	{
  -		private Hashtable m_instances;
  +		private Hashtable      m_instances;
  +		private ILookupManager m_parent;
   
  -		public BlindLookupManager()
  +		/// <summary>
  +		/// Constructs a BlindLookupManager.
  +		/// </summary>
  +		/// <param name="parent">The parent 
  +		/// <see cref="Apache.Avalon.Framework.ILookupManager"/>. 
  +		/// This can be null.
  +		/// </param>
  +		public BlindLookupManager(ILookupManager parent)
   		{
   			// Shall we use a case insensitive hashtable?
   			m_instances = new Hashtable();
  +
  +			// This can be null
  +			m_parent = parent;
   		}
   
   		/// <summary>
  @@ -93,6 +110,9 @@
   		/// <summary>
   		/// Returns the component associated with the given role.
   		/// </summary>
  +		/// <value>The component instance.</value>
  +		/// <exception cref="ArgumentNullException">If the <c>role</c> argument
is null.</exception>
  +		/// <exception cref="Apache.Avalon.Framework.LookupException">If the <c>role</c>
could not be resolved.</exception>
   		public object this[String role]
   		{
   			get
  @@ -104,6 +124,11 @@
   
   				object instance = m_instances[role];
   
  +				if ( instance == null && m_parent != null )
  +				{
  +					instance = m_parent[role];
  +				}
  +
   				if ( instance == null )
   				{
   					throw new LookupException( role, "Instance not found." );
  @@ -120,6 +145,7 @@
   		/// A BlindLookupManager should not release anything as its not 
   		/// have ownership of any component.
   		/// </remarks>
  +		/// <exception cref="ArgumentNullException">If the <c>role</c> argument
is null.</exception>
   		public void Release(object resource)
   		{
   			// Sanity check
  @@ -128,6 +154,11 @@
   				throw new ArgumentNullException( "resource" );
   			}
   
  +			// TODO: We shall not release dependent components
  +			// but we must release components returned by the parent
  +			// ILookupManager. While this "to do" is not resolved,
  +			// Dispose probabily is not been called for a lot of 
  +			// components
   		}
   
   		/// <summary>
  @@ -135,6 +166,7 @@
   		/// </summary>
   		/// <param name="role">A String identifying the lookup name to check.</param>
   		/// <returns>True if the resource exists; otherwise, false.</returns>
  +		/// <exception cref="ArgumentNullException">If the <c>role</c> argument
is null.</exception>
   		public bool Contains(String role)
   		{
   			if ( role == null || role.Length == 0 )
  @@ -142,7 +174,14 @@
   				throw new ArgumentNullException( "role" );
   			}
   
  -			return m_instances.Contains( role );
  +			bool contains = m_instances.Contains( role );
  +
  +			if (!contains && m_parent != null)
  +			{
  +				contains = m_parent.Contains(role);
  +			}
  +
  +			return contains;
   		}
   
   		#endregion
  
  
  
  1.2       +5 -6      avalon-sandbox/avalon-net/cscontainer/Samples/bin/Samples/Samples.Components.dll
  
  	<<Binary file>>
  
  
  1.2       +10 -11    avalon-sandbox/avalon-net/cscontainer/bin/Apache.Avalon.Container.Test.dll
  
  	<<Binary file>>
  
  
  1.2       +318 -310  avalon-sandbox/avalon-net/cscontainer/bin/Apache.Avalon.Container.dll
  
  	<<Binary file>>
  
  
  1.2       +31 -25    avalon-sandbox/avalon-net/cscontainer/bin/Apache.Avalon.Framework.Test.dll
  
  	<<Binary file>>
  
  
  1.2       +70 -79    avalon-sandbox/avalon-net/cscontainer/bin/Apache.Avalon.Framework.dll
  
  	<<Binary file>>
  
  
  1.2       +1 -1      avalon-sandbox/avalon-net/csframework/AvalonFramework.build
  
  Index: AvalonFramework.build
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/avalon-net/csframework/AvalonFramework.build,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- AvalonFramework.build	22 Sep 2003 23:49:25 -0000	1.1
  +++ AvalonFramework.build	25 Sep 2003 01:42:34 -0000	1.2
  @@ -31,7 +31,7 @@
     <target name="test" depends="build-test" description="Run the NUnit tests">
        <exec program="nunit-console.exe" commandline="/assembly:${output.test.file}"/>
     </target>
  -  <target name="ndoc" depends="build" description="Build the API documentation">
   <ndoc>
      <assemblies>
        <includes name="${output.file}"/>
     </assemblies>
      <summaries>
        <includes name="${source.dir}/NamespaceSummary.xml"/>
     </summaries>
      <documenters>
        <documenter name="MSDN">
         <property name="OutputDirectory" value="doc\MSDN" />
          <property
name="HtmlHelpName" value="${library.name}" />
          <property name="HtmlHelpCompilerFilename"
value="hhc.exe" />
          <property name="IncludeFavorites" value="False" />
         <property name="Title" value="The Avalon Framework API Docs" />
          <property
name="SplitTOCs" value="False" />
          <property name="DefaulTOC" value="" />
         <property name="ShowMissingSummaries" value="True" />
          <property
name="ShowMissingRemarks" value="True" />
          <property name="ShowMissingParams"
value="True" />
          <property name="ShowMissingReturns" value="True" />
  
       <property name="ShowMissingValues" value="True" />
          <property name="DocumentInternals"
value="False" />
          <property name="DocumentProtected" value="True" />
  
       <property name="DocumentPrivates" value="False" />
          <property name="DocumentEmptyNamespaces"
value="False" />
          <property name="IncludeAssemblyVersion" value="False" />
         <property name="CopyrightText" value="Copyright 2003 The Apache Software Foundation.
All rights reserved." />
          <property name="CopyrightHref" value="http://avalon.apache.org/"
/>
        </documenter>
      </documenters> 
    </ndoc>
  </target>

 <target name="clean" description="Clean up after ourselves">
  +  <target name="ndoc" depends="build" description="Build the API documentation">
   <ndoc>
      <assemblies>
        <includes name="${output.file}"/>
     </assemblies>
      <summaries>
        <includes name="${source.dir}/NamespaceSummary.xml"/>
     </summaries>
      <documenters>
        <documenter name="MSDN">
         <property name="OutputDirectory" value="doc\MSDN" />
          <property
name="HtmlHelpName" value="${library.name}" />
          <property name="HtmlHelpCompilerFilename"
value="hhc.exe" />
          <property name="IncludeFavorites" value="False" />
         <property name="Title" value="The Avalon Framework API Docs" />
          <property
name="SplitTOCs" value="False" />
          <property name="DefaulTOC" value="" />
         <property name="ShowMissingSummaries" value="True" />
          <property
name="ShowMissingRemarks" value="False" />
          <property name="ShowMissingParams"
value="False" />
          <property name="ShowMissingReturns" value="False" />
         <property name="ShowMissingValues" value="False" />
          <property
name="DocumentInternals" value="False" />
          <property name="DocumentProtected"
value="True" />
          <property name="DocumentPrivates" value="False" />
   
      <property name="DocumentEmptyNamespaces" value="False" />
          <property
name="IncludeAssemblyVersion" value="False" />
          <property name="CopyrightText"
value="Copyright 2003 (c) The Apache Software Foundation. All rights reserved." />
   
      <property name="CopyrightHref" value="http://avalon.apache.org/" />
        </documenter>
     </documenters> 
    </ndoc>
  </target>

  <target name="clean"
description="Clean up after ourselves">
       <delete>
         <fileset>
           <includes name="${output.file}"/>
  
  
  
  1.3       +0 -5      avalon-sandbox/avalon-net/csframework/AvalonFrameworkTest/AvalonFrameworkTest.csproj
  
  Index: AvalonFrameworkTest.csproj
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/avalon-net/csframework/AvalonFrameworkTest/AvalonFrameworkTest.csproj,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- AvalonFrameworkTest.csproj	24 Sep 2003 23:58:26 -0000	1.2
  +++ AvalonFrameworkTest.csproj	25 Sep 2003 01:42:34 -0000	1.3
  @@ -80,11 +80,6 @@
                       HintPath = "C:\WINDOWS\Microsoft.NET\Framework\v1.0.3705\System.XML.dll"
                   />
                   <Reference
  -                    Name = "log4net-net-1.1"
  -                    AssemblyName = "log4net-net-1.1"
  -                    HintPath = "..\bin\log4net-net-1.1.dll"
  -                />
  -                <Reference
                       Name = "AvalonFramework"
                       Project = "{A4DA9A13-FD5A-42A0-97C5-18CEDA5CB1A5}"
                       Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
  
  
  
  1.2       +4 -1      avalon-sandbox/avalon-net/csframework/AvalonFramework/AssemblyInfo.cs
  
  Index: AssemblyInfo.cs
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/avalon-net/csframework/AvalonFramework/AssemblyInfo.cs,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- AssemblyInfo.cs	22 Sep 2003 23:49:25 -0000	1.1
  +++ AssemblyInfo.cs	25 Sep 2003 01:42:34 -0000	1.2
  @@ -100,6 +100,9 @@
   //   (*) Delay Signing is an advanced option - see the Microsoft .NET Framework
   //       documentation for more information on this.
   //
  +
  +#if STRONG
   [assembly: AssemblyDelaySign(false)]
  -[assembly: AssemblyKeyFile("")]
  +[assembly: AssemblyKeyFile("../../../../ApacheAvalon.snk")]
   [assembly: AssemblyKeyName("")]
  +#endif
  
  
  
  1.2       +4 -4      avalon-sandbox/avalon-net/csframework/AvalonFramework/AvalonFramework.csproj
  
  Index: AvalonFramework.csproj
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/avalon-net/csframework/AvalonFramework/AvalonFramework.csproj,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- AvalonFramework.csproj	22 Sep 2003 23:49:25 -0000	1.1
  +++ AvalonFramework.csproj	25 Sep 2003 01:42:34 -0000	1.2
  @@ -28,7 +28,7 @@
                       BaseAddress = "285212672"
                       CheckForOverflowUnderflow = "false"
                       ConfigurationOverrideFile = ""
  -                    DefineConstants = "DEBUG;TRACE"
  +                    DefineConstants = "DEBUG;TRACE;STRONG"
                       DocumentationFile = ""
                       DebugSymbols = "true"
                       FileAlignment = "4096"
  @@ -80,9 +80,9 @@
                       HintPath = "C:\WINDOWS\Microsoft.NET\Framework\v1.0.3705\System.XML.dll"
                   />
                   <Reference
  -                    Name = "log4net-net-1.1"
  -                    AssemblyName = "log4net-net-1.1"
  -                    HintPath = "..\bin\log4net-net-1.1.dll"
  +                    Name = "log4net-1-1"
  +                    AssemblyName = "log4net-1-1"
  +                    HintPath = "..\bin\log4net-1-1.dll"
                   />
               </References>
           </Build>
  
  
  
  1.2       +7 -43     avalon-sandbox/avalon-net/csframework/AvalonFramework/LookupException.cs
  
  Index: LookupException.cs
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/avalon-net/csframework/AvalonFramework/LookupException.cs,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- LookupException.cs	22 Sep 2003 23:49:25 -0000	1.1
  +++ LookupException.cs	25 Sep 2003 01:42:34 -0000	1.2
  @@ -59,14 +59,10 @@
   	[Serializable]
   	public class LookupException : Exception
   	{
  -		private const string ROLE_NAME_SERIALIZATION = "lookup-exception-role";
  -
  -		private string role;		
  -		
   		/// <summary>
   		/// Constructs a new <c>LookupException</c> instance.
   		/// </summary>
  -		public LookupException(): this(null)
  +		public LookupException() : this(null)
   		{
   		}
   
  @@ -74,7 +70,7 @@
   		/// Constructs a new <c>LookupException</c> instance.
   		/// </summary>
   		/// <param name="message">The Detail message for this exception.</param>
  -		public LookupException(string message): this(null, message)
  +		public LookupException(String message) : this(null, message)
   		{
   		}
   
  @@ -83,7 +79,7 @@
   		/// </summary>
   		/// <param name="role">The Role that caused the exception.</param>
   		/// <param name="message">The Detail message for this exception.</param>
  -		public LookupException(string role, string message): this(role, message, null)
  +		public LookupException(String role, String message) : this(role, message, null)
   		{
   		}
   
  @@ -92,7 +88,7 @@
   		/// </summary>
   		/// <param name="message">The Detail message for this exception.</param>
   		/// <param name="inner">The Root cause of the exception.</param>
  -		public LookupException(string message, Exception inner): this(null, message, inner)
  +		public LookupException(String message, Exception inner) : this(String.Empty, message,
inner)
   		{
   		}
   
  @@ -102,42 +98,10 @@
   		/// <param name="role">The Role that caused the exception.</param>
   		/// <param name="message">The Detail message for this exception.</param>
   		/// <param name="inner">The Root cause of the exception.</param>
  -		public LookupException(string role, string message, Exception inner): base(message, inner)
  +		public LookupException(String role, String message, Exception inner) : 
  +			base(String.Format("Component for role '{0}' could not be resolved. " + 
  +							   "Detailed message: {1}", role, message), inner)
   		{
  -			this.role = role;
  -		}
  -
  -		/// <summary>
  -		/// Constructs a new <see cref="LookupException"/> instance.
  -		/// </summary>
  -		public LookupException(SerializationInfo info, StreamingContext context): base(info,
context)
  -		{
  -			info.AddValue(ROLE_NAME_SERIALIZATION, role); 
  -		}
  -
  -		/// <summary>
  -		/// Gets the role that caused the exception.
  -		/// </summary>
  -		/// <value>The Role that caused the exception.</value> 
  -		public string Role
  -		{
  -			get
  -			{
  -				return role;
  -			}
  -		}
  -
  -		/// <summary>
  -		/// Populates the <see cref="SerializationInfo"/> object with 
  -		/// the data needed to serialize the <see cref="LookupException"/> object.
  -		/// </summary>
  -		/// <param name="info"></param>
  -		/// <param name="context"></param>
  -		public override void GetObjectData(SerializationInfo info, StreamingContext context)
  -		{
  -			base.GetObjectData(info, context);
  -
  -			role = info.GetString(ROLE_NAME_SERIALIZATION);
   		}
   	}
   }
  
  
  
  1.2       +37 -30    avalon-sandbox/avalon-net/csframework/bin/Apache.Avalon.Framework.Test.dll
  
  	<<Binary file>>
  
  
  1.2       +70 -79    avalon-sandbox/avalon-net/csframework/bin/Apache.Avalon.Framework.dll
  
  	<<Binary file>>
  
  
  1.1                  avalon-sandbox/avalon-net/csframework/bin/log4net-1-1.dll
  
  	<<Binary file>>
  
  
  1.1                  avalon-sandbox/avalon-net/csframework/bin/log4net-1.0.dll
  
  	<<Binary file>>
  
  
  1.1                  avalon-sandbox/avalon-net/ApacheAvalonPublic.snk
  
  	<<Binary file>>
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org


Mime
View raw message