You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by ym...@apache.org on 2002/11/19 11:35:13 UTC
cvs commit: jakarta-avalon-excalibur/csframework/src/cs/Context DefaultContext.cs
ymikulski 2002/11/19 02:35:13
Modified: csframework/src/cs/Service ServiceException.cs
DefaultServiceSelector.cs DefaultServiceManager.cs
csframework/src/cs/Parameters Parameters.cs
csframework/src/cs/Context DefaultContext.cs
Log:
no message
Revision Changes Path
1.4 +5 -3 jakarta-avalon-excalibur/csframework/src/cs/Service/ServiceException.cs
Index: ServiceException.cs
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/csframework/src/cs/Service/ServiceException.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ServiceException.cs 8 Nov 2002 20:38:17 -0000 1.3
+++ ServiceException.cs 19 Nov 2002 10:35:12 -0000 1.4
@@ -19,6 +19,8 @@
/// </remarks>
public class ServiceException: Exception
{
+ private const string ROLE_NAME_SERIALIZATION = "service-exception-role";
+
private string role;
/// <summary>
@@ -70,7 +72,7 @@
/// </summary>
public ServiceException(SerializationInfo info, StreamingContext context): base(info, context)
{
- info.AddValue("role", role);
+ info.AddValue(ROLE_NAME_SERIALIZATION, role);
}
/// <summary>
@@ -91,11 +93,11 @@
/// </summary>
/// <param name="info"></param>
/// <param name="context"></param>
- public void GetObjectData(SerializationInfo info, StreamingContext context)
+ public override void GetObjectData(SerializationInfo info, StreamingContext context)
{
base.GetObjectData(info, context);
- role = info.GetString("role");
+ role = info.GetString(ROLE_NAME_SERIALIZATION);
}
}
}
1.3 +1 -1 jakarta-avalon-excalibur/csframework/src/cs/Service/DefaultServiceSelector.cs
Index: DefaultServiceSelector.cs
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/csframework/src/cs/Service/DefaultServiceSelector.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DefaultServiceSelector.cs 25 Sep 2002 22:48:11 -0000 1.2
+++ DefaultServiceSelector.cs 19 Nov 2002 10:35:12 -0000 1.3
@@ -15,7 +15,7 @@
/// <summary>
/// This is the default implementation of the <see cref="IServiceSelector"/>.
/// </summary>
- public class DefaultServiceSelector: IServiceSelector, IEnumerable
+ public class DefaultServiceSelector: MarshalByRefObject, IServiceSelector, IEnumerable
{
private Hashtable components = new Hashtable();
private bool readOnly;
1.3 +1 -1 jakarta-avalon-excalibur/csframework/src/cs/Service/DefaultServiceManager.cs
Index: DefaultServiceManager.cs
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/csframework/src/cs/Service/DefaultServiceManager.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DefaultServiceManager.cs 25 Sep 2002 22:48:11 -0000 1.2
+++ DefaultServiceManager.cs 19 Nov 2002 10:35:12 -0000 1.3
@@ -17,7 +17,7 @@
/// Allow ineritance and extension so you can generate a tree of
/// <see cref="IServiceManager"/> each defining object scope.
/// </summary>
- public class DefaultServiceManager: IServiceManager, IEnumerable
+ public class DefaultServiceManager: MarshalByRefObject, IServiceManager, IEnumerable
{
private Hashtable components = new Hashtable();
private IServiceManager parent;
1.6 +19 -0 jakarta-avalon-excalibur/csframework/src/cs/Parameters/Parameters.cs
Index: Parameters.cs
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/csframework/src/cs/Parameters/Parameters.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Parameters.cs 8 Nov 2002 20:38:17 -0000 1.5
+++ Parameters.cs 19 Nov 2002 10:35:13 -0000 1.6
@@ -37,6 +37,20 @@
{
}
+ /// <summary>
+ /// Creates a new Parameters instance.
+ /// </summary>
+ /// <param name="parameters"></param>
+ public Parameters (Parameters parameters)
+ {
+ Merge(parameters);
+ }
+
+ /// <summary>
+ /// Creates a new Parameters instance.
+ /// </summary>
+ /// <param name="info"></param>
+ /// <param name="context"></param>
public Parameters (SerializationInfo info, StreamingContext context)
{
@@ -51,6 +65,11 @@
}
}
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="info"></param>
+ /// <param name="context"></param>
public void GetObjectData(SerializationInfo info, StreamingContext context)
{
1.4 +1 -2 jakarta-avalon-excalibur/csframework/src/cs/Context/DefaultContext.cs
Index: DefaultContext.cs
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/csframework/src/cs/Context/DefaultContext.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DefaultContext.cs 25 Sep 2002 22:47:12 -0000 1.3
+++ DefaultContext.cs 19 Nov 2002 10:35:13 -0000 1.4
@@ -8,13 +8,12 @@
using System;
using System.Collections;
-
namespace Apache.Avalon.Context
{
/// <summary>
/// Default implementation of IContext.
/// </summary>
- public class DefaultContext: IContext, IEnumerable
+ public class DefaultContext: MarshalByRefObject, IContext, IEnumerable
{
private IDictionary components;
private IContext parent;
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>