hammett 2004/02/29 14:05:01
Modified: avalon-net/Activation/Default DefaultLookupManager.cs
avalon-net/Castle/Castle Castle.cs CastleLoader.cs
CastleOptions.cs ManagedService.cs
avalon-net/Castle/Castle/Core Orchestrator.cs
OrchestratorException.cs
avalon-net/Castle/Castle/Core/Proxies
AbstractManagedObjectProxy.cs
LoggingManagerProxy.cs RuntimeProxy.cs
avalon-net/Castle/Castle/Default/Deployment DeployManager.cs
DeployerBase.cs
avalon-net/Castle/Castle/Default/Runtime DefaultRuntime.cs
Log:
Hungarian notation for member variables - almost forgot these...
Revision Changes Path
1.2 +1 -1
avalon-sandbox/avalon-net/Activation/Default/DefaultLookupManager.cs
Index: DefaultLookupManager.cs
===================================================================
RCS file:
/home/cvs/avalon-sandbox/avalon-net/Activation/Default/DefaultLookupManager.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DefaultLookupManager.cs 29 Feb 2004 21:43:37 -0000 1.1
+++ DefaultLookupManager.cs 29 Feb 2004 22:05:01 -0000 1.2
@@ -39,7 +39,7 @@
/// Used to track which model is providing an object when we
/// handle release of objects.
/// </summary>
- private Hashtable m_table;
+ private Hashtable m_table = new Hashtable();
/// <summary>
/// A table of dependency models keyed by lookup key.
1.5 +10 -10 avalon-sandbox/avalon-net/Castle/Castle/Castle.cs
Index: Castle.cs
===================================================================
RCS file: /home/cvs/avalon-sandbox/avalon-net/Castle/Castle/Castle.cs,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Castle.cs 28 Feb 2004 22:15:35 -0000 1.4
+++ Castle.cs 29 Feb 2004 22:05:01 -0000 1.5
@@ -27,9 +27,9 @@
{
public static readonly String CASTLE_DOMAIN = "apache.avalon.castle";
- protected CastleOptions options;
+ protected CastleOptions m_options;
- protected ILogger logger = Logger.LoggerFactory.GetLogger("Castle");
+ protected ILogger m_logger = Logger.LoggerFactory.GetLogger("Castle");
public Castle(CastleOptions options)
{
@@ -38,12 +38,12 @@
throw new ArgumentNullException("options");
}
- this.options = options;
+ m_options = options;
}
public void Start()
{
- logger.Info("Castle : Starting at {0} {1}",
DateTime.Now.ToShortTimeString(), DateTime.Now.ToShortDateString());
+ m_logger.Info("Castle : Starting at {0} {1}",
DateTime.Now.ToShortTimeString(), DateTime.Now.ToShortDateString());
CastleLoader loader = new CastleLoader();
@@ -51,9 +51,9 @@
{
InitializeDomainHooks();
- loader.Start(options);
+ loader.Start(m_options);
- if (!options.NoThreadJoin)
+ if (!m_options.NoThreadJoin)
{
// Thread.CurrentThread.Join();
Console.In.ReadLine();
@@ -72,7 +72,7 @@
loader.Stop();
}
- logger.Info("Castle : Service exiting at {0} {1}",
+ m_logger.Info("Castle : Service exiting at {0} {1}",
DateTime.Now.ToShortTimeString(),
DateTime.Now.ToShortDateString());
}
@@ -110,17 +110,17 @@
private void DomainUnload(object sender, EventArgs e)
{
- logger.Info("DomainUnload catched!");
+ m_logger.Info("DomainUnload catched!");
}
private void UnhandledException(object sender,
UnhandledExceptionEventArgs e)
{
- logger.Info("UnhandledException catched!");
+ m_logger.Info("UnhandledException catched!");
}
private void ProcessExit(object sender, EventArgs e)
{
- logger.Info("ProcessExit catched!");
+ m_logger.Info("ProcessExit catched!");
}
}
}
1.5 +30 -30 avalon-sandbox/avalon-net/Castle/Castle/CastleLoader.cs
Index: CastleLoader.cs
===================================================================
RCS file: /home/cvs/avalon-sandbox/avalon-net/Castle/Castle/CastleLoader.cs,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- CastleLoader.cs 28 Feb 2004 22:15:35 -0000 1.4
+++ CastleLoader.cs 29 Feb 2004 22:05:01 -0000 1.5
@@ -32,13 +32,13 @@
public static readonly ManagedObjectName CONTROLLER =
new ManagedObjectName(Castle.CASTLE_DOMAIN +
":name=Controller");
- protected MServer server;
+ protected MServer m_server;
- protected MConnectorServer connectorServer;
+ protected MConnectorServer m_connectorServer;
- protected ManagedInstance controller;
+ protected ManagedInstance m_controller;
- protected ILogger logger =
Logger.LoggerFactory.GetLogger("CastleLoader");
+ protected ILogger m_logger =
Logger.LoggerFactory.GetLogger("CastleLoader");
public CastleLoader()
{
@@ -46,7 +46,7 @@
~CastleLoader()
{
- logger.Debug("Running Finalizer()");
+ m_logger.Debug("Running Finalizer()");
Stop();
}
@@ -55,13 +55,13 @@
{
get
{
- return server;
+ return m_server;
}
}
public void Start(CastleOptions options)
{
- logger.Debug("Start()");
+ m_logger.Debug("Start()");
CreateMServer(options);
CreateController(options);
@@ -74,64 +74,64 @@
public void Stop()
{
- logger.Debug("Stop()");
+ m_logger.Debug("Stop()");
- if (connectorServer != null &&
connectorServer.ManagedObjectName != null )
+ if (m_connectorServer != null &&
m_connectorServer.ManagedObjectName != null )
{
- server.UnregisterManagedObject(
connectorServer.ManagedObjectName );
+ m_server.UnregisterManagedObject(
m_connectorServer.ManagedObjectName );
- connectorServer = null;
+ m_connectorServer = null;
}
- if (server != null)
+ if (m_server != null)
{
- if (controller != null)
+ if (m_controller != null)
{
- MXUtil.Stop( server, CONTROLLER );
+ MXUtil.Stop( m_server, CONTROLLER );
}
- MServerFactory.Release(server);
+ MServerFactory.Release(m_server);
- server = null;
+ m_server = null;
}
}
protected virtual void CreateMServer(CastleOptions options)
{
- logger.Debug("Creating MServer");
- server = MServerFactory.CreateServer(options.DomainName,
options.IsolatedDomain);
+ m_logger.Debug("Creating MServer");
+ m_server = MServerFactory.CreateServer(options.DomainName,
options.IsolatedDomain);
}
protected virtual void CreateController(CastleOptions options)
{
- logger.Debug("Creating Controller");
+ m_logger.Debug("Creating Controller");
CastleController controllerInstance = new
CastleController(options);
- logger.Debug("Registering Controller");
- controller = server.RegisterManagedObject( controllerInstance,
CONTROLLER );
+ m_logger.Debug("Registering Controller");
+ m_controller = m_server.RegisterManagedObject(
controllerInstance, CONTROLLER );
- logger.Debug("Invoking Create on Controller...");
- MXUtil.Create( server, CONTROLLER );
+ m_logger.Debug("Invoking Create on Controller...");
+ MXUtil.Create( m_server, CONTROLLER );
- logger.Debug("Invoking Start on Controller...");
- MXUtil.Start( server, CONTROLLER );
+ m_logger.Debug("Invoking Start on Controller...");
+ MXUtil.Start( m_server, CONTROLLER );
}
protected virtual void CreateServerConnector(String url,
System.Collections.Specialized.NameValueCollection properties)
{
- logger.Debug("Creating ServerConnector");
+ m_logger.Debug("Creating ServerConnector");
- connectorServer = MConnectorServerFactory.CreateServer(url,
properties, null );
+ m_connectorServer = MConnectorServerFactory.CreateServer(url,
properties, null );
- server.RegisterManagedObject( connectorServer,
MConnectorServer.DEFAULT_NAME );
+ m_server.RegisterManagedObject( m_connectorServer,
MConnectorServer.DEFAULT_NAME );
- logger.Debug("Testing...");
+ m_logger.Debug("Testing...");
MConnector connector = MConnectorFactory.CreateConnector( url,
properties );
connector.ServerConnection.GetDomains();
- logger.Debug("Done!");
+ m_logger.Debug("Done!");
}
#region IDisposable Members
1.6 +36 -33 avalon-sandbox/avalon-net/Castle/Castle/CastleOptions.cs
Index: CastleOptions.cs
===================================================================
RCS file: /home/cvs/avalon-sandbox/avalon-net/Castle/Castle/CastleOptions.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- CastleOptions.cs 29 Feb 2004 18:07:16 -0000 1.5
+++ CastleOptions.cs 29 Feb 2004 22:05:01 -0000 1.6
@@ -26,69 +26,72 @@
/// <summary>
///
/// </summary>
- private String defaultDomain = Castle.CASTLE_DOMAIN;
+ private String m_defaultDomain = Castle.CASTLE_DOMAIN;
/// <summary>
///
/// </summary>
- private String homePath;
+ private String m_homePath;
/// <summary>
///
/// </summary>
- private String tempPath;
+ private String m_tempPath;
/// <summary>
///
/// </summary>
- private bool isolatedDomain = true;
+ private bool m_isolatedDomain = true;
/// <summary>
///
/// </summary>
- private bool noJoin = false;
+ private bool m_noJoin = false;
/// <summary>
///
/// </summary>
- private bool remoting = true;
+ private bool m_remoting = true;
/// <summary>
///
/// </summary>
- private String serverConnectorUrl;
+ private String m_serverConnectorUrl;
/// <summary>
///
/// </summary>
- private String systemConfig;
+ private String m_systemConfig;
/// <summary>
///
/// </summary>
- private long timeout = 10000;
+ private long m_timeout = 10000;
/// <summary>
///
/// </summary>
- private bool traceEnabled;
+ private bool m_traceEnabled;
+ /// <summary>
+ ///
+ /// </summary>
public CastleOptions()
{
- homePath = Environment.GetFolderPath(
Environment.SpecialFolder.ApplicationData );
- tempPath = Path.GetTempPath( );
- serverConnectorUrl = "provider:tcp:binary:server.rem";
+ m_homePath = Environment.GetFolderPath(
Environment.SpecialFolder.ApplicationData );
+ m_tempPath = Path.GetTempPath( );
+ m_serverConnectorUrl = "provider:tcp:binary:server.rem";
}
public String DomainName
{
get
{
- return defaultDomain;
+ return m_defaultDomain;
}
set
{
- defaultDomain = value;
+ m_defaultDomain = value;
}
}
@@ -96,11 +99,11 @@
{
get
{
- return homePath;
+ return m_homePath;
}
set
{
- homePath = value;
+ m_homePath = value;
}
}
@@ -116,11 +119,11 @@
{
get
{
- return tempPath;
+ return m_tempPath;
}
set
{
- tempPath = value;
+ m_tempPath = value;
}
}
@@ -128,11 +131,11 @@
{
get
{
- return systemConfig;
+ return m_systemConfig;
}
set
{
- systemConfig = value;
+ m_systemConfig = value;
}
}
@@ -140,11 +143,11 @@
{
get
{
- return isolatedDomain;
+ return m_isolatedDomain;
}
set
{
- isolatedDomain = value;
+ m_isolatedDomain = value;
}
}
@@ -152,11 +155,11 @@
{
get
{
- return noJoin;
+ return m_noJoin;
}
set
{
- noJoin = value;
+ m_noJoin = value;
}
}
@@ -164,11 +167,11 @@
{
get
{
- return remoting;
+ return m_remoting;
}
set
{
- remoting = value;
+ m_remoting = value;
}
}
@@ -176,11 +179,11 @@
{
get
{
- return serverConnectorUrl;
+ return m_serverConnectorUrl;
}
set
{
- serverConnectorUrl = value;
+ m_serverConnectorUrl = value;
}
}
@@ -188,11 +191,11 @@
{
get
{
- return traceEnabled;
+ return m_traceEnabled;
}
set
{
- traceEnabled = value;
+ m_traceEnabled = value;
}
}
@@ -200,11 +203,11 @@
{
get
{
- return timeout;
+ return m_timeout;
}
set
{
- timeout = value;
+ m_timeout = value;
}
}
}
1.4 +32 -24 avalon-sandbox/avalon-net/Castle/Castle/ManagedService.cs
Index: ManagedService.cs
===================================================================
RCS file: /home/cvs/avalon-sandbox/avalon-net/Castle/Castle/ManagedService.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ManagedService.cs 28 Feb 2004 22:15:35 -0000 1.3
+++ ManagedService.cs 29 Feb 2004 22:05:01 -0000 1.4
@@ -29,35 +29,35 @@
/// <see cref="Apache.Avalon.Castle.ManagementExtensions.MServer"/>
/// that hosts this instance.
/// </summary>
- protected MServer server;
+ private MServer m_server;
/// <summary>
/// Reference to
/// <see
cref="Apache.Avalon.Castle.ManagementExtensions.ManagedObjectName"/>
/// that represents this instance.
/// </summary>
- private ManagedObjectName name;
+ private ManagedObjectName m_name;
/// <summary>
/// Reference to
/// <see
cref="Apache.Avalon.Castle.ManagementExtensions.ManagedObjectName"/>
/// of the parent managed component.
/// </summary>
- private ManagedObjectName parentName;
+ private ManagedObjectName m_parentName;
/// <summary>
/// Collection of
/// <see
cref="Apache.Avalon.Castle.ManagementExtensions.ManagedObjectName"/>
/// of children managed components.
/// </summary>
- private ArrayList children = new ArrayList();
+ private ArrayList m_children = new ArrayList();
/// <summary>
/// Reference to
/// <see cref="Apache.Avalon.Castle.ManagedObjectState"/>
/// of the parent managed component.
/// </summary>
- private ManagedObjectState state = ManagedObjectState.Undefined;
+ private ManagedObjectState m_state = ManagedObjectState.Undefined;
/// <summary>
/// Pending.
@@ -68,12 +68,20 @@
#region MService Members
+ protected MServer Server
+ {
+ get
+ {
+ return m_server;
+ }
+ }
+
[ManagedAttribute]
public ManagedObjectName ParentName
{
get
{
- return parentName;
+ return m_parentName;
}
}
@@ -83,7 +91,7 @@
get
{
return (ManagedObjectName[])
- children.ToArray( typeof(ManagedObjectName) );
+ m_children.ToArray( typeof(ManagedObjectName)
);
}
}
@@ -92,7 +100,7 @@
{
get
{
- return state;
+ return m_state;
}
}
@@ -104,11 +112,11 @@
throw new ArgumentNullException( "childName", "Child
name can't be null" );
}
- children.Add( childName );
+ m_children.Add( childName );
- server.Invoke(
+ m_server.Invoke(
childName,
- "SetParent", new Object[] { name }, new Type[] {
typeof(ManagedObjectName) } );
+ "SetParent", new Object[] { ManagedObjectName }, new
Type[] { typeof(ManagedObjectName) } );
}
[ManagedOperation]
@@ -119,13 +127,13 @@
throw new ArgumentNullException( "childName", "Child
name can't be null" );
}
- children.Remove( childName );
+ m_children.Remove( childName );
}
[ManagedOperation]
public void SetParent(ManagedObjectName parentName)
{
- this.parentName = parentName;
+ m_parentName = parentName;
}
[ManagedAttribute]
@@ -133,38 +141,38 @@
{
get
{
- return name;
+ return m_name;
}
}
[ManagedOperation]
public virtual void Create()
{
- state = ManagedObjectState.Created;
+ m_state = ManagedObjectState.Created;
}
[ManagedOperation]
public virtual void Start()
{
- state = ManagedObjectState.Started;
+ m_state = ManagedObjectState.Started;
}
[ManagedOperation]
public virtual void Stop()
{
- state = ManagedObjectState.Stopped;
+ m_state = ManagedObjectState.Stopped;
}
[ManagedOperation]
public virtual void Destroy()
{
- state = ManagedObjectState.Destroyed;
+ m_state = ManagedObjectState.Destroyed;
if (ParentName != null)
{
- server.Invoke(
+ m_server.Invoke(
ParentName,
- "RemoveChild", new Object[] { name }, new
Type[] { typeof(ManagedObjectName) } );
+ "RemoveChild", new Object[] {
ManagedObjectName }, new Type[] { typeof(ManagedObjectName) } );
}
}
@@ -174,16 +182,16 @@
public void BeforeRegister(MServer server, ManagedObjectName name)
{
- this.server = server;
- this.name = name;
+ m_server = server;
+ m_name = name;
BeforeRegister();
}
public virtual void AfterDeregister()
{
- this.server = null;
- this.name = null;
+ m_server = null;
+ m_name = null;
}
public virtual void AfterRegister()
1.5 +53 -53 avalon-sandbox/avalon-net/Castle/Castle/Core/Orchestrator.cs
Index: Orchestrator.cs
===================================================================
RCS file: /home/cvs/avalon-sandbox/avalon-net/Castle/Castle/Core/Orchestrator.cs,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Orchestrator.cs 29 Feb 2004 18:07:16 -0000 1.4
+++ Orchestrator.cs 29 Feb 2004 22:05:01 -0000 1.5
@@ -37,34 +37,34 @@
private static readonly int CONFIG_MANAGER = 1;
private static readonly int LOOKUP_MANAGER = 2;
- protected ManagedObjectName[] childServices = new ManagedObjectName[3];
+ protected ManagedObjectName[] m_childServices = new
ManagedObjectName[3];
- protected ManagedObjectName deployManager;
+ protected ManagedObjectName m_deployManager;
- protected ManagedObjectName runtimeName;
+ protected ManagedObjectName m_runtimeName;
- protected ManagedObjectName repositoryName;
+ protected ManagedObjectName m_repositoryName;
- protected CastleOptions options;
+ protected CastleOptions m_options;
- protected IRepository repository;
+ protected IRepository m_repository;
- protected ILoggingManager loggingManager;
+ protected ILoggingManager m_loggingManager;
- protected IRuntime runtime;
+ protected IRuntime m_runtime;
- protected ILogger logger =
Logger.LoggerFactory.GetLogger("Orchestrator");
+ protected ILogger m_logger =
Logger.LoggerFactory.GetLogger("Orchestrator");
- protected OrchestratorNotificationSystem notificationSystem;
+ protected OrchestratorNotificationSystem m_notificationSystem;
- protected ISystemContext systemContext;
+ protected ISystemContext m_systemContext;
/// <summary>
///
/// </summary>
public Orchestrator()
{
- logger.Debug("Constructor");
+ m_logger.Debug("Constructor");
}
[ManagedAttribute]
@@ -72,7 +72,7 @@
{
get
{
- return systemContext;
+ return m_systemContext;
}
}
@@ -81,11 +81,11 @@
{
get
{
- return runtimeName;
+ return m_runtimeName;
}
set
{
- runtimeName = value;
+ m_runtimeName = value;
}
}
@@ -94,11 +94,11 @@
{
get
{
- return repositoryName;
+ return m_repositoryName;
}
set
{
- repositoryName = value;
+ m_repositoryName = value;
}
}
@@ -107,11 +107,11 @@
{
get
{
- return deployManager;
+ return m_deployManager;
}
set
{
- deployManager = value;
+ m_deployManager = value;
}
}
@@ -121,11 +121,11 @@
{
get
{
- return childServices[LOGGER_MANAGER];
+ return m_childServices[LOGGER_MANAGER];
}
set
{
- childServices[LOGGER_MANAGER] = value;
+ m_childServices[LOGGER_MANAGER] = value;
}
}
@@ -134,11 +134,11 @@
{
get
{
- return childServices[CONFIG_MANAGER];
+ return m_childServices[CONFIG_MANAGER];
}
set
{
- childServices[CONFIG_MANAGER] = value;
+ m_childServices[CONFIG_MANAGER] = value;
}
}
@@ -147,33 +147,33 @@
{
get
{
- return childServices[LOOKUP_MANAGER];
+ return m_childServices[LOOKUP_MANAGER];
}
set
{
- childServices[LOOKUP_MANAGER] = value;
+ m_childServices[LOOKUP_MANAGER] = value;
}
}
[ManagedOperation]
public void DeployContainmentProfile(ContainmentProfile profile)
{
- logger.Info("Creating ContainmentModel");
+ m_logger.Info("Creating ContainmentModel");
- ILogger sublogger = loggingManager.GetLoggerForCategory(
"Containment" );
+ ILogger sublogger = m_loggingManager.GetLoggerForCategory(
"Containment" );
IContainmentContext containmentContext =
CreateContainmentContext( SystemContext, sublogger, profile );
IContainmentModel containmentModel = new
DefaultContainmentModel( containmentContext );
- logger.Info("Assembling");
+ m_logger.Info("Assembling");
containmentModel.Assemble();
- logger.Info("Deploying");
+ m_logger.Info("Deploying");
containmentModel.Commission();
- logger.Info("Started");
+ m_logger.Info("Started");
}
protected IContainmentContext CreateContainmentContext( ISystemContext
system, ILogger logger,
@@ -194,7 +194,7 @@
public override void Create()
{
- logger.Debug("Create");
+ m_logger.Debug("Create");
base.Create();
RetriveCastleOptions();
@@ -204,7 +204,7 @@
public override void Start()
{
- logger.Debug("Start");
+ m_logger.Debug("Start");
base.Start();
// Create/Start notification system
@@ -219,15 +219,15 @@
public override void Stop()
{
- logger.Debug("Stop");
+ m_logger.Debug("Stop");
base.Stop();
}
protected void RetriveCastleOptions()
{
- options = (CastleOptions)
- MXUtil.GetAttribute( server, CastleLoader.CONTROLLER,
"Options" );
+ m_options = (CastleOptions)
+ MXUtil.GetAttribute( Server, CastleLoader.CONTROLLER,
"Options" );
}
protected void CreateSystemContext()
@@ -237,31 +237,31 @@
EnsureLoggingImplementationExists();
DefaultSystemContext context = new DefaultSystemContext(
- runtime, loggingManager, IOUtil.ToFile(
options.BasePath ),
- IOUtil.ToFile( options.HomePath ),
- IOUtil.ToFile( options.TempPath ), repository,
- "system", options.TraceEnabled,
options.DeploymentTimeout, false);
+ m_runtime, m_loggingManager, IOUtil.ToFile(
m_options.BasePath ),
+ IOUtil.ToFile( m_options.HomePath ),
+ IOUtil.ToFile( m_options.TempPath ), m_repository,
+ "system", m_options.TraceEnabled,
m_options.DeploymentTimeout, false);
- context.Put( "urn:composition:dir", IOUtil.ToFile(
options.BasePath ) );
+ context.Put( "urn:composition:dir", IOUtil.ToFile(
m_options.BasePath ) );
context.MakeReadOnly();
- systemContext = context;
+ m_systemContext = context;
}
protected void InitDeployer()
{
AssertNotNull( DeployManager, "DeployManager implementation
required" );
- MXUtil.InvokeOn( server, DeployManager, "Inspect" );
+ MXUtil.InvokeOn( Server, DeployManager, "Inspect" );
}
protected void EnsureRuntimeImplementationExists()
{
AssertNotNull( Runtime, "Runtime implementation required" );
- if ( runtime == null )
+ if ( m_runtime == null )
{
- runtime = new RuntimeProxy( server, Runtime );
+ m_runtime = new RuntimeProxy( Server, Runtime );
}
}
@@ -269,17 +269,17 @@
{
AssertNotNull( LoggerManager, "LoggingManager implementation
required" );
- if ( loggingManager == null )
+ if ( m_loggingManager == null )
{
- loggingManager = new LoggingManagerProxy( server,
LoggerManager );
+ m_loggingManager = new LoggingManagerProxy( Server,
LoggerManager );
}
}
protected void CreateAndStartNotificationSystem()
{
- notificationSystem = new OrchestratorNotificationSystem();
+ m_notificationSystem = new OrchestratorNotificationSystem();
- foreach(ManagedObjectName child in childServices)
+ foreach(ManagedObjectName child in m_childServices)
{
if (child == null)
{
@@ -294,19 +294,19 @@
{
try
{
- logger.Debug("Invoking RegisterForPhases on {0}",
name);
+ m_logger.Debug("Invoking RegisterForPhases on {0}",
name);
- server.Invoke(
+ Server.Invoke(
name,
"RegisterForPhases",
- new object[] { notificationSystem },
+ new object[] { m_notificationSystem },
new Type[] {
typeof(OrchestratorNotificationSystem) } );
- logger.Debug("Done");
+ m_logger.Debug("Done");
}
catch(Exception e)
{
- logger.Error("Exception {0} invoking
'RegisterForPhases' on {1}",
+ m_logger.Error("Exception {0} invoking
'RegisterForPhases' on {1}",
e.Message, name);
throw e;
1.2 +5 -0
avalon-sandbox/avalon-net/Castle/Castle/Core/OrchestratorException.cs
Index: OrchestratorException.cs
===================================================================
RCS file:
/home/cvs/avalon-sandbox/avalon-net/Castle/Castle/Core/OrchestratorException.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- OrchestratorException.cs 28 Feb 2004 22:15:35 -0000 1.1
+++ OrchestratorException.cs 29 Feb 2004 22:05:01 -0000 1.2
@@ -29,5 +29,10 @@
public OrchestratorException( String message, Exception inner ) :
base(message, inner)
{
}
+
+ public
OrchestratorException(System.Runtime.Serialization.SerializationInfo info,
+ System.Runtime.Serialization.StreamingContext context) :
base(info, context)
+ {
+ }
}
}
1.2 +4 -4
avalon-sandbox/avalon-net/Castle/Castle/Core/Proxies/AbstractManagedObjectProxy.cs
Index: AbstractManagedObjectProxy.cs
===================================================================
RCS file:
/home/cvs/avalon-sandbox/avalon-net/Castle/Castle/Core/Proxies/AbstractManagedObjectProxy.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AbstractManagedObjectProxy.cs 28 Feb 2004 22:15:41 -0000 1.1
+++ AbstractManagedObjectProxy.cs 29 Feb 2004 22:05:01 -0000 1.2
@@ -27,12 +27,12 @@
/// <summary>
///
/// </summary>
- protected MServer server;
+ protected MServer m_server;
/// <summary>
///
/// </summary>
- protected ManagedObjectName target;
+ protected ManagedObjectName m_target;
/// <summary>
///
@@ -51,8 +51,8 @@
throw new ArgumentNullException ( "name" );
}
- this.server = server;
- this.target = name;
+ this.m_server = server;
+ this.m_target = name;
// TODO: Inspect ManagedObject to have clue
// if it implements or not the interface
1.2 +5 -5
avalon-sandbox/avalon-net/Castle/Castle/Core/Proxies/LoggingManagerProxy.cs
Index: LoggingManagerProxy.cs
===================================================================
RCS file:
/home/cvs/avalon-sandbox/avalon-net/Castle/Castle/Core/Proxies/LoggingManagerProxy.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- LoggingManagerProxy.cs 28 Feb 2004 22:15:41 -0000 1.1
+++ LoggingManagerProxy.cs 29 Feb 2004 22:05:01 -0000 1.2
@@ -34,27 +34,27 @@
public void AddCategories(string path,
Apache.Avalon.Composition.Data.CategoriesDirective descriptor)
{
- MXUtil.InvokeOn( server, target, "AddCategories", path,
descriptor );
+ MXUtil.InvokeOn( m_server, m_target, "AddCategories", path,
descriptor );
}
public void
AddCategories(Apache.Avalon.Composition.Data.CategoriesDirective descriptor)
{
- MXUtil.InvokeOn( server, target, "AddCategories", descriptor );
+ MXUtil.InvokeOn( m_server, m_target, "AddCategories",
descriptor );
}
public ILogger GetLoggerForCategory(string category)
{
- return (ILogger) MXUtil.InvokeOn( server, target,
"GetLoggerForCategory", category );
+ return (ILogger) MXUtil.InvokeOn( m_server, m_target,
"GetLoggerForCategory", category );
}
public ILogger
GetLoggerForCategory(Apache.Avalon.Composition.Data.CategoryDirective category)
{
- return (ILogger) MXUtil.InvokeOn( server, target,
"GetLoggerForCategory", category );
+ return (ILogger) MXUtil.InvokeOn( m_server, m_target,
"GetLoggerForCategory", category );
}
public ILogger GetLoggerForCategory(string name, string target, string
priority)
{
- return (ILogger) MXUtil.InvokeOn( server, base.target,
"GetLoggerForCategory", name, target, priority );
+ return (ILogger) MXUtil.InvokeOn( m_server, m_target,
"GetLoggerForCategory", name, target, priority );
}
#endregion
1.2 +4 -4
avalon-sandbox/avalon-net/Castle/Castle/Core/Proxies/RuntimeProxy.cs
Index: RuntimeProxy.cs
===================================================================
RCS file:
/home/cvs/avalon-sandbox/avalon-net/Castle/Castle/Core/Proxies/RuntimeProxy.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RuntimeProxy.cs 28 Feb 2004 22:15:41 -0000 1.1
+++ RuntimeProxy.cs 29 Feb 2004 22:05:01 -0000 1.2
@@ -33,22 +33,22 @@
public void Decommission(IDeploymentModel model)
{
- MXUtil.InvokeOn ( server, target, "Decommission", model );
+ MXUtil.InvokeOn ( m_server, m_target, "Decommission", model );
}
public void Commission(IDeploymentModel model)
{
- MXUtil.InvokeOn ( server, target, "Commission", model );
+ MXUtil.InvokeOn ( m_server, m_target, "Commission", model );
}
public void Release(IDeploymentModel model, object instance)
{
- MXUtil.InvokeOn ( server, target, "Release", model, instance );
+ MXUtil.InvokeOn ( m_server, m_target, "Release", model,
instance );
}
public object Resolve(IDeploymentModel model)
{
- return MXUtil.InvokeOn ( server, target, "Resolve", model );;
+ return MXUtil.InvokeOn ( m_server, m_target, "Resolve", model
);;
}
#endregion
1.3 +3 -3
avalon-sandbox/avalon-net/Castle/Castle/Default/Deployment/DeployManager.cs
Index: DeployManager.cs
===================================================================
RCS file:
/home/cvs/avalon-sandbox/avalon-net/Castle/Castle/Default/Deployment/DeployManager.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DeployManager.cs 29 Feb 2004 18:07:16 -0000 1.2
+++ DeployManager.cs 29 Feb 2004 22:05:01 -0000 1.3
@@ -56,7 +56,7 @@
private void ObtainHomeDir()
{
ISystemContext context = (ISystemContext)
- MXUtil.GetAttribute( server,
CastleConstants.ORCHESTRATOR_NAME, "SystemContext" );
+ MXUtil.GetAttribute( Server,
CastleConstants.ORCHESTRATOR_NAME, "SystemContext" );
if (context == null)
{
@@ -93,7 +93,7 @@
{
foreach(ManagedObjectName child in Children)
{
- bool accepts = (bool) MXUtil.InvokeOn( server, child,
"Accepts", file );
+ bool accepts = (bool) MXUtil.InvokeOn( Server, child,
"Accepts", file );
if (accepts)
{
@@ -106,7 +106,7 @@
private void SendDeployMessage( ManagedObjectName deployer, FileInfo
file )
{
- MXUtil.InvokeOn( server, deployer, "Deploy", file );
+ MXUtil.InvokeOn( Server, deployer, "Deploy", file );
}
}
}
1.3 +1 -1
avalon-sandbox/avalon-net/Castle/Castle/Default/Deployment/DeployerBase.cs
Index: DeployerBase.cs
===================================================================
RCS file:
/home/cvs/avalon-sandbox/avalon-net/Castle/Castle/Default/Deployment/DeployerBase.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DeployerBase.cs 29 Feb 2004 18:07:16 -0000 1.2
+++ DeployerBase.cs 29 Feb 2004 22:05:01 -0000 1.3
@@ -67,7 +67,7 @@
/// <param name="profile"></param>
protected void DeployContainmentProfile( ContainmentProfile profile )
{
- MXUtil.InvokeOn( server, CastleConstants.ORCHESTRATOR_NAME,
"DeployContainmentProfile", profile );
+ MXUtil.InvokeOn( Server, CastleConstants.ORCHESTRATOR_NAME,
"DeployContainmentProfile", profile );
}
}
}
1.3 +1 -1
avalon-sandbox/avalon-net/Castle/Castle/Default/Runtime/DefaultRuntime.cs
Index: DefaultRuntime.cs
===================================================================
RCS file:
/home/cvs/avalon-sandbox/avalon-net/Castle/Castle/Default/Runtime/DefaultRuntime.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DefaultRuntime.cs 29 Feb 2004 21:43:37 -0000 1.2
+++ DefaultRuntime.cs 29 Feb 2004 22:05:01 -0000 1.3
@@ -66,7 +66,7 @@
base.Start();
ISystemContext context = (ISystemContext)
- MXUtil.GetAttribute( server,
CastleConstants.ORCHESTRATOR_NAME,
+ MXUtil.GetAttribute( Server,
CastleConstants.ORCHESTRATOR_NAME,
"SystemContext" );
m_runtime = new RuntimeImpl( context );
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
