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/cscontainer/Samples/Web AssemblyInfo.cs Global.asax Global.asax.cs Global.asax.resx Web.config WebAvalon.csproj WebAvalon.csproj.webinfo WebForm1.aspx WebForm1.aspx.cs WebForm1.aspx.resx
Date Sat, 01 Nov 2003 23:47:26 GMT
hammett     2003/11/01 15:47:26

  Modified:    avalon-net/cscontainer/AvalonContainerTest AssemblyInfo.cs
               avalon-net/cscontainer/AvalonContainer AssemblyInfo.cs
                        DefaultContainer.cs
               avalon-net/cscontainer/Samples/Components AssemblyInfo.cs
               avalon-net/cscontainer/bin Apache.Avalon.Container.dll
               avalon-net/csframework/AvalonFrameworkTest AssemblyInfo.cs
               avalon-net/csframework/AvalonFramework AssemblyInfo.cs
  Removed:     avalon-net/cscontainer/AvalonContainerTest
                        AvalonContainerTest.csproj
               avalon-net/cscontainer/AvalonContainer
                        AvalonContainer.csproj
               avalon-net/cscontainer/Samples/Components Components.csproj
               avalon-net/csframework/AvalonFrameworkTest
                        AvalonFrameworkTest.csproj
               avalon-net/csframework/AvalonFramework
                        AvalonFramework.csproj AvalonFramework.sln
               avalon-net/cscontainer/Samples/Web AssemblyInfo.cs
                        Global.asax Global.asax.cs Global.asax.resx
                        Web.config WebAvalon.csproj
                        WebAvalon.csproj.webinfo WebForm1.aspx
                        WebForm1.aspx.cs WebForm1.aspx.resx
  Log:
  Entries removed.
  
  Revision  Changes    Path
  1.2       +0 -45     avalon-sandbox/avalon-net/cscontainer/AvalonContainerTest/AssemblyInfo.cs
  
  Index: AssemblyInfo.cs
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/avalon-net/cscontainer/AvalonContainerTest/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	1 Nov 2003 23:47:25 -0000	1.2
  @@ -49,11 +49,6 @@
   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("AvalonContainerTest")]
   [assembly: AssemblyDescription("Avalon Container Test provides all the test cases for the
container.")]
   [assembly: AssemblyConfiguration("")]
  @@ -62,45 +57,5 @@
   [assembly: AssemblyCopyright("Copyright (c) 2002 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("")]
  
  
  
  1.3       +13 -3     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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- AssemblyInfo.cs	25 Sep 2003 01:42:34 -0000	1.2
  +++ AssemblyInfo.cs	1 Nov 2003 23:47:26 -0000	1.3
  @@ -45,10 +45,20 @@
   // Apache Software Foundation, please see <http://www.apache.org/>.
   // ============================================================================
   
  -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.
//
  +using System.Reflection;
  +using System.Runtime.CompilerServices; 
  +
  +[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("")]		
  +[assembly: AssemblyVersion("1.0.0.0")]
  +
   #if STRONG
  -[assembly: AssemblyDelaySign(false)]
   [assembly: AssemblyKeyFile("../../../../ApacheAvalon.snk")]
   [assembly: AssemblyKeyName("")]
   #endif
  
  
  
  1.5       +7 -7      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.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- DefaultContainer.cs	3 Oct 2003 03:13:14 -0000	1.4
  +++ DefaultContainer.cs	1 Nov 2003 23:47:26 -0000	1.5
  @@ -114,7 +114,7 @@
   	{
   		#region Fields
   		protected ILoggerManager          m_loggerManager;
  -		protected LifecycleManager        m_lifecycleManager;
  +		protected LifecycleManager        m_lifestyleManager;
   		protected Vertex[]                m_shutDownOrder;
   		private ComponentCollection       m_components;
   		private IComponentFactoryManager  m_factoryManager;
  @@ -276,12 +276,12 @@
   		{
   			IConfiguration extensionsConfiguration = 
   				ConfigurationUtil.GetConfiguration( config.ExtensionsNode );
  -			ILogger logger = m_loggerManager["LifecycleManager"];
  +			ILogger logger = m_loggerManager["LifestyleManager"];
   
  -			Type lifecycleManager = typeof( LifecycleManager );
  +			Type lifestyleManager = typeof( LifecycleManager );
   
   			InternalComponentHandler handler = 
  -				new InternalComponentHandler( logger, extensionsConfiguration, lifecycleManager );
  +				new InternalComponentHandler( logger, extensionsConfiguration, lifestyleManager );
   
   			InternalLookupManager lookUpManager = new InternalLookupManager();
   			lookUpManager.Add( typeof(IComponentFactoryManager).FullName, m_factoryManager );
  @@ -289,7 +289,7 @@
   			lookUpManager.Add( "Container", this );
   			handler.LookupManager = lookUpManager;
   
  -			m_lifecycleManager = (LifecycleManager) handler.GetInstance();
  +			m_lifestyleManager = (LifecycleManager) handler.GetInstance();
   		}
   
   		protected virtual void FindComponents(Assembly[] assemblies)
  @@ -353,7 +353,7 @@
   			ComponentEntry entry = new ComponentEntry(
   				attribute, type, dependenciesAttribute);
   
  -			m_lifecycleManager.PrepareComponent( entry );
  +			m_lifestyleManager.PrepareComponent( entry );
   
   			Components.Add(role, entry);
   		}
  @@ -495,7 +495,7 @@
   			{
   				m_baseLogger.Debug("DefaultContainer: Disposing LifecycleManager");
   			}
  -			ContainerUtil.Shutdown(m_lifecycleManager);
  +			ContainerUtil.Shutdown(m_lifestyleManager);
   
   			if (m_baseLogger.IsDebugEnabled)
   			{
  
  
  
  1.2       +0 -45     avalon-sandbox/avalon-net/cscontainer/Samples/Components/AssemblyInfo.cs
  
  Index: AssemblyInfo.cs
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/avalon-net/cscontainer/Samples/Components/AssemblyInfo.cs,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- AssemblyInfo.cs	22 Sep 2003 23:49:24 -0000	1.1
  +++ AssemblyInfo.cs	1 Nov 2003 23:47:26 -0000	1.2
  @@ -48,11 +48,6 @@
   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("")]
   [assembly: AssemblyDescription("")]
   [assembly: AssemblyConfiguration("")]
  @@ -61,45 +56,5 @@
   [assembly: AssemblyCopyright("")]
   [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("")]
  
  
  
  1.6       +49 -49    avalon-sandbox/avalon-net/cscontainer/bin/Apache.Avalon.Container.dll
  
  	<<Binary file>>
  
  
  1.2       +0 -45     avalon-sandbox/avalon-net/csframework/AvalonFrameworkTest/AssemblyInfo.cs
  
  Index: AssemblyInfo.cs
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/avalon-net/csframework/AvalonFrameworkTest/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	1 Nov 2003 23:47:26 -0000	1.2
  @@ -48,11 +48,6 @@
   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("AvalonFrameworkTest")]
   [assembly: AssemblyDescription("Avalon Framework Test provides the NUnit2 tests.")]
   [assembly: AssemblyConfiguration("")]
  @@ -61,45 +56,5 @@
   [assembly: AssemblyCopyright("Copyright (c) 2002 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("")]
  
  
  
  1.3       +0 -43     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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- AssemblyInfo.cs	25 Sep 2003 01:42:34 -0000	1.2
  +++ AssemblyInfo.cs	1 Nov 2003 23:47:26 -0000	1.3
  @@ -48,11 +48,6 @@
   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("AvalonFramework")]
   [assembly: AssemblyDescription("Avalon Framework defines the lifecycle interfaces and contracts
that all components must obey.")]
   [assembly: AssemblyConfiguration("")]
  @@ -61,45 +56,7 @@
   [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)]
  
  
  

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


Mime
View raw message