Update of /cvsroot/springnet/Spring.Net/src/Spring/Spring.Aop/Aop/Framework/AutoProxy
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv9200/Aop/Framework/AutoProxy
Modified Files:
AbstractAutoProxyCreator.cs DefaultAdvisorAutoProxyCreator.cs
Log Message:
Update to Common.Logging 1.2
Add Logging advice
Refactoring of ExceptionHandlingAdvice
start of retry advice
misc improvements to spring.aop
Index: DefaultAdvisorAutoProxyCreator.cs
===================================================================
RCS file: /cvsroot/springnet/Spring.Net/src/Spring/Spring.Aop/Aop/Framework/AutoProxy/DefaultAdvisorAutoProxyCreator.cs,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** DefaultAdvisorAutoProxyCreator.cs 3 Aug 2007 14:38:30 -0000 1.8
--- DefaultAdvisorAutoProxyCreator.cs 8 Oct 2007 22:04:51 -0000 1.9
***************
*** 40,43 ****
--- 40,44 ----
public class DefaultAdvisorAutoProxyCreator : AbstractAdvisorAutoProxyCreator, IObjectNameAware, IInitializingObject
{
+
/// <summary>
/// Separator between prefix and remainder of object name
***************
*** 46,50 ****
--- 47,53 ----
private bool usePrefix;
private string advisorObjectNamePrefix;
+ private IList advisors;
+ #region Properties
/// <summary>
***************
*** 71,74 ****
--- 74,78 ----
}
+ #endregion
/// <summary>
/// Find all candidate advices to use in auto proxying.
***************
*** 153,157 ****
}
! private IList advisors;
/// <summary>
--- 157,161 ----
}
!
/// <summary>
***************
*** 182,185 ****
--- 186,190 ----
set
{
+ // If no infrastructure object name prefix has been set, override it.
if (advisorObjectNamePrefix == null)
{
Index: AbstractAutoProxyCreator.cs
===================================================================
RCS file: /cvsroot/springnet/Spring.Net/src/Spring/Spring.Aop/Aop/Framework/AutoProxy/AbstractAutoProxyCreator.cs,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** AbstractAutoProxyCreator.cs 7 Sep 2007 01:51:49 -0000 1.12
--- AbstractAutoProxyCreator.cs 8 Oct 2007 22:04:51 -0000 1.13
***************
*** 24,27 ****
--- 24,28 ----
using System.Collections;
using System.Reflection;
+ using System.Runtime.Remoting;
using AopAlliance.Aop;
using Common.Logging;
***************
*** 33,36 ****
--- 34,38 ----
using Spring.Objects.Factory;
using Spring.Objects.Factory.Config;
+ using Spring.Util;
#endregion
***************
*** 252,257 ****
//ITargetSource targetSource = GetCustomTargetSource(obj.GetType(), objectName);
!
! object[] specificInterceptors = GetAdvicesAndAdvisorsForObject(obj.GetType(), objectName, null);
// proxy if we have advice or if a TargetSourceCreator wants to do some
--- 254,267 ----
//ITargetSource targetSource = GetCustomTargetSource(obj.GetType(), objectName);
! object[] specificInterceptors;
! if (RemotingServices.IsTransparentProxy(obj))
! {
! specificInterceptors = GetAdvicesAndAdvisorsForObject(ObjectFactory.GetType(objectName), objectName, null);
! }
! else
! {
! specificInterceptors = GetAdvicesAndAdvisorsForObject(obj.GetType(), objectName, null);
! }
!
// proxy if we have advice or if a TargetSourceCreator wants to do some
|