bloritsch 2003/06/24 05:18:27
Modified: csframework build.xml
csframework/src/cs AssemblyInfo.cs
csframework/src/cs/Activity IDisposable.cs IExecutable.cs
IInitializable.cs IStartable.cs ISuspendable.cs
csframework/src/cs/Configuration AbstractConfiguration.cs
ConfigurationCollection.cs
ConfigurationException.cs DefaultConfiguration.cs
DefaultConfigurationSectionHandler.cs
DefaultConfigurationSerializer.cs IConfigurable.cs
IConfiguration.cs IReconfigurable.cs
csframework/src/cs/Context ContextException.cs
DefaultContext.cs IContext.cs IContextualizable.cs
IRecontextualizable.cs IResolvable.cs
csframework/src/cs/Logger AbstractLogEnabled.cs
ConsoleLogger.cs DiagnosticsLogger.cs
ILogEnabled.cs ILogger.cs Log4netLogger.cs
NullLogger.cs
csframework/src/cs/Parameters IParameterizable.cs
IReparameterizable.cs ParameterException.cs
Parameters.cs
csframework/src/cs/Service DefaultServiceManager.cs
DefaultServiceSelector.cs IServiceManager.cs
IServiceSelector.cs IServiceable.cs
ServiceException.cs
csframework/src/cs/Util ContainerUtil.cs Converter.cs
RuntimeSerializer.cs
Log:
update csframework by migrating to new namespace and adding a little meat to the
build file
Revision Changes Path
1.2 +15 -1 avalon-sandbox/csframework/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/csframework/build.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build.xml 23 Jun 2003 21:00:10 -0000 1.1
+++ build.xml 24 Jun 2003 12:18:23 -0000 1.2
@@ -1,2 +1,16 @@
-<project name="Avalon Framework - C#">
+<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}.dll"/>
+ <property name="build.debug" value="true"/>
+ <property name="build.optimize" value="false"/>
+
+ <target name="build">
+ <csc srcdir="src/cs"
+ targettype="library"
+ outputfile="${library.name}"
+ debug="${build.debug}"
+ optimize="${build.optimize}"
+ references="bin/log4net.dll"/>
+ </target>
</project>
1.6 +4 -4 avalon-sandbox/csframework/src/cs/AssemblyInfo.cs
Index: AssemblyInfo.cs
===================================================================
RCS file: /home/cvs/avalon-sandbox/csframework/src/cs/AssemblyInfo.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- AssemblyInfo.cs 8 Mar 2003 12:06:11 -0000 1.5
+++ AssemblyInfo.cs 24 Jun 2003 12:18:24 -0000 1.6
@@ -54,11 +54,11 @@
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
//
-[assembly: AssemblyTitle("Avalon")]
-[assembly: AssemblyDescription("")]
+[assembly: AssemblyTitle("AvalonFramework")]
+[assembly: AssemblyDescription("Avalon Framework defines the lifecycle interfaces
and contracts that all components must obey.")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("Apache Software Foundation")]
-[assembly: AssemblyProduct("Avalon")]
+[assembly: AssemblyProduct("Avalon Framework")]
[assembly: AssemblyCopyright("Copyright (c) 2002 Apache Software Foundation")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
@@ -74,7 +74,7 @@
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("0.1")]
+[assembly: AssemblyVersion("1.0.*")]
//
// In order to sign your assembly you must specify a key to use. Refer to the
1.7 +1 -1 avalon-sandbox/csframework/src/cs/Activity/IDisposable.cs
Index: IDisposable.cs
===================================================================
RCS file: /home/cvs/avalon-sandbox/csframework/src/cs/Activity/IDisposable.cs,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- IDisposable.cs 8 Mar 2003 12:06:12 -0000 1.6
+++ IDisposable.cs 24 Jun 2003 12:18:24 -0000 1.7
@@ -48,7 +48,7 @@
using System;
-namespace Apache.Avalon.Activity
+namespace Apache.Avalon.Framework.Activity
{
/// <summary>
/// The IDisposable interface is used when components need to
1.7 +1 -1 avalon-sandbox/csframework/src/cs/Activity/IExecutable.cs
Index: IExecutable.cs
===================================================================
RCS file: /home/cvs/avalon-sandbox/csframework/src/cs/Activity/IExecutable.cs,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- IExecutable.cs 8 Mar 2003 12:06:12 -0000 1.6
+++ IExecutable.cs 24 Jun 2003 12:18:24 -0000 1.7
@@ -48,7 +48,7 @@
using System;
-namespace Apache.Avalon.Activity
+namespace Apache.Avalon.Framework.Activity
{
/// <summary>
/// The <see cref="IExecutable"/> can be implemented by components
1.7 +1 -1 avalon-sandbox/csframework/src/cs/Activity/IInitializable.cs
Index: IInitializable.cs
===================================================================
RCS file: /home/cvs/avalon-sandbox/csframework/src/cs/Activity/IInitializable.cs,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- IInitializable.cs 8 Mar 2003 12:06:12 -0000 1.6
+++ IInitializable.cs 24 Jun 2003 12:18:24 -0000 1.7
@@ -48,7 +48,7 @@
using System;
-namespace Apache.Avalon.Activity
+namespace Apache.Avalon.Framework.Activity
{
/// <summary>
/// The <see cref="IInitializable"/> interface is used by components
1.7 +1 -1 avalon-sandbox/csframework/src/cs/Activity/IStartable.cs
Index: IStartable.cs
===================================================================
RCS file: /home/cvs/avalon-sandbox/csframework/src/cs/Activity/IStartable.cs,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- IStartable.cs 8 Mar 2003 12:06:12 -0000 1.6
+++ IStartable.cs 24 Jun 2003 12:18:24 -0000 1.7
@@ -48,7 +48,7 @@
using System;
-namespace Apache.Avalon.Activity
+namespace Apache.Avalon.Framework.Activity
{
/// <summary>
/// The <see cref="IStartable"/> interface is used when components need to
1.7 +1 -1 avalon-sandbox/csframework/src/cs/Activity/ISuspendable.cs
Index: ISuspendable.cs
===================================================================
RCS file: /home/cvs/avalon-sandbox/csframework/src/cs/Activity/ISuspendable.cs,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ISuspendable.cs 8 Mar 2003 12:06:12 -0000 1.6
+++ ISuspendable.cs 24 Jun 2003 12:18:24 -0000 1.7
@@ -48,7 +48,7 @@
using System;
-namespace Apache.Avalon.Activity
+namespace Apache.Avalon.Framework.Activity
{
/// <summary>
/// The <see cref="ISuspendable"/> interface is used when a component
1.8 +37 -37
avalon-sandbox/csframework/src/cs/Configuration/AbstractConfiguration.cs
Index: AbstractConfiguration.cs
===================================================================
RCS file:
/home/cvs/avalon-sandbox/csframework/src/cs/Configuration/AbstractConfiguration.cs,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- AbstractConfiguration.cs 8 Mar 2003 12:06:12 -0000 1.7
+++ AbstractConfiguration.cs 24 Jun 2003 12:18:24 -0000 1.8
@@ -1,34 +1,34 @@
// ============================================================================
// 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
+//
+// 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
@@ -39,9 +39,9 @@
// 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
+// on behalf of the Apache Software Foundation. For more information on the
// Apache Software Foundation, please see <http://www.apache.org/>.
// ============================================================================
@@ -49,13 +49,13 @@
using System;
using System.Collections;
-using Apache.Avalon.Util;
+using Apache.Avalon.Framework.Util;
-namespace Apache.Avalon.Configuration
+namespace Apache.Avalon.Framework.Configuration
{
/// <summary>
/// This is an abstract <see cref="IConfiguration"/> implementation
- /// that deals with methods that can be abstracted away
+ /// that deals with methods that can be abstracted away
/// from underlying implementations.
/// </summary>
public abstract class AbstractConfiguration: IConfiguration
@@ -75,7 +75,7 @@
/// <value>
/// <see langword="true"> if the <see cref="IConfiguration"/> is
read-only;
/// otherwise, <see langword="false">.
- /// </value>
+ /// </value>
public bool IsReadOnly
{
get
@@ -89,7 +89,7 @@
/// </summary>
/// <value>
/// The Name of the <see cref="IConfiguration"/>.
- /// </value>
+ /// </value>
public string Name
{
get
@@ -109,7 +109,7 @@
/// </summary>
/// <value>
/// A String describing location of the <see cref="IConfiguration"/>.
- /// </value>
+ /// </value>
public string Location
{
get
@@ -129,7 +129,7 @@
/// </summary>
/// <value>
/// The Value of the <see cref="IConfiguration"/>.
- /// </value>
+ /// </value>
public string Value
{
get
@@ -203,7 +203,7 @@
return children;
}
- set
+ set
{
CheckReadOnly();
@@ -241,21 +241,21 @@
/// Gets a <see cref="IConfiguration"/> instance encapsulating the
specified
/// child node.
/// </summary>
- /// <param name="child">The Name of the child node.</param>
+ /// <param name="child">The Name of the child node.</param>
/// <returns>
/// The <see cref="IConfiguration"/> instance encapsulating the
specified
- /// child node.
- /// </returns>
+ /// child node.
+ /// </returns>
public IConfiguration GetChild(string child)
{
return GetChild(child, false);
}
-
+
/// <summary>
/// Gets a <see cref="IConfiguration"/> instance encapsulating the
specified
/// child node.
/// </summary>
- /// <param name="child">The Name of the child node.</param>
+ /// <param name="child">The Name of the child node.</param>
/// <param name="createNew">
/// If <see langword="true"/>, a new <see cref="IConfiguration"/>
/// will be created and returned if the specified child does not exist.
@@ -264,22 +264,22 @@
/// </param>
/// <returns>
/// The <see cref="IConfiguration"/> instance encapsulating the
specified
- /// child node.
- /// </returns>
+ /// child node.
+ /// </returns>
public abstract IConfiguration GetChild(string child, bool createNew);
/// <summary>
/// Return an <see cref="ConfigurationCollection"/> of <see
cref="IConfiguration"/>
/// elements containing all node children with the specified name.
/// </summary>
- /// <param name="name">The Name of the children to get.</param>
+ /// <param name="name">The Name of the children to get.</param>
/// <returns>
/// All node children with the specified name
- /// </returns>
+ /// </returns>
public abstract ConfigurationCollection GetChildren(string name);
/// <summary>
- /// Gets the value of the node and converts it
+ /// Gets the value of the node and converts it
/// into specified <see cref="System.Type"/>.
/// </summary>
/// <param name="type">The <see cref="System.Type"/></param>
@@ -291,9 +291,9 @@
{
return GetValue(type, null);
}
-
+
/// <summary>
- /// Gets the value of the node and converts it
+ /// Gets the value of the node and converts it
/// into specified <see cref="System.Type"/>.
/// </summary>
/// <param name="type">The <see cref="System.Type"/></param>
@@ -306,10 +306,10 @@
return Converter.ChangeType(Value, type, defaultValue);
}
-
+
/// <summary>
/// Gets the value of specified attribute and
- /// converts it into specified <see cref="System.Type"/>.
+ /// converts it into specified <see cref="System.Type"/>.
/// </summary>
/// <param name="name">The Name of the attribute you ask the value
of.</param>
/// <param name="type">The <see cref="System.Type"/></param>
@@ -325,7 +325,7 @@
/// <summary>
/// Gets the value of specified attribute and
- /// converts it into specified <see cref="System.Type"/>.
+ /// converts it into specified <see cref="System.Type"/>.
/// </summary>
/// <param name="name">The Name of the attribute you ask the value
of.</param>
/// <param name="type">The <see cref="System.Type"/></param>
@@ -346,7 +346,7 @@
{
readOnly = true;
}
-
+
/// <summary>
/// Check whether this node is readonly or not.
/// </summary>
1.9 +1 -1
avalon-sandbox/csframework/src/cs/Configuration/ConfigurationCollection.cs
Index: ConfigurationCollection.cs
===================================================================
RCS file:
/home/cvs/avalon-sandbox/csframework/src/cs/Configuration/ConfigurationCollection.cs,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ConfigurationCollection.cs 8 Mar 2003 12:06:12 -0000 1.8
+++ ConfigurationCollection.cs 24 Jun 2003 12:18:24 -0000 1.9
@@ -49,7 +49,7 @@
using System;
using System.Collections;
-namespace Apache.Avalon.Configuration
+namespace Apache.Avalon.Framework.Configuration
{
/// <summary>
/// A collection of <see cref="IConfiguration"/> objects.
1.8 +1 -1
avalon-sandbox/csframework/src/cs/Configuration/ConfigurationException.cs
Index: ConfigurationException.cs
===================================================================
RCS file:
/home/cvs/avalon-sandbox/csframework/src/cs/Configuration/ConfigurationException.cs,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ConfigurationException.cs 8 Mar 2003 12:06:12 -0000 1.7
+++ ConfigurationException.cs 24 Jun 2003 12:18:24 -0000 1.8
@@ -49,7 +49,7 @@
using System;
using System.Runtime.Serialization;
-namespace Apache.Avalon.Configuration
+namespace Apache.Avalon.Framework.Configuration
{
/// <summary>
/// Thrown when a <see cref="IConfigurable"/> component cannot be configured
1.7 +33 -33
avalon-sandbox/csframework/src/cs/Configuration/DefaultConfiguration.cs
Index: DefaultConfiguration.cs
===================================================================
RCS file:
/home/cvs/avalon-sandbox/csframework/src/cs/Configuration/DefaultConfiguration.cs,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DefaultConfiguration.cs 8 Mar 2003 12:06:12 -0000 1.6
+++ DefaultConfiguration.cs 24 Jun 2003 12:18:24 -0000 1.7
@@ -1,34 +1,34 @@
// ============================================================================
// 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
+//
+// 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
@@ -39,9 +39,9 @@
// 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
+// on behalf of the Apache Software Foundation. For more information on the
// Apache Software Foundation, please see <http://www.apache.org/>.
// ============================================================================
@@ -50,9 +50,9 @@
using System.Collections;
using System.Runtime.Serialization;
-using Apache.Avalon.Util;
+using Apache.Avalon.Framework.Util;
-namespace Apache.Avalon.Configuration
+namespace Apache.Avalon.Framework.Configuration
{
/// <summary>
/// This is the default <see cref="IConfiguration"/> implementation.
@@ -110,21 +110,21 @@
{
Name = info.GetString(SERIAL_NAME_NAME);
Location = info.GetString(SERIAL_NAME_LOCATION);
- Namespace = info.GetString(SERIAL_NAME_NAMESPACE);
+ Namespace = info.GetString(SERIAL_NAME_NAMESPACE);
Prefix = info.GetString(SERIAL_NAME_PREFIX);
- Value = info.GetString(SERIAL_NAME_VALUE);
+ Value = info.GetString(SERIAL_NAME_VALUE);
+
+ Attributes = new
Hashtable(RuntimeSerializer.DeserializeIDictionary(info,
+ SERIAL_NAME_ATTRIBUTE_KEYS,
SERIAL_NAME_ATTRIBUTE_VALUES));
- Attributes = new
Hashtable(RuntimeSerializer.DeserializeIDictionary(info,
- SERIAL_NAME_ATTRIBUTE_KEYS,
SERIAL_NAME_ATTRIBUTE_VALUES));
-
foreach (IConfiguration config in
RuntimeSerializer.DeserializeArray(info, SERIAL_NAME_CHILDREN))
{
Children.Add((IConfiguration) config);
}
bool readOnlyMode = info.GetBoolean(SERIAL_NAME_READ_ONLY);
-
+
if (readOnlyMode)
{
MakeReadOnly();
@@ -135,7 +135,7 @@
/// Gets an <see cref="IConfiguration"/> instance encapsulating
the specified
/// child node.
/// </summary>
- /// <param name="name">The Name of the child node.</param>
+ /// <param name="name">The Name of the child node.</param>
/// <param name="createNew">
/// If <see langword="true"/>, a new <see cref="IConfiguration"/>
/// will be created and returned if the specified child does not exist.
@@ -144,12 +144,12 @@
/// </param>
/// <returns>
/// The <see cref="IConfiguration"/> instance encapsulating the
specified child node.
- /// </returns>
+ /// </returns>
public override IConfiguration GetChild(string name, bool createNew )
{
IConfiguration result = null;
-
- if (Children.Count != 0)
+
+ if (Children.Count != 0)
{
foreach (IConfiguration configuration in Children)
@@ -176,11 +176,11 @@
/// Return a collection of <see cref="IConfiguration"/>
/// elements containing all node children with the specified name.
/// </summary>
- /// <param name="name">The Name of the children to get.</param>
+ /// <param name="name">The Name of the children to get.</param>
/// <returns>
- /// The collection of <see cref="IConfiguration"/> children of
+ /// The collection of <see cref="IConfiguration"/> children of
/// this associated with the given name.
- /// </returns>
+ /// </returns>
public override ConfigurationCollection GetChildren(string name)
{
ConfigurationCollection result = new ConfigurationCollection();
@@ -197,7 +197,7 @@
}
/// <summary>
- /// Populates a <see cref="SerializationInfo"/> with the data needed
+ /// Populates a <see cref="SerializationInfo"/> with the data needed
/// to serialize the target object.
/// </summary>
/// <param name="info">The <see cref="SerializationInfo"/> to populate
with data.</param>
@@ -210,13 +210,13 @@
info.AddValue(SERIAL_NAME_PREFIX, Prefix);
info.AddValue(SERIAL_NAME_VALUE, Value);
-
+
info.AddValue(SERIAL_NAME_READ_ONLY, IsReadOnly);
-
- RuntimeSerializer.SerializeIDictionary(info, Attributes,
+
+ RuntimeSerializer.SerializeIDictionary(info, Attributes,
SERIAL_NAME_ATTRIBUTE_KEYS,
SERIAL_NAME_ATTRIBUTE_VALUES);
- RuntimeSerializer.SerializeICollection(info, Children,
SERIAL_NAME_CHILDREN);
+ RuntimeSerializer.SerializeICollection(info, Children,
SERIAL_NAME_CHILDREN);
}
}
}
1.7 +1 -1
avalon-sandbox/csframework/src/cs/Configuration/DefaultConfigurationSectionHandler.cs
Index: DefaultConfigurationSectionHandler.cs
===================================================================
RCS file:
/home/cvs/avalon-sandbox/csframework/src/cs/Configuration/DefaultConfigurationSectionHandler.cs,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DefaultConfigurationSectionHandler.cs 8 Mar 2003 12:06:12 -0000 1.6
+++ DefaultConfigurationSectionHandler.cs 24 Jun 2003 12:18:24 -0000 1.7
@@ -51,7 +51,7 @@
using System.Configuration;
using System.Xml;
-namespace Apache.Avalon.Configuration
+namespace Apache.Avalon.Framework.Configuration
{
/// <summary>
/// This section handler interprets and processes the settings defined in XML
tags
1.12 +1 -1
avalon-sandbox/csframework/src/cs/Configuration/DefaultConfigurationSerializer.cs
Index: DefaultConfigurationSerializer.cs
===================================================================
RCS file:
/home/cvs/avalon-sandbox/csframework/src/cs/Configuration/DefaultConfigurationSerializer.cs,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- DefaultConfigurationSerializer.cs 8 Mar 2003 12:06:12 -0000 1.11
+++ DefaultConfigurationSerializer.cs 24 Jun 2003 12:18:24 -0000 1.12
@@ -51,7 +51,7 @@
using System.IO;
using System.Xml;
-namespace Apache.Avalon.Configuration
+namespace Apache.Avalon.Framework.Configuration
{
/// <summary>
/// A Serializer/Deserializer of a <see cref="DefaultConfiguration"/>.
1.7 +1 -1 avalon-sandbox/csframework/src/cs/Configuration/IConfigurable.cs
Index: IConfigurable.cs
===================================================================
RCS file:
/home/cvs/avalon-sandbox/csframework/src/cs/Configuration/IConfigurable.cs,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- IConfigurable.cs 8 Mar 2003 12:06:12 -0000 1.6
+++ IConfigurable.cs 24 Jun 2003 12:18:24 -0000 1.7
@@ -48,7 +48,7 @@
using System;
-namespace Apache.Avalon.Configuration
+namespace Apache.Avalon.Framework.Configuration
{
/// <summary>
/// This interface should be implemented by classes that need to be
1.8 +1 -1
avalon-sandbox/csframework/src/cs/Configuration/IConfiguration.cs
Index: IConfiguration.cs
===================================================================
RCS file:
/home/cvs/avalon-sandbox/csframework/src/cs/Configuration/IConfiguration.cs,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- IConfiguration.cs 8 Mar 2003 12:06:12 -0000 1.7
+++ IConfiguration.cs 24 Jun 2003 12:18:24 -0000 1.8
@@ -49,7 +49,7 @@
using System;
using System.Collections;
-namespace Apache.Avalon.Configuration
+namespace Apache.Avalon.Framework.Configuration
{
/// <summary>
/// <see cref="IConfiguration"/> is a interface encapsulating a configuration
node
1.7 +1 -1
avalon-sandbox/csframework/src/cs/Configuration/IReconfigurable.cs
Index: IReconfigurable.cs
===================================================================
RCS file:
/home/cvs/avalon-sandbox/csframework/src/cs/Configuration/IReconfigurable.cs,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- IReconfigurable.cs 8 Mar 2003 12:06:12 -0000 1.6
+++ IReconfigurable.cs 24 Jun 2003 12:18:24 -0000 1.7
@@ -48,7 +48,7 @@
using System;
-namespace Apache.Avalon.Configuration
+namespace Apache.Avalon.Framework.Configuration
{
/// <summary>
/// Extends <see cref="IConfigurable"/> to allow reconfiguration at runtime.
1.8 +1 -1 avalon-sandbox/csframework/src/cs/Context/ContextException.cs
Index: ContextException.cs
===================================================================
RCS file: /home/cvs/avalon-sandbox/csframework/src/cs/Context/ContextException.cs,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ContextException.cs 8 Mar 2003 12:06:13 -0000 1.7
+++ ContextException.cs 24 Jun 2003 12:18:25 -0000 1.8
@@ -49,7 +49,7 @@
using System;
using System.Runtime.Serialization;
-namespace Apache.Avalon.Context
+namespace Apache.Avalon.Framework.Context
{
/// <summary>
/// The Exception signalling a badly formed IContext.
1.9 +2 -2 avalon-sandbox/csframework/src/cs/Context/DefaultContext.cs
Index: DefaultContext.cs
===================================================================
RCS file: /home/cvs/avalon-sandbox/csframework/src/cs/Context/DefaultContext.cs,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- DefaultContext.cs 8 Mar 2003 12:06:13 -0000 1.8
+++ DefaultContext.cs 24 Jun 2003 12:18:25 -0000 1.9
@@ -50,9 +50,9 @@
using System.Collections;
using System.Runtime.Serialization;
-using Apache.Avalon.Util;
+using Apache.Avalon.Framework.Util;
-namespace Apache.Avalon.Context
+namespace Apache.Avalon.Framework.Context
{
/// <summary>
/// Default implementation of IContext.
1.6 +1 -1 avalon-sandbox/csframework/src/cs/Context/IContext.cs
Index: IContext.cs
===================================================================
RCS file: /home/cvs/avalon-sandbox/csframework/src/cs/Context/IContext.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- IContext.cs 8 Mar 2003 12:06:13 -0000 1.5
+++ IContext.cs 24 Jun 2003 12:18:25 -0000 1.6
@@ -48,7 +48,7 @@
using System;
-namespace Apache.Avalon.Context
+namespace Apache.Avalon.Framework.Context
{
/// <summary>
/// The context is the interface through which the Component
1.6 +1 -1 avalon-sandbox/csframework/src/cs/Context/IContextualizable.cs
Index: IContextualizable.cs
===================================================================
RCS file: /home/cvs/avalon-sandbox/csframework/src/cs/Context/IContextualizable.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- IContextualizable.cs 8 Mar 2003 12:06:13 -0000 1.5
+++ IContextualizable.cs 24 Jun 2003 12:18:25 -0000 1.6
@@ -48,7 +48,7 @@
using System;
-namespace Apache.Avalon.Context
+namespace Apache.Avalon.Framework.Context
{
/// <summary>
/// This inteface should be implemented by components that need
1.6 +1 -1 avalon-sandbox/csframework/src/cs/Context/IRecontextualizable.cs
Index: IRecontextualizable.cs
===================================================================
RCS file:
/home/cvs/avalon-sandbox/csframework/src/cs/Context/IRecontextualizable.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- IRecontextualizable.cs 8 Mar 2003 12:06:13 -0000 1.5
+++ IRecontextualizable.cs 24 Jun 2003 12:18:25 -0000 1.6
@@ -48,7 +48,7 @@
using System;
-namespace Apache.Avalon.Context
+namespace Apache.Avalon.Framework.Context
{
/// <summary>
/// Extends IContextualizable to allow recontextualizing.
1.6 +1 -1 avalon-sandbox/csframework/src/cs/Context/IResolvable.cs
Index: IResolvable.cs
===================================================================
RCS file: /home/cvs/avalon-sandbox/csframework/src/cs/Context/IResolvable.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- IResolvable.cs 8 Mar 2003 12:06:13 -0000 1.5
+++ IResolvable.cs 24 Jun 2003 12:18:25 -0000 1.6
@@ -48,7 +48,7 @@
using System;
-namespace Apache.Avalon.Context
+namespace Apache.Avalon.Framework.Context
{
/// <summary>
/// This interface is used to indicate objects that need to be
1.6 +1 -1 avalon-sandbox/csframework/src/cs/Logger/AbstractLogEnabled.cs
Index: AbstractLogEnabled.cs
===================================================================
RCS file: /home/cvs/avalon-sandbox/csframework/src/cs/Logger/AbstractLogEnabled.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- AbstractLogEnabled.cs 8 Mar 2003 12:06:13 -0000 1.5
+++ AbstractLogEnabled.cs 24 Jun 2003 12:18:25 -0000 1.6
@@ -48,7 +48,7 @@
using System;
-namespace Apache.Avalon.Logger
+namespace Apache.Avalon.Framework.Logger
{
/// <summary>
/// The Utility class to allow construction of easy components
1.6 +1 -1 avalon-sandbox/csframework/src/cs/Logger/ConsoleLogger.cs
Index: ConsoleLogger.cs
===================================================================
RCS file: /home/cvs/avalon-sandbox/csframework/src/cs/Logger/ConsoleLogger.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ConsoleLogger.cs 8 Mar 2003 12:06:14 -0000 1.5
+++ ConsoleLogger.cs 24 Jun 2003 12:18:25 -0000 1.6
@@ -48,7 +48,7 @@
using System;
-namespace Apache.Avalon.Logger
+namespace Apache.Avalon.Framework.Logger
{
/// <summary>
/// The Logger sending everything to the standard output streams.
1.5 +1 -1 avalon-sandbox/csframework/src/cs/Logger/DiagnosticsLogger.cs
Index: DiagnosticsLogger.cs
===================================================================
RCS file: /home/cvs/avalon-sandbox/csframework/src/cs/Logger/DiagnosticsLogger.cs,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DiagnosticsLogger.cs 8 Mar 2003 12:06:14 -0000 1.4
+++ DiagnosticsLogger.cs 24 Jun 2003 12:18:25 -0000 1.5
@@ -49,7 +49,7 @@
using System;
using System.Diagnostics;
-namespace Apache.Avalon.Logger
+namespace Apache.Avalon.Framework.Logger
{
/// <summary>
/// The Logger using standart Diagnostics namespace.
1.6 +1 -1 avalon-sandbox/csframework/src/cs/Logger/ILogEnabled.cs
Index: ILogEnabled.cs
===================================================================
RCS file: /home/cvs/avalon-sandbox/csframework/src/cs/Logger/ILogEnabled.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ILogEnabled.cs 8 Mar 2003 12:06:14 -0000 1.5
+++ ILogEnabled.cs 24 Jun 2003 12:18:25 -0000 1.6
@@ -48,7 +48,7 @@
using System;
-namespace Apache.Avalon.Logger
+namespace Apache.Avalon.Framework.Logger
{
/// <summary>
/// Components that need to log can implement this interface to
1.6 +1 -1 avalon-sandbox/csframework/src/cs/Logger/ILogger.cs
Index: ILogger.cs
===================================================================
RCS file: /home/cvs/avalon-sandbox/csframework/src/cs/Logger/ILogger.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ILogger.cs 8 Mar 2003 12:06:14 -0000 1.5
+++ ILogger.cs 24 Jun 2003 12:18:25 -0000 1.6
@@ -48,7 +48,7 @@
using System;
-namespace Apache.Avalon.Logger
+namespace Apache.Avalon.Framework.Logger
{
/// <summary>
/// This is a facade for the different logging subsystems.
1.6 +1 -1 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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Log4netLogger.cs 8 Mar 2003 12:06:14 -0000 1.5
+++ Log4netLogger.cs 24 Jun 2003 12:18:25 -0000 1.6
@@ -49,7 +49,7 @@
using System;
using log4net;
-namespace Apache.Avalon.Logger
+namespace Apache.Avalon.Framework.Logger
{
/// <summary>
/// The default log4net wrapper class for Logger.
1.6 +1 -1 avalon-sandbox/csframework/src/cs/Logger/NullLogger.cs
Index: NullLogger.cs
===================================================================
RCS file: /home/cvs/avalon-sandbox/csframework/src/cs/Logger/NullLogger.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- NullLogger.cs 8 Mar 2003 12:06:15 -0000 1.5
+++ NullLogger.cs 24 Jun 2003 12:18:25 -0000 1.6
@@ -48,7 +48,7 @@
using System;
-namespace Apache.Avalon.Logger
+namespace Apache.Avalon.Framework.Logger
{
/// <summary>
/// The Null Logger class. This is useful for implementations where you
need
1.7 +1 -1 avalon-sandbox/csframework/src/cs/Parameters/IParameterizable.cs
Index: IParameterizable.cs
===================================================================
RCS file:
/home/cvs/avalon-sandbox/csframework/src/cs/Parameters/IParameterizable.cs,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- IParameterizable.cs 8 Mar 2003 12:06:15 -0000 1.6
+++ IParameterizable.cs 24 Jun 2003 12:18:26 -0000 1.7
@@ -48,7 +48,7 @@
using System;
-namespace Apache.Avalon.Parameter
+namespace Apache.Avalon.Framework.Parameter
{
/// <summary>
/// Components should implement this interface if they wish to
1.7 +1 -1
avalon-sandbox/csframework/src/cs/Parameters/IReparameterizable.cs
Index: IReparameterizable.cs
===================================================================
RCS file:
/home/cvs/avalon-sandbox/csframework/src/cs/Parameters/IReparameterizable.cs,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- IReparameterizable.cs 8 Mar 2003 12:06:15 -0000 1.6
+++ IReparameterizable.cs 24 Jun 2003 12:18:26 -0000 1.7
@@ -48,7 +48,7 @@
using System;
-namespace Apache.Avalon.Parameter
+namespace Apache.Avalon.Framework.Parameter
{
/// <summary>
/// Components should implement this interface if they wish to
1.8 +1 -1
avalon-sandbox/csframework/src/cs/Parameters/ParameterException.cs
Index: ParameterException.cs
===================================================================
RCS file:
/home/cvs/avalon-sandbox/csframework/src/cs/Parameters/ParameterException.cs,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ParameterException.cs 8 Mar 2003 12:06:15 -0000 1.7
+++ ParameterException.cs 24 Jun 2003 12:18:26 -0000 1.8
@@ -49,7 +49,7 @@
using System;
using System.Runtime.Serialization;
-namespace Apache.Avalon.Parameter
+namespace Apache.Avalon.Framework.Parameter
{
/// <summary>
/// Thrown when a <see cref="IParameterizable"/> component cannot be
parameterized
1.11 +35 -35 avalon-sandbox/csframework/src/cs/Parameters/Parameters.cs
Index: Parameters.cs
===================================================================
RCS file: /home/cvs/avalon-sandbox/csframework/src/cs/Parameters/Parameters.cs,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Parameters.cs 8 Mar 2003 12:06:15 -0000 1.10
+++ Parameters.cs 24 Jun 2003 12:18:26 -0000 1.11
@@ -1,34 +1,34 @@
// ============================================================================
// 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
+//
+// 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
@@ -39,20 +39,20 @@
// 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
+// on behalf of the Apache Software Foundation. For more information on the
// Apache Software Foundation, please see <http://www.apache.org/>.
// ============================================================================
using System;
-using System.Collections;
-using System.Runtime.Serialization;
+using System.Collections;
+using System.Runtime.Serialization;
-using Apache.Avalon.Util;
+using Apache.Avalon.Framework.Util;
-namespace Apache.Avalon.Parameter
+namespace Apache.Avalon.Framework.Parameter
{
/// <summary>
/// The Parameters represents a set of key-value pairs.
@@ -60,16 +60,16 @@
/// </summary>
/// <remarks>
/// Note, this class is not thread safe by default.
- /// If you require thread safety please synchronize
+ /// If you require thread safety please synchronize
/// write access to this class to prevent potential data corruption.
- /// </remarks>
+ /// </remarks>
[Serializable]
public class Parameters: IEnumerable, ISerializable
{
private const string SERIAL_NAME_KEYS = "keys";
private const string SERIAL_NAME_VALUES = "values";
private const string SERIAL_NAME_READ_ONLY = "read-only";
-
+
private bool readOnly;
private Hashtable parameters = new Hashtable();
@@ -97,11 +97,11 @@
/// <param name="context"></param>
public Parameters (SerializationInfo info, StreamingContext context)
{
- parameters = new
Hashtable(RuntimeSerializer.DeserializeIDictionary(info,
+ parameters = new
Hashtable(RuntimeSerializer.DeserializeIDictionary(info,
SERIAL_NAME_KEYS, SERIAL_NAME_VALUES));
bool readOnlyMode = info.GetBoolean(SERIAL_NAME_READ_ONLY);
-
+
if (readOnlyMode)
{
MakeReadOnly();
@@ -131,9 +131,9 @@
{
get
{
- return this[name, null];
+ return this[name, null];
}
- set
+ set
{
CheckReadOnly();
@@ -143,17 +143,17 @@
{
parameters.Remove(name);
}
- else
+ else
{
- parameters[name] = value;
+ parameters[name] = value;
}
}
-
+
}
}
/// <summary>
- /// Gets the parameter with the specified name and
+ /// Gets the parameter with the specified name and
/// converts it into specified <see cref="System.Type"/>.
/// </summary>
/// <param name="name">The Parameter name</param>
@@ -169,16 +169,16 @@
return this[name, type, null];
}
}
-
+
/// <summary>
- /// Gets the parameter with the specified name and
+ /// Gets the parameter with the specified name and
/// converts it into specified <see cref="System.Type"/>.
/// </summary>
/// <param name="name">The Parameter name</param>
/// <param name="type">The <see cref="System.Type"/></param>
/// <param name="defaultValue">
/// The defaultValue returned if the parameter has wrong type.
- /// </param>
+ /// </param>
/// <value>The parameter value converted into the specified
type.</value>
/// <exception cref="ParameterException">
/// If the name of the parameter is incorrect.
@@ -203,7 +203,7 @@
}
}
-
+
/// <summary>
/// Removes the parameter with the specified name.
/// </summary>
@@ -253,7 +253,7 @@
parameters[entry.Key] = entry.Value;
}
}
-
+
/// <summary>
/// Returns an <see cref="IDictionaryEnumerator"/> that can iterate
through the parameters.
/// </summary>
@@ -267,12 +267,12 @@
{
get
{
- return parameters.Count;
+ return parameters.Count;
}
}
/// <summary>
- ///
+ ///
/// </summary>
/// <param name="info"></param>
/// <param name="context"></param>
1.7 +1 -1
avalon-sandbox/csframework/src/cs/Service/DefaultServiceManager.cs
Index: DefaultServiceManager.cs
===================================================================
RCS file:
/home/cvs/avalon-sandbox/csframework/src/cs/Service/DefaultServiceManager.cs,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DefaultServiceManager.cs 8 Mar 2003 12:06:17 -0000 1.6
+++ DefaultServiceManager.cs 24 Jun 2003 12:18:26 -0000 1.7
@@ -50,7 +50,7 @@
using System.Collections;
using System.Text;
-namespace Apache.Avalon.Service
+namespace Apache.Avalon.Framework.Service
{
/// <summary>
1.7 +1 -1
avalon-sandbox/csframework/src/cs/Service/DefaultServiceSelector.cs
Index: DefaultServiceSelector.cs
===================================================================
RCS file:
/home/cvs/avalon-sandbox/csframework/src/cs/Service/DefaultServiceSelector.cs,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DefaultServiceSelector.cs 8 Mar 2003 12:06:17 -0000 1.6
+++ DefaultServiceSelector.cs 24 Jun 2003 12:18:26 -0000 1.7
@@ -50,7 +50,7 @@
using System.Collections;
using System.Text;
-namespace Apache.Avalon.Service
+namespace Apache.Avalon.Framework.Service
{
/// <summary>
1.6 +1 -1 avalon-sandbox/csframework/src/cs/Service/IServiceManager.cs
Index: IServiceManager.cs
===================================================================
RCS file: /home/cvs/avalon-sandbox/csframework/src/cs/Service/IServiceManager.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- IServiceManager.cs 8 Mar 2003 12:06:17 -0000 1.5
+++ IServiceManager.cs 24 Jun 2003 12:18:26 -0000 1.6
@@ -48,7 +48,7 @@
using System;
-namespace Apache.Avalon.Service
+namespace Apache.Avalon.Framework.Service
{
/// <summary>
/// A <c>IServiceManager</c> selects components based on a
1.7 +1 -1 avalon-sandbox/csframework/src/cs/Service/IServiceSelector.cs
Index: IServiceSelector.cs
===================================================================
RCS file: /home/cvs/avalon-sandbox/csframework/src/cs/Service/IServiceSelector.cs,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- IServiceSelector.cs 8 Mar 2003 12:06:17 -0000 1.6
+++ IServiceSelector.cs 24 Jun 2003 12:18:26 -0000 1.7
@@ -48,7 +48,7 @@
using System;
-namespace Apache.Avalon.Service
+namespace Apache.Avalon.Framework.Service
{
/// <summary>
/// A <c>IServiceSelector</c> selects components based on a
1.7 +1 -1 avalon-sandbox/csframework/src/cs/Service/IServiceable.cs
Index: IServiceable.cs
===================================================================
RCS file: /home/cvs/avalon-sandbox/csframework/src/cs/Service/IServiceable.cs,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- IServiceable.cs 8 Mar 2003 12:06:17 -0000 1.6
+++ IServiceable.cs 24 Jun 2003 12:18:26 -0000 1.7
@@ -48,7 +48,7 @@
using System;
-namespace Apache.Avalon.Service
+namespace Apache.Avalon.Framework.Service
{
/// <summary>
/// A Composable is a class that need to connect to software components using
1.8 +1 -1 avalon-sandbox/csframework/src/cs/Service/ServiceException.cs
Index: ServiceException.cs
===================================================================
RCS file: /home/cvs/avalon-sandbox/csframework/src/cs/Service/ServiceException.cs,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ServiceException.cs 8 Mar 2003 12:06:17 -0000 1.7
+++ ServiceException.cs 24 Jun 2003 12:18:26 -0000 1.8
@@ -49,7 +49,7 @@
using System;
using System.Runtime.Serialization;
-namespace Apache.Avalon.Service
+namespace Apache.Avalon.Framework.Service
{
/// <summary>
/// The Exception thrown to indicate a problem with service.
1.8 +32 -32 avalon-sandbox/csframework/src/cs/Util/ContainerUtil.cs
Index: ContainerUtil.cs
===================================================================
RCS file: /home/cvs/avalon-sandbox/csframework/src/cs/Util/ContainerUtil.cs,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ContainerUtil.cs 8 Mar 2003 12:06:17 -0000 1.7
+++ ContainerUtil.cs 24 Jun 2003 12:18:27 -0000 1.8
@@ -1,34 +1,34 @@
// ============================================================================
// 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
+//
+// 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
@@ -39,24 +39,24 @@
// 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
+// on behalf of the Apache Software Foundation. For more information on the
// Apache Software Foundation, please see <http://www.apache.org/>.
// ============================================================================
using System;
-using Apache.Avalon.Activity;
-using Apache.Avalon.Logger;
-using Apache.Avalon.Context;
-using Apache.Avalon.Service;
-using Apache.Avalon.Configuration;
-using Apache.Avalon.Parameter;
-
+using Apache.Avalon.Framework.Activity;
+using Apache.Avalon.Framework.Logger;
+using Apache.Avalon.Framework.Context;
+using Apache.Avalon.Framework.Service;
+using Apache.Avalon.Framework.Configuration;
+using Apache.Avalon.Framework.Parameter;
-namespace Apache.Avalon.Util
+
+namespace Apache.Avalon.Framework.Util
{
/// <summary>
/// Utility class that makes it easier to transfer
@@ -86,7 +86,7 @@
/// If the component is <see cref="ILogEnabled"/> but <see
cref="ILogger"/> is null.
/// </exception>
/// <remarks>
- /// The Logger may be null in which case
+ /// The Logger may be null in which case
/// the specified component must not implement <see
cref="ILogEnabled"/>.
/// </remarks>
public static void EnableLogging(object component, ILogger logger)
@@ -97,9 +97,9 @@
{
throw new ArgumentException("logger is null");
}
-
+
((ILogEnabled) component).EnableLogging(logger);
- }
+ }
}
/// <summary>
@@ -126,7 +126,7 @@
{
throw new ArgumentException("context is null");
}
-
+
((IContextualizable) component).Contextualize(context);
}
}
@@ -147,7 +147,7 @@
/// If there is a problem servicing component.
/// </exception>
/// <remarks>
- /// The Service manager may be null in
+ /// The Service manager may be null in
/// which case the specified component must not
/// implement <see cref="IServiceable"/>.
/// </remarks>
@@ -159,7 +159,7 @@
{
throw new ArgumentException("ServiceManager is
null");
}
-
+
((IServiceable) component).Service(serviceManager);
}
}
@@ -193,7 +193,7 @@
{
throw new ArgumentException("configuration is
null");
}
-
+
((IConfigurable) component).Configure(configuration);
}
}
@@ -264,7 +264,7 @@
( (IStartable) component).Start();
}
}
-
+
/// <summary>
/// Stops specified components if it implements the
/// <see cref="IStartable"/> interface.
@@ -277,7 +277,7 @@
{
if (component is IStartable)
{
- ( (IStartable) component).Stop();
+ ( (IStartable) component).Stop();
}
}
@@ -292,9 +292,9 @@
/// </exception>
public static void Dispose(object component)
{
- if (component is Apache.Avalon.Activity.IDisposable)
+ if (component is Apache.Avalon.Framework.Activity.IDisposable)
{
- ((Apache.Avalon.Activity.IDisposable)
component).Dispose();
+ ((Apache.Avalon.Framework.Activity.IDisposable)
component).Dispose();
}
}
}
1.7 +1 -1 avalon-sandbox/csframework/src/cs/Util/Converter.cs
Index: Converter.cs
===================================================================
RCS file: /home/cvs/avalon-sandbox/csframework/src/cs/Util/Converter.cs,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Converter.cs 8 Mar 2003 12:06:18 -0000 1.6
+++ Converter.cs 24 Jun 2003 12:18:27 -0000 1.7
@@ -48,7 +48,7 @@
using System;
-namespace Apache.Avalon.Util
+namespace Apache.Avalon.Framework.Util
{
internal class Converter
{
1.5 +1 -1 avalon-sandbox/csframework/src/cs/Util/RuntimeSerializer.cs
Index: RuntimeSerializer.cs
===================================================================
RCS file: /home/cvs/avalon-sandbox/csframework/src/cs/Util/RuntimeSerializer.cs,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- RuntimeSerializer.cs 8 Mar 2003 12:06:18 -0000 1.4
+++ RuntimeSerializer.cs 24 Jun 2003 12:18:27 -0000 1.5
@@ -50,7 +50,7 @@
using System.Collections;
using System.Runtime.Serialization;
-namespace Apache.Avalon.Util
+namespace Apache.Avalon.Framework.Util
{
/// <summary>
/// Utility class that makes it easier to serialize objects.
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
