springnet-commits — Automatic mailing when changes are committed to CVS

[Springnet-commits] Spring.Net/src/Spring/Spring.Web/Util IVirtualEnvironment.cs, 1.3, 1.4 VirtualEnvironment.cs, 1.4, 1.5

[Erich E. <oak...@us...>]

Update of /cvsroot/springnet/Spring.Net/src/Spring/Spring.Web/Util
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv23167/src/Spring/Spring.Web/Util

Modified Files:
	IVirtualEnvironment.cs VirtualEnvironment.cs 
Log Message:
fixed SPRNET-872

Index: VirtualEnvironment.cs
===================================================================
RCS file: /cvsroot/springnet/Spring.Net/src/Spring/Spring.Web/Util/VirtualEnvironment.cs,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** VirtualEnvironment.cs	2 Aug 2007 20:49:59 -0000	1.4
--- VirtualEnvironment.cs	14 Mar 2008 12:02:45 -0000	1.5
***************
*** 82,86 ****
              public string ApplicationVirtualPath
              {
!                 get { return HttpRuntime.AppDomainAppVirtualPath; }
              }
  
--- 82,90 ----
              public string ApplicationVirtualPath
              {
!                 get { 
!                     string appPath = HttpRuntime.AppDomainAppVirtualPath;
!                     if (!appPath.EndsWith("/")) appPath = appPath + "/";
!                     return appPath;
!                 }
              }
  
***************
*** 90,93 ****
--- 94,101 ----
              }
  
+             public string CurrentVirtualFilePath
+             {
+                 get { return HttpContext.Current.Request.FilePath; }
+             }
  
              public string CurrentExecutionFilePath
***************
*** 116,120 ****
                  }
  #endif
!                 throw new ArgumentException("cant map context relative path outside a context");
              }
          }
--- 124,128 ----
                  }
  #endif
!                 throw new ArgumentException("can't map context relative path outside a context");
              }
          }
***************
*** 123,127 ****
  
          /// <summary>
!         /// The virtual (rooted) path of the current Application
          /// </summary>
          public static string ApplicationVirtualPath
--- 131,135 ----
  
          /// <summary>
!         /// The virtual (rooted) path of the current Application containing a leading '/' as well as a trailing '/'
          /// </summary>
          public static string ApplicationVirtualPath
***************
*** 131,135 ****
  
          /// <summary>
!         /// The virtual (rooted) path of the current Request
          /// </summary>
          public static string CurrentVirtualPath
--- 139,143 ----
  
          /// <summary>
!         /// The virtual (rooted) path of the current Request including <see cref="HttpRequest.PathInfo"/>
          /// </summary>
          public static string CurrentVirtualPath
***************
*** 139,142 ****
--- 147,158 ----
  
          /// <summary>
+         /// The virtual (rooted) path of the current Request without trailing <see cref="HttpRequest.PathInfo"/>
+         /// </summary>
+         public static string CurrentVirtualFilePath
+         {
+             get { return instance.CurrentVirtualFilePath; }
+         }
+ 
+         /// <summary>
          /// The virtual (rooted) path of the currently executing script
          /// </summary>

Index: IVirtualEnvironment.cs
===================================================================
RCS file: /cvsroot/springnet/Spring.Net/src/Spring/Spring.Web/Util/IVirtualEnvironment.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** IVirtualEnvironment.cs	29 May 2007 18:19:08 -0000	1.3
--- IVirtualEnvironment.cs	14 Mar 2008 12:02:45 -0000	1.4
***************
*** 40,51 ****
      {
          /// <summary>
!         /// The virtual (rooted) path of the current Application
          /// </summary>
          string ApplicationVirtualPath { get; }
          /// <summary>
!         /// The virtual (rooted) path of the current Request
          /// </summary>
          string CurrentVirtualPath { get; }
! 
          /// <summary>
          /// The virtual (rooted) path of the currently executing script
--- 40,57 ----
      {
          /// <summary>
!         /// The virtual (rooted) path of the current Application with trailing slash
          /// </summary>
+         /// <remarks>
+         /// For the site rooted applications, "/" will be returned, for all others "/..someappdir../"
+         /// </remarks>
          string ApplicationVirtualPath { get; }
          /// <summary>
!         /// The virtual (rooted) path of the current Request including <see cref="HttpRequest.PathInfo"/>
          /// </summary>
          string CurrentVirtualPath { get; }
!         /// <summary>
!         /// The virtual (rooted) path of the current Request without trailing <see cref="HttpRequest.PathInfo"/>
!         /// </summary>
!         string CurrentVirtualFilePath { get; }
          /// <summary>
          /// The virtual (rooted) path of the currently executing script
***************
*** 57,61 ****
          /// </remarks>
          string CurrentExecutionFilePath { get; }
- 
          /// <summary>
          /// Maps a virtual path to it's physical location
--- 63,66 ----

[Springnet-commits] Spring.Net/test/Spring/Spring.Web.Tests/Core/IO WebResourceTests.cs, 1.5, 1.6

[Erich E. <oak...@us...>]

Update of /cvsroot/springnet/Spring.Net/test/Spring/Spring.Web.Tests/Core/IO
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv23167/test/Spring/Spring.Web.Tests/Core/IO

Modified Files:
	WebResourceTests.cs 
Log Message:
fixed SPRNET-872

Index: WebResourceTests.cs
===================================================================
RCS file: /cvsroot/springnet/Spring.Net/test/Spring/Spring.Web.Tests/Core/IO/WebResourceTests.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** WebResourceTests.cs	15 Dec 2007 21:21:56 -0000	1.5
--- WebResourceTests.cs	14 Mar 2008 12:02:45 -0000	1.6
***************
*** 22,27 ****
  
  using NUnit.Framework;
! using Spring.Util;
! using Spring.Web.TestSupport;
  
  #endregion
--- 22,26 ----
  
  using NUnit.Framework;
! using Spring.TestSupport;
  
  #endregion
***************
*** 42,46 ****
          public void SetUpFixture()
          {
!             testVirtualEnvironment = new VirtualEnvironmentMock("/some.request", "/", true);
          }
  
--- 41,45 ----
          public void SetUpFixture()
          {
!             testVirtualEnvironment = new VirtualEnvironmentMock("/some.request", "somepathinfo", "/", true);
          }
  

[Springnet-commits] Spring.Net/test/Spring/Spring.Web.Tests/TestSupport TestWebContext.cs, 1.4, 1.5 VirtualEnvironmentMock.cs, 1.4, 1.5

[Erich E. <oak...@us...>]

Update of /cvsroot/springnet/Spring.Net/test/Spring/Spring.Web.Tests/TestSupport
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv23167/test/Spring/Spring.Web.Tests/TestSupport

Modified Files:
	TestWebContext.cs VirtualEnvironmentMock.cs 
Log Message:
fixed SPRNET-872

Index: TestWebContext.cs
===================================================================
RCS file: /cvsroot/springnet/Spring.Net/test/Spring/Spring.Web.Tests/TestSupport/TestWebContext.cs,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** TestWebContext.cs	27 Jan 2008 23:29:55 -0000	1.4
--- TestWebContext.cs	14 Mar 2008 12:02:46 -0000	1.5
***************
*** 27,81 ****
  using System.Web;
  using System.Web.Hosting;
- using System.Web.UI;
- using NUnit.Framework;
- using Spring.Context;
- using Spring.Context.Support;
- using Spring.Web.Support;
  
  #endregion
  
! public class TestWebContext : IDisposable
  {
!     private TextWriter _out;
!     private HttpWorkerRequest _wr;
!     
!     public TestWebContext(string virtualPath, string page)
      {
!         _out = new StringWriter();
!         HttpWorkerRequest wr;
!         object appPath = Thread.GetDomain().GetData(".appPath");
!         if (appPath != null)
!         {
!             wr = new SimpleWorkerRequest(page, string.Empty, _out);
!         }
!         else
          {
!             string physDir = AppDomain.CurrentDomain.BaseDirectory + "\\";
!             wr = new SimpleWorkerRequest(virtualPath, physDir, page, string.Empty, _out);            
!         }
!         HttpContext ctx = new HttpContext(wr);
!         HttpContext.Current = ctx;
!         HttpBrowserCapabilities browser = new HttpBrowserCapabilities();		
  #if NET_2_0
!         browser.Capabilities = CollectionsUtil.CreateCaseInsensitiveHashtable();
!         browser.Capabilities[string.Empty] = "Test User Agent"; // string.Empty is the key for "user agent"
  #endif
!         ctx.Request.Browser = browser;
!         _wr = wr;
!     }
  
!     public HttpWorkerRequest HttpWorkerRequest
!     {
!         get { return _wr; }
!     }
  
!     public TextWriter Out
!     {
!         get { return _out; }
!     }
  
!     public void Dispose()
!     {
!         HttpContext.Current = null;
      }
! }
--- 27,79 ----
  using System.Web;
  using System.Web.Hosting;
  
  #endregion
  
! namespace Spring.TestSupport
  {
!     public class TestWebContext : IDisposable
      {
!         private readonly TextWriter _out;
!         private readonly HttpWorkerRequest _wr;
! 
!         public TestWebContext(string virtualPath, string page)
          {
!             _out = new StringWriter();
!             HttpWorkerRequest wr;
!             object appPath = Thread.GetDomain().GetData(".appPath");
!             if (appPath != null)
!             {
!                 wr = new SimpleWorkerRequest(page, string.Empty, _out);
!             }
!             else
!             {
!                 string physDir = AppDomain.CurrentDomain.BaseDirectory + "\\";
!                 wr = new SimpleWorkerRequest(virtualPath, physDir, page, string.Empty, _out);
!             }
!             HttpContext ctx = new HttpContext(wr);
!             HttpContext.Current = ctx;
!             HttpBrowserCapabilities browser = new HttpBrowserCapabilities();
  #if NET_2_0
!             browser.Capabilities = CollectionsUtil.CreateCaseInsensitiveHashtable();
!             browser.Capabilities[string.Empty] = "Test User Agent"; // string.Empty is the key for "user agent"
  #endif
!             ctx.Request.Browser = browser;
!             _wr = wr;
!         }
  
!         public HttpWorkerRequest HttpWorkerRequest
!         {
!             get { return _wr; }
!         }
  
!         public TextWriter Out
!         {
!             get { return _out; }
!         }
  
!         public void Dispose()
!         {
!             HttpContext.Current = null;
!         }
      }
! }
\ No newline at end of file

Index: VirtualEnvironmentMock.cs
===================================================================
RCS file: /cvsroot/springnet/Spring.Net/test/Spring/Spring.Web.Tests/TestSupport/VirtualEnvironmentMock.cs,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** VirtualEnvironmentMock.cs	15 Dec 2007 21:22:11 -0000	1.4
--- VirtualEnvironmentMock.cs	14 Mar 2008 12:02:46 -0000	1.5
***************
*** 3,7 ****
  using Spring.Util;
  
! namespace Spring.Web.TestSupport
  {
      /// <summary>
--- 3,7 ----
  using Spring.Util;
  
! namespace Spring.TestSupport
  {
      /// <summary>
***************
*** 12,26 ****
      internal class VirtualEnvironmentMock : IVirtualEnvironment, IDisposable
      {
!         private IVirtualEnvironment _prevEnvironment;
!         
!         private string _currentVirtualPath;
          private string _currentExecutionFilePath;
!         private string _applicationVirtualPath;
  
!         public VirtualEnvironmentMock(string currentVirtualPath, string applicationVirtualPath, bool autoInitialize)
          {
!             _currentVirtualPath = currentVirtualPath;
!             _applicationVirtualPath = applicationVirtualPath;
!             
              _prevEnvironment = VirtualEnvironment.SetInstance(this);
              if (autoInitialize)
--- 12,29 ----
      internal class VirtualEnvironmentMock : IVirtualEnvironment, IDisposable
      {
!         private readonly IVirtualEnvironment _prevEnvironment;
! 
!         private readonly string _currentVirtualFilePath;
!         private readonly string _pathInfo;
          private string _currentExecutionFilePath;
!         private readonly string _applicationVirtualPath;
  
!         public VirtualEnvironmentMock(string currentVirtualFilePath, string pathInfo, string applicationVirtualPath, bool autoInitialize)
          {
!             _currentVirtualFilePath = currentVirtualFilePath;
!             _pathInfo = (pathInfo == null || pathInfo.Length == 0) ? "" : "/" + pathInfo.TrimStart('/'); // prevent null string and ensure '/' prefixed
!             _applicationVirtualPath = "/" + ("" + applicationVirtualPath).Trim('/');
!             if (!_applicationVirtualPath.EndsWith("/")) _applicationVirtualPath = _applicationVirtualPath + "/";
! 
              _prevEnvironment = VirtualEnvironment.SetInstance(this);
              if (autoInitialize)
***************
*** 37,41 ****
          public string CurrentVirtualPath
          {
!             get { return _currentVirtualPath; }
          }
  
--- 40,52 ----
          public string CurrentVirtualPath
          {
!             get
!             {
!                 return _currentVirtualFilePath + _pathInfo;
!             }
!         }
! 
!         public string CurrentVirtualFilePath
!         {
!             get { return _currentVirtualFilePath; }
          }
  
***************
*** 48,52 ****
          public string MapPath(string virtualPath)
          {
!             string basePath = Path.GetDirectoryName( new Uri( GetType().Assembly.CodeBase ).LocalPath );
              string resultPath = WebUtils.CreateAbsolutePath(this.ApplicationVirtualPath, virtualPath);
              resultPath = basePath.TrimEnd('\\') + "\\" + resultPath.Replace('/', '\\').TrimStart('\\');
--- 59,63 ----
          public string MapPath(string virtualPath)
          {
!             string basePath = Path.GetDirectoryName(new Uri(GetType().Assembly.CodeBase).LocalPath);
              string resultPath = WebUtils.CreateAbsolutePath(this.ApplicationVirtualPath, virtualPath);
              resultPath = basePath.TrimEnd('\\') + "\\" + resultPath.Replace('/', '\\').TrimStart('\\');
***************
*** 56,60 ****
          public void Dispose()
          {
!            VirtualEnvironment.SetInstance(_prevEnvironment);
          }
      }
--- 67,71 ----
          public void Dispose()
          {
!             VirtualEnvironment.SetInstance(_prevEnvironment);
          }
      }

[Springnet-commits] Spring.Net/test/Spring/Spring.Data.Integration.Tests Spring.Data.Integration.Tests.2005.csproj, 1.25, 1.26 Spring.Data.Integration.Tests.dll.config, 1.6, 1.7

[Erich E. <oak...@us...>]

Update of /cvsroot/springnet/Spring.Net/test/Spring/Spring.Data.Integration.Tests
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv23167/test/Spring/Spring.Data.Integration.Tests

Modified Files:
	Spring.Data.Integration.Tests.2005.csproj 
	Spring.Data.Integration.Tests.dll.config 
Log Message:
fixed SPRNET-872

Index: Spring.Data.Integration.Tests.dll.config
===================================================================
RCS file: /cvsroot/springnet/Spring.Net/test/Spring/Spring.Data.Integration.Tests/Spring.Data.Integration.Tests.dll.config,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Spring.Data.Integration.Tests.dll.config	29 Jan 2008 20:27:32 -0000	1.6
--- Spring.Data.Integration.Tests.dll.config	14 Mar 2008 12:02:45 -0000	1.7
***************
*** 3,8 ****
    <configSections>
  
-     <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,log4net" />
-     
      <sectionGroup name="common">
        <section name="logging" type="Common.Logging.ConfigurationSectionHandler, Common.Logging" />
--- 3,6 ----
***************
*** 17,21 ****
      <logging>
  
!       <factoryAdapter type="Common.Logging.Simple.ConsoleOutLoggerFactoryAdapter, Common.Logging">
          <arg key="level" value="INFO" />
  
--- 15,19 ----
      <logging>
  
!       <factoryAdapter type="Common.Logging.Simple.TraceLoggerFactoryAdapter, Common.Logging">
          <arg key="level" value="INFO" />
  
***************
*** 24,29 ****
      </logging>
    </common>
!   
!   
    <spring>
      <parsers>
--- 22,26 ----
      </logging>
    </common>
!     
    <spring>
      <parsers>
***************
*** 31,80 ****
      </parsers>
    </spring>
- <!--
-   <common>
-     <logging>
-       <factoryAdapter type="Common.Logging.Log4Net.Log4NetLoggerFactoryAdapter, Common.Logging.Log4Net">
-         <arg key="configType" value="INLINE" />
-       </factoryAdapter>
-     </logging>
-   </common>
- -->
- 
-   <log4net>
-     <appender name="ConsoleAppender" type="log4net.Appender.ConsoleAppender">
-       <layout type="log4net.Layout.PatternLayout">
-         <conversionPattern value="%-5level - %message%newline" />
-       </layout>
-     </appender>
- 
-     <!-- Set default logging level to DEBUG -->
-     <root>
-       <level value="INFO" />
-       <appender-ref ref="ConsoleAppender" />
-     </root>
- 
- 
-     <!-- Set logging for Spring to INFO.  
-          Logger names in Spring correspond to the namespace -->
- 
-     <logger name="Spring">
-       <level value="INFO" />
-     </logger>
- 
- 
-     <!--
-       <logger name="Spring.Data">
-         <level value="DEBUG" />
-       </logger>
-       -->
- 
-     <!--
-     <logger name="Spring.Transaction">
-       <level value="DEBUG" />
-     </logger>
-     -->
- 
- 
-   </log4net>
  
  </configuration>
\ No newline at end of file
--- 28,31 ----

Index: Spring.Data.Integration.Tests.2005.csproj
===================================================================
RCS file: /cvsroot/springnet/Spring.Net/test/Spring/Spring.Data.Integration.Tests/Spring.Data.Integration.Tests.2005.csproj,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** Spring.Data.Integration.Tests.2005.csproj	29 Jan 2008 20:27:32 -0000	1.25
--- Spring.Data.Integration.Tests.2005.csproj	14 Mar 2008 12:02:45 -0000	1.26
***************
*** 74,89 ****
        <HintPath>..\..\..\lib\Net\2.0\Common.Logging.dll</HintPath>
      </Reference>
-     <Reference Include="Common.Logging.Log4Net, Version=1.2.0.2, Culture=neutral, PublicKeyToken=af08829b84f0328e, processorArchitecture=MSIL">
-       <SpecificVersion>False</SpecificVersion>
-       <HintPath>..\..\..\lib\Net\2.0\Common.Logging.Log4Net.dll</HintPath>
-     </Reference>
      <Reference Include="DotNetMock, Version=0.7.4.0, Culture=neutral, PublicKeyToken=805ea88df19095f6">
        <SpecificVersion>False</SpecificVersion>
        <HintPath>..\..\..\lib\Net\2.0\DotNetMock.dll</HintPath>
      </Reference>
-     <Reference Include="log4net, Version=1.2.10.0, Culture=neutral, PublicKeyToken=1b44e1d426115821, processorArchitecture=MSIL">
-       <SpecificVersion>False</SpecificVersion>
-       <HintPath>..\..\..\lib\Net\2.0\log4net.dll</HintPath>
-     </Reference>
      <Reference Include="nunit.framework, Version=2.2.5.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
        <SpecificVersion>False</SpecificVersion>
--- 74,81 ----

[Springnet-commits] Spring.Net/src/Spring/Spring.Testing.NUnit/Testing/NUnit AbstractDependencyInjectionSpringContextTests.cs, 1.3, 1.4

[Erich E. <oak...@us...>]

Update of /cvsroot/springnet/Spring.Net/src/Spring/Spring.Testing.NUnit/Testing/NUnit
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv23167/src/Spring/Spring.Testing.NUnit/Testing/NUnit

Modified Files:
	AbstractDependencyInjectionSpringContextTests.cs 
Log Message:
fixed SPRNET-872

Index: AbstractDependencyInjectionSpringContextTests.cs
===================================================================
RCS file: /cvsroot/springnet/Spring.Net/src/Spring/Spring.Testing.NUnit/Testing/NUnit/AbstractDependencyInjectionSpringContextTests.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** AbstractDependencyInjectionSpringContextTests.cs	29 Jan 2008 18:29:33 -0000	1.3
--- AbstractDependencyInjectionSpringContextTests.cs	14 Mar 2008 12:02:45 -0000	1.4
***************
*** 322,325 ****
--- 322,328 ----
          }
  
+         /// <summary>
+         /// Called right before a field is being injected
+         /// </summary>
          protected virtual void BeforeProtectedVariableInjection(FieldInfo fieldInfo)
          {

[Springnet-commits] Spring.Net/test/Spring/Spring.Web.Tests/Util ControlInterceptionTests.cs, 1.8, 1.9 WebUtilsTests.cs, 1.7, 1.8

[Erich E. <oak...@us...>]

Update of /cvsroot/springnet/Spring.Net/test/Spring/Spring.Web.Tests/Util
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv23167/test/Spring/Spring.Web.Tests/Util

Modified Files:
	ControlInterceptionTests.cs WebUtilsTests.cs 
Log Message:
fixed SPRNET-872

Index: WebUtilsTests.cs
===================================================================
RCS file: /cvsroot/springnet/Spring.Net/test/Spring/Spring.Web.Tests/Util/WebUtilsTests.cs,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** WebUtilsTests.cs	15 Dec 2007 21:22:11 -0000	1.7
--- WebUtilsTests.cs	14 Mar 2008 12:02:46 -0000	1.8
***************
*** 25,29 ****
  using Spring.Objects.Factory;
  using Spring.Objects.Factory.Support;
! using Spring.Web.TestSupport;
  
  #endregion
--- 25,29 ----
  using Spring.Objects.Factory;
  using Spring.Objects.Factory.Support;
! using Spring.TestSupport;
  
  #endregion
***************
*** 182,186 ****
          {
              // emulate root website context
!             using( new VirtualEnvironmentMock("/somedir/some.file", "/", true) )
              {
                  CombineVirtualPathsSuite( "/" );
--- 182,186 ----
          {
              // emulate root website context
!             using( new VirtualEnvironmentMock("/somedir/some.file", null, "/", true) )
              {
                  CombineVirtualPathsSuite( "/" );
***************
*** 192,196 ****
          {
              // emulate child website context
!             using( new VirtualEnvironmentMock("/somedir/some.file", "/myapp", true) )
              {
                  CombineVirtualPathsSuite( "/myapp/" );
--- 192,196 ----
          {
              // emulate child website context
!             using( new VirtualEnvironmentMock("/somedir/some.file", null, "/myapp", true) )
              {
                  CombineVirtualPathsSuite( "/myapp/" );

Index: ControlInterceptionTests.cs
===================================================================
RCS file: /cvsroot/springnet/Spring.Net/test/Spring/Spring.Web.Tests/Util/ControlInterceptionTests.cs,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** ControlInterceptionTests.cs	1 Aug 2007 23:11:10 -0000	1.8
--- ControlInterceptionTests.cs	14 Mar 2008 12:02:46 -0000	1.9
***************
*** 22,32 ****
  
  using System;
- using System.IO;
- using System.Web;
- using System.Web.Hosting;
  using System.Web.UI;
  using NUnit.Framework;
  using Spring.Context;
  using Spring.Context.Support;
  using Spring.Web.Support;
  
--- 22,30 ----
  
  using System;
  using System.Web.UI;
  using NUnit.Framework;
  using Spring.Context;
  using Spring.Context.Support;
+ using Spring.TestSupport;
  using Spring.Web.Support;
  

[Springnet-commits] Spring.Net/src/Spring/Spring.Core/Util AssertUtils.cs, 1.12, 1.13

[Bruno B. <bb...@us...>]

Update of /cvsroot/springnet/Spring.Net/src/Spring/Spring.Core/Util
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv25438

Modified Files:
	AssertUtils.cs 
Log Message:
Minor comment fix.

Index: AssertUtils.cs
===================================================================
RCS file: /cvsroot/springnet/Spring.Net/src/Spring/Spring.Core/Util/AssertUtils.cs,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** AssertUtils.cs	30 May 2007 22:35:58 -0000	1.12
--- AssertUtils.cs	14 Mar 2008 10:45:08 -0000	1.13
***************
*** 85,89 ****
  		/// <summary>
  		/// Checks the value of the supplied string <paramref name="argument"/> and throws an
! 		/// <see cref="System.ArgumentException"/> if it is <see langword="null"/> or
  		/// contains only whitespace character(s).
  		/// </summary>
--- 85,89 ----
  		/// <summary>
  		/// Checks the value of the supplied string <paramref name="argument"/> and throws an
!         /// <see cref="System.ArgumentNullException"/> if it is <see langword="null"/> or
  		/// contains only whitespace character(s).
  		/// </summary>

[Springnet-commits] Spring.Net/test/Spring/Spring.Core.Tests/Context/Support ContextLocatorHandlerTests.cs, 1.11, 1.12

[Bruno B. <bb...@us...>]

Update of /cvsroot/springnet/Spring.Net/test/Spring/Spring.Core.Tests/Context/Support
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv9189/Context/Support

Modified Files:
	ContextLocatorHandlerTests.cs 
Log Message:
Fixed Hierarchical  context loading. SPRNET-891

Index: ContextLocatorHandlerTests.cs
===================================================================
RCS file: /cvsroot/springnet/Spring.Net/test/Spring/Spring.Core.Tests/Context/Support/ContextLocatorHandlerTests.cs,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** ContextLocatorHandlerTests.cs	9 Apr 2006 07:19:07 -0000	1.11
--- ContextLocatorHandlerTests.cs	13 Mar 2008 20:07:54 -0000	1.12
***************
*** 151,162 ****
              IApplicationContext childCtx = ContextRegistry.GetContext("Child");
              Assert.IsNotNull(childCtx, "Child context not registered.");
!             Assert.AreEqual("Parent", parentCtx.Name, "Child's DisplayName property not picked up from config file.");
  
              // ensure proper objects have been loaded into the correct context...
!             Assert.IsTrue(parentCtx.ContainsObjectDefinition("Parent"), "Parent contexct object not present (must be).");
              Assert.IsFalse(parentCtx.ContainsObjectDefinition("Child"), "Wrong (child context) object present in Parent context.");
  
!             Assert.IsTrue(childCtx.ContainsObjectDefinition("Child"), "Child contexct object not present (must be).");
              Assert.IsFalse(childCtx.ContainsObjectDefinition("Parent"), "Wrong (parent context) object present in Child context.");
          }
  	}
--- 151,171 ----
              IApplicationContext childCtx = ContextRegistry.GetContext("Child");
              Assert.IsNotNull(childCtx, "Child context not registered.");
!             Assert.AreEqual("Child", childCtx.Name, "Child's DisplayName property not picked up from config file.");
!             Assert.AreEqual("Parent", childCtx.ParentContext.Name);
!             IApplicationContext grandchildCtx = ContextRegistry.GetContext("Grandchild");
!             Assert.IsNotNull(grandchildCtx, "Grandchild context not registered.");
!             Assert.AreEqual("Grandchild", grandchildCtx.Name, "Grandchild's DisplayName property not picked up from config file.");
!             Assert.AreEqual("Child", grandchildCtx.ParentContext.Name);
  
              // ensure proper objects have been loaded into the correct context...
!             Assert.IsTrue(parentCtx.ContainsObjectDefinition("Parent"), "Parent context object not present (must be).");
              Assert.IsFalse(parentCtx.ContainsObjectDefinition("Child"), "Wrong (child context) object present in Parent context.");
  
!             Assert.IsTrue(childCtx.ContainsObjectDefinition("Child"), "Child context object not present (must be).");
              Assert.IsFalse(childCtx.ContainsObjectDefinition("Parent"), "Wrong (parent context) object present in Child context.");
+ 
+             Assert.IsTrue(grandchildCtx.ContainsObjectDefinition("Grandchild"), "Grandchild context object not present (must be).");
+             Assert.IsFalse(grandchildCtx.ContainsObjectDefinition("Child"), "Wrong (parent context) object present in Grandchild context.");
+             Assert.IsFalse(grandchildCtx.ContainsObjectDefinition("Parent"), "Wrong (parent context) object present in Grandchild context.");
          }
  	}

[Springnet-commits] Spring.Net/test/Spring/Spring.Core.Tests Spring.Core.Tests.dll-1.1.config, 1.4, 1.5 Spring.Core.Tests.dll.config, 1.20, 1.21

[Bruno B. <bb...@us...>]

Update of /cvsroot/springnet/Spring.Net/test/Spring/Spring.Core.Tests
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv9189

Modified Files:
	Spring.Core.Tests.dll-1.1.config Spring.Core.Tests.dll.config 
Log Message:
Fixed Hierarchical  context loading. SPRNET-891

Index: Spring.Core.Tests.dll-1.1.config
===================================================================
RCS file: /cvsroot/springnet/Spring.Net/test/Spring/Spring.Core.Tests/Spring.Core.Tests.dll-1.1.config,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Spring.Core.Tests.dll-1.1.config	8 Aug 2007 03:13:30 -0000	1.4
--- Spring.Core.Tests.dll-1.1.config	13 Mar 2008 20:07:54 -0000	1.5
***************
*** 46,49 ****
--- 46,52 ----
          <section name='objects' type='Spring.Context.Support.DefaultSectionHandler, Spring.Core' />
        </sectionGroup>
+       <sectionGroup name="grandchild">
+         <section name='objects' type='Spring.Context.Support.DefaultSectionHandler, Spring.Core' />
+       </sectionGroup>
      </sectionGroup>
    </configSections>
***************
*** 102,109 ****
  			type='Spring.Context.Support.XmlApplicationContext, Spring.Core'
  			name='Parent'>
!       <resource uri='config://spring/objects'/>
        <!-- child context -->
        <context name='Child'>
!         <resource uri='config://spring/child/objects'/>
        </context>
      </context>
--- 105,116 ----
  			type='Spring.Context.Support.XmlApplicationContext, Spring.Core'
  			name='Parent'>
!       <resource uri='config://spring2/objects'/>
        <!-- child context -->
        <context name='Child'>
!         <resource uri='config://spring2/child/objects'/>
!         <!-- grandchild context -->
!         <context name='Grandchild'>
!           <resource uri='config://spring2/grandchild/objects'/>
!         </context>
        </context>
      </context>
***************
*** 116,128 ****
      </objects>
  
- 
      <!-- child context's objects -->
      <child>
        <objects xmlns='http://www.springframework.net'>
!         <object id='Child' type='Spring.Objects.TestObject,Spring.Core.Tests'>
            <property name='name' value='Child'/>
          </object>
        </objects>
      </child>
    </spring2>
  
--- 123,143 ----
      </objects>
  
      <!-- child context's objects -->
      <child>
        <objects xmlns='http://www.springframework.net'>
!         <object id='Child' type='Spring.Objects.TestObject, Spring.Core.Tests'>
            <property name='name' value='Child'/>
          </object>
        </objects>
      </child>
+ 
+     <!-- grandchild context's objects -->
+     <grandchild>
+       <objects xmlns='http://www.springframework.net'>
+         <object id='Grandchild' type='Spring.Objects.TestObject, Spring.Core.Tests'>
+           <property name='name' value='Grandchild'/>
+         </object>
+       </objects>
+     </grandchild>
    </spring2>
  

Index: Spring.Core.Tests.dll.config
===================================================================
RCS file: /cvsroot/springnet/Spring.Net/test/Spring/Spring.Core.Tests/Spring.Core.Tests.dll.config,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** Spring.Core.Tests.dll.config	8 Aug 2007 01:54:03 -0000	1.20
--- Spring.Core.Tests.dll.config	13 Mar 2008 20:07:54 -0000	1.21
***************
*** 46,49 ****
--- 46,52 ----
          <section name='objects' type='Spring.Context.Support.DefaultSectionHandler, Spring.Core' />
        </sectionGroup>
+       <sectionGroup name="grandchild">
+         <section name='objects' type='Spring.Context.Support.DefaultSectionHandler, Spring.Core' />
+       </sectionGroup>
      </sectionGroup>
    </configSections>
***************
*** 83,88 ****
          <to:name>John</to:name>
        </to:testobject>
-       
- 
      </objects>
  
--- 86,89 ----
***************
*** 104,111 ****
  			type='Spring.Context.Support.XmlApplicationContext, Spring.Core'
  			name='Parent'>
!       <resource uri='config://spring/objects'/>
        <!-- child context -->
        <context name='Child'>
!         <resource uri='config://spring/child/objects'/>
        </context>
      </context>
--- 105,116 ----
  			type='Spring.Context.Support.XmlApplicationContext, Spring.Core'
  			name='Parent'>
!       <resource uri='config://spring2/objects'/>
        <!-- child context -->
        <context name='Child'>
!         <resource uri='config://spring2/child/objects'/>
!         <!-- grandchild context -->
!         <context name='Grandchild'>
!           <resource uri='config://spring2/grandchild/objects'/>
!         </context>
        </context>
      </context>
***************
*** 118,130 ****
      </objects>
  
- 
      <!-- child context's objects -->
      <child>
        <objects xmlns='http://www.springframework.net'>
!         <object id='Child' type='Spring.Objects.TestObject,Spring.Core.Tests'>
            <property name='name' value='Child'/>
          </object>
        </objects>
      </child>
    </spring2>
  
--- 123,143 ----
      </objects>
  
      <!-- child context's objects -->
      <child>
        <objects xmlns='http://www.springframework.net'>
!         <object id='Child' type='Spring.Objects.TestObject, Spring.Core.Tests'>
            <property name='name' value='Child'/>
          </object>
        </objects>
      </child>
+ 
+     <!-- grandchild context's objects -->
+     <grandchild>
+       <objects xmlns='http://www.springframework.net'>
+         <object id='Grandchild' type='Spring.Objects.TestObject, Spring.Core.Tests'>
+           <property name='name' value='Grandchild'/>
+         </object>
+       </objects>
+     </grandchild>
    </spring2>
  

[Springnet-commits] Spring.Net/src/Spring/Spring.Web/Context/Support WebContextHandler.cs, 1.7, 1.8

[Bruno B. <bb...@us...>]

Update of /cvsroot/springnet/Spring.Net/src/Spring/Spring.Web/Context/Support
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv9175

Modified Files:
	WebContextHandler.cs 
Log Message:
Fixed Hierarchical  context loading. SPRNET-891

Index: WebContextHandler.cs
===================================================================
RCS file: /cvsroot/springnet/Spring.Net/src/Spring/Spring.Web/Context/Support/WebContextHandler.cs,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** WebContextHandler.cs	26 Jul 2007 14:43:33 -0000	1.7
--- WebContextHandler.cs	13 Mar 2008 20:07:43 -0000	1.8
***************
*** 89,99 ****
          /// </remarks>
          protected override void CreateChildContexts(IApplicationContext parentContext, object configContext,
!                                                     XmlNodeList childContexts)
          {
              // disable child contexts in webapps
!             if (childContexts.Count > 0)
              {
                  throw ConfigurationUtils.CreateConfigurationException(
!                     String.Format("Nested Child Contexts are not allowed in Web Applications."), childContexts[0]);
              }
          }
--- 89,99 ----
          /// </remarks>
          protected override void CreateChildContexts(IApplicationContext parentContext, object configContext,
!                                                     XmlNode[] childContexts)
          {
              // disable child contexts in webapps
!             if (childContexts.Length > 0)
              {
                  throw ConfigurationUtils.CreateConfigurationException(
!                     String.Format("Nested Child Contexts are not allowed in Web Applications. Use Web.config hierarchy instead."), childContexts[0]);
              }
          }

[Springnet-commits] Spring.Net/src/Spring/Spring.Core/Context/Support ContextHandler.cs, 1.35, 1.36

[Bruno B. <bb...@us...>]

Update of /cvsroot/springnet/Spring.Net/src/Spring/Spring.Core/Context/Support
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv9161

Modified Files:
	ContextHandler.cs 
Log Message:
Fixed Hierarchical  context loading. SPRNET-891

Index: ContextHandler.cs
===================================================================
RCS file: /cvsroot/springnet/Spring.Net/src/Spring/Spring.Core/Context/Support/ContextHandler.cs,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** ContextHandler.cs	5 Oct 2007 17:05:49 -0000	1.35
--- ContextHandler.cs	13 Mar 2008 20:07:33 -0000	1.36
***************
*** 281,286 ****
  
  				// get and create child context definitions
! 				XmlNodeList childContexts = contextElement.GetElementsByTagName(ContextSchema.ContextElement);
! 				CreateChildContexts(context, configContext, childContexts );
  
  	        	if (Log.IsDebugEnabled) Log.Debug( string.Format("context '{0}' created for name '{1}'", context, contextName) );
--- 281,286 ----
  
  				// get and create child context definitions
!                 XmlNode[] childContexts = GetChildContexts(contextElement);
! 				CreateChildContexts(context, configContext, childContexts);
  
  	        	if (Log.IsDebugEnabled) Log.Debug( string.Format("context '{0}' created for name '{1}'", context, contextName) );
***************
*** 305,316 ****
  		/// <param name="configContext">The current configContext <see cref="IConfigurationSectionHandler.Create"/></param>
  		/// <param name="childContexts">The list of child context elements</param>
! 		protected virtual void CreateChildContexts( IApplicationContext parentContext, object configContext, XmlNodeList childContexts)
! 		{
! 			if (childContexts == null) return;
! 			
  			// create child contexts for 'the most recently created context'...
  			foreach (XmlNode childContext in childContexts)
  			{
- 				//ContextHandler handler = new ContextHandler();
  				this.Create(parentContext, configContext, childContext);
  			}
--- 305,313 ----
  		/// <param name="configContext">The current configContext <see cref="IConfigurationSectionHandler.Create"/></param>
  		/// <param name="childContexts">The list of child context elements</param>
! 		protected virtual void CreateChildContexts(IApplicationContext parentContext, object configContext, XmlNode[] childContexts)
! 		{	
  			// create child contexts for 'the most recently created context'...
  			foreach (XmlNode childContext in childContexts)
  			{
  				this.Create(parentContext, configContext, childContext);
  			}
***************
*** 402,408 ****
  	    /// <see cref="Spring.Context.IApplicationContext"/> interface.
  	    /// </exception>
! 	    private Type GetConfiguredContextType( XmlElement ContextElement, Type defaultContextType )
  	    {
!             string typeName = ContextElement.GetAttribute(ContextSchema.TypeAttribute);
  			
              if (StringUtils.IsNullOrEmpty(typeName))
--- 399,405 ----
  	    /// <see cref="Spring.Context.IApplicationContext"/> interface.
  	    /// </exception>
! 	    private Type GetConfiguredContextType(XmlElement contextElement, Type defaultContextType)
  	    {
!             string typeName = contextElement.GetAttribute(ContextSchema.TypeAttribute);
  			
              if (StringUtils.IsNullOrEmpty(typeName))
***************
*** 437,444 ****
  	    /// this context.
  	    /// </summary>
! 	    private string[] GetResources( XmlElement ContextElement )
  	    {
! 	        ArrayList resourceNodes = new ArrayList(ContextElement.ChildNodes.Count);
! 	        foreach (XmlNode possibleResourceNode in ContextElement.ChildNodes)
  	        {
  	            XmlElement possibleResourceElement = possibleResourceNode as XmlElement;
--- 434,441 ----
  	    /// this context.
  	    /// </summary>
! 	    private string[] GetResources( XmlElement contextElement )
  	    {
! 	        ArrayList resourceNodes = new ArrayList(contextElement.ChildNodes.Count);
! 	        foreach (XmlNode possibleResourceNode in contextElement.ChildNodes)
  	        {
  	            XmlElement possibleResourceElement = possibleResourceNode as XmlElement;
***************
*** 456,459 ****
--- 453,474 ----
  	    }
  
+         /// <summary>
+         /// Returns the array of child contexts for this context.
+         /// </summary>
+         private XmlNode[] GetChildContexts(XmlElement contextElement)
+         {
+             ArrayList contextNodes = new ArrayList(contextElement.ChildNodes.Count);
+             foreach (XmlNode possibleContextNode in contextElement.ChildNodes)
+             {
+                 XmlElement possibleContextElement = possibleContextNode as XmlElement;
+                 if (possibleContextElement != null &&
+                    possibleContextElement.LocalName == ContextSchema.ContextElement)
+                 {
+                     contextNodes.Add(possibleContextElement);
+                 }
+             }
+             return (XmlNode[])contextNodes.ToArray(typeof(XmlNode));
+         }
+ 
  	    #region Inner Class : ContextInstantiator
  

[Springnet-commits] Spring.Net/src/Spring/Spring.Web/Web/UI/Controls Panel.cs, 1.2, 1.3

[Erich E. <oak...@us...>]

Update of /cvsroot/springnet/Spring.Net/src/Spring/Spring.Web/Web/UI/Controls
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv25332

Modified Files:
	Panel.cs 
Log Message:
SPRNET-794 improved Panel for use without Spring's PageHandlerFactory

Index: Panel.cs
===================================================================
RCS file: /cvsroot/springnet/Spring.Net/src/Spring/Spring.Web/Web/UI/Controls/Panel.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Panel.cs	3 Feb 2008 21:38:27 -0000	1.2
--- Panel.cs	9 Mar 2008 15:20:37 -0000	1.3
***************
*** 22,26 ****
--- 22,29 ----
  
  using System;
+ using System.Collections;
  using System.ComponentModel;
+ using System.Diagnostics;
+ using System.Reflection;
  using System.Security.Permissions;
  using System.Web;
***************
*** 57,60 ****
--- 60,91 ----
      public class Panel : System.Web.UI.WebControls.Panel, ISupportsWebDependencyInjection
      {
+         // this helper class intercepts the first call to the child controls 
+         // collection from within InitRecursive().
+         // InitRecursive() is called right after the control has been added to it's parent's children.
+         private class InitRecursiveInterceptingControlsCollection : ControlCollection
+         {
+             private bool _passedInitRecursiveCheck = false;
+ 
+             public InitRecursiveInterceptingControlsCollection(Control owner) : base(owner)
+             {
+             }
+ 
+             public override Control this[int index]
+             {
+                 get
+                 {
+                     // the following check relies on the fact, that ControlCollection is set readonly 
+                     // right before InitRecursive() is called on each child control
+                     if (!_passedInitRecursiveCheck
+                         && this.IsReadOnly)
+                     {
+                             _passedInitRecursiveCheck = true;
+                             ((Panel)this.Owner).OnPreInitRecursive(EventArgs.Empty);
+                     }
+                     return base[index];
+                 }
+             }
+         }
+ 
          private bool _suppressDependencyInjection;
          private bool _renderContainerTag;
***************
*** 95,98 ****
--- 126,145 ----
          }
  
+         /// <summary>
+         /// This method is invoked right before InitRecursive() is called for this Panel and
+         /// ensures, that dependencies get injected on child controls before their Init event is raised.
+         /// </summary>
+         protected virtual void OnPreInitRecursive(EventArgs e)
+         {
+             if (!_suppressDependencyInjection 
+                 && _defaultApplicationContext == null)
+             {
+                 // obtain appContext of the closed parent template (.ascx/.aspx) control
+                 IApplicationContext appCtx = WebApplicationContext.GetContext(this.TemplateSourceDirectory.TrimEnd('/') + "/");
+                 // NOTE: _defaultApplicationContext will be set during DI!
+                 WebDependencyInjectionUtils.InjectDependenciesRecursive(appCtx, this);
+             }
+         }
+ 
          #region Dependency Injection Support
  
***************
*** 113,117 ****
          protected override void AddedControl(Control control, int index)
          {
!             if (!_suppressDependencyInjection)
              {
                  WebDependencyInjectionUtils.InjectDependenciesRecursive(_defaultApplicationContext, control);
--- 160,165 ----
          protected override void AddedControl(Control control, int index)
          {
!             if (!_suppressDependencyInjection 
!                 && _defaultApplicationContext != null)
              {
                  WebDependencyInjectionUtils.InjectDependenciesRecursive(_defaultApplicationContext, control);
***************
*** 131,137 ****
              {
                  _defaultApplicationContext = WebApplicationContext.GetRootContext();
              }
- 
-             return base.CreateControlCollection();
          }
  
--- 179,188 ----
              {
                  _defaultApplicationContext = WebApplicationContext.GetRootContext();
+                 return base.CreateControlCollection();
+             }
+             else
+             {
+                 return new InitRecursiveInterceptingControlsCollection(this);
              }
          }
  

[Springnet-commits] Spring.Net/src/Spring/Spring.Web/Web/UI/Controls DataBindingPanel.cs, 1.12, 1.13

[Erich E. <oak...@us...>]

Update of /cvsroot/springnet/Spring.Net/src/Spring/Spring.Web/Web/UI/Controls
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv12863

Modified Files:
	DataBindingPanel.cs 
Log Message:
excluded HiddenField support from builds for net < 2.0

Index: DataBindingPanel.cs
===================================================================
RCS file: /cvsroot/springnet/Spring.Net/src/Spring/Spring.Web/Web/UI/Controls/DataBindingPanel.cs,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** DataBindingPanel.cs	6 Mar 2008 19:03:24 -0000	1.12
--- DataBindingPanel.cs	6 Mar 2008 20:23:44 -0000	1.13
***************
*** 327,334 ****
--- 327,336 ----
                  return "Text";
              }
+ #if NET_2_0
              else if (wc is HiddenField)
              {
                  return "Value";
              }
+ #endif
              else if (wc is RadioButtonGroup)
              {

[Springnet-commits] Spring.Net/src/Spring/Spring.Core/Reflection/Dynamic DynamicMethod.cs, 1.1, 1.2

[Erich E. <oak...@us...>]

Update of /cvsroot/springnet/Spring.Net/src/Spring/Spring.Core/Reflection/Dynamic
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv11994/src/Spring/Spring.Core/Reflection/Dynamic

Modified Files:
	DynamicMethod.cs 
Log Message:
SPRNET-755

Index: DynamicMethod.cs
===================================================================
RCS file: /cvsroot/springnet/Spring.Net/src/Spring/Spring.Core/Reflection/Dynamic/DynamicMethod.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** DynamicMethod.cs	8 Aug 2007 04:05:37 -0000	1.1
--- DynamicMethod.cs	6 Mar 2008 20:20:37 -0000	1.2
***************
*** 87,90 ****
--- 87,98 ----
  
          /// <summary>
+         /// Gets the class, that declares this method
+         /// </summary>
+         public Type DeclaringType
+         {
+             get { return method.DeclaringType; }
+         }
+ 
+         /// <summary>
          /// Invokes dynamic method.
          /// </summary>

[Springnet-commits] Spring.Net/src/Spring/Spring.Core/Expressions MethodNode.cs, 1.19, 1.20

[Erich E. <oak...@us...>]

Update of /cvsroot/springnet/Spring.Net/src/Spring/Spring.Core/Expressions
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv11994/src/Spring/Spring.Core/Expressions

Modified Files:
	MethodNode.cs 
Log Message:
SPRNET-755

Index: MethodNode.cs
===================================================================
RCS file: /cvsroot/springnet/Spring.Net/src/Spring/Spring.Core/Expressions/MethodNode.cs,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** MethodNode.cs	7 Sep 2007 03:01:26 -0000	1.19
--- MethodNode.cs	6 Mar 2008 20:20:36 -0000	1.20
***************
*** 49,52 ****
--- 49,53 ----
          private int argumentCount;
          private SafeMethod method;
+         private int methodHash;
          private bool isCollectionProcessor = false;
          private ICollectionProcessor collectionProcessor;
***************
*** 93,119 ****
              object[] argValues = ResolveArguments(evalContext);
  
!             if (!initialized)
              {
!                 lock(this)
                  {
!                     if (!initialized)
!                     {
!                         Initialize(argValues, context);
!                         initialized = true;
!                     }
                  }
              }
  
!             if (isCollectionProcessor)
              {
!                 return collectionProcessor.Process((ICollection) context, argValues);
              }
              else
              {
                  object[] paramValues = (isParamArray ? ReflectionUtils.PackageParamArray(argValues, argumentCount, paramArrayType) : argValues);
!                 return method.Invoke(context, paramValues);
              }
          }
  
          private void Initialize(object[] argValues, object context)
          {
--- 94,149 ----
              object[] argValues = ResolveArguments(evalContext);
  
!             ICollectionProcessor localCollectionProcessor = null;
!             SafeMethod localMethod = null;
! 
!             // resolve method, if necessary
!             lock (this)
              {
!                 // calculate checksum, if the cached method matches the current context
!                 if (initialized && !isCollectionProcessor)
                  {
!                     int calculatedHash = CalculateMethodHash(context.GetType(), argValues);
!                     initialized = (calculatedHash == methodHash);
!                 }
! 
!                 if (!initialized)
!                 {
!                     Initialize(argValues, context);
!                     initialized = true;
!                 }
! 
!                 if (isCollectionProcessor)
!                 {
!                     localCollectionProcessor = collectionProcessor;
!                 }
!                 else
!                 {
!                     localMethod = method;
                  }
              }
  
!             // invoke method
!             if (localCollectionProcessor != null)
              {
!                 return collectionProcessor.Process((ICollection)context, argValues);
              }
              else
              {
                  object[] paramValues = (isParamArray ? ReflectionUtils.PackageParamArray(argValues, argumentCount, paramArrayType) : argValues);
!                 return localMethod.Invoke(context, paramValues);
              }
          }
  
+         private int CalculateMethodHash(Type contextType, object[] argValues)
+         {
+             int hash = contextType.GetHashCode();
+             for (int i = 0; i < argValues.Length; i++)
+             {
+                 object arg = argValues[i];
+                 if (arg != null) hash += s_primes[i] * arg.GetType().GetHashCode();
+             }
+             return hash;
+         }
+ 
          private void Initialize(object[] argValues, object context)
          {
***************
*** 121,125 ****
              if ((context == null || context is ICollection) && collectionProcessorMap.Contains(methodName))
              {
!                 collectionProcessor = (ICollectionProcessor) collectionProcessorMap[methodName];
                  isCollectionProcessor = true;
              }
--- 151,155 ----
              if ((context == null || context is ICollection) && collectionProcessorMap.Contains(methodName))
              {
!                 collectionProcessor = (ICollectionProcessor)collectionProcessorMap[methodName];
                  isCollectionProcessor = true;
              }
***************
*** 154,158 ****
                      {
                          ParameterInfo lastParameter = parameters[parameters.Length - 1];
!                         isParamArray = lastParameter.GetCustomAttributes(typeof (ParamArrayAttribute), false).Length > 0;
                          if (isParamArray)
                          {
--- 184,188 ----
                      {
                          ParameterInfo lastParameter = parameters[parameters.Length - 1];
!                         isParamArray = lastParameter.GetCustomAttributes(typeof(ParamArrayAttribute), false).Length > 0;
                          if (isParamArray)
                          {
***************
*** 163,166 ****
--- 193,197 ----
  
                      method = new SafeMethod(mi);
+                     methodHash = CalculateMethodHash(contextType, argValues);
                  }
              }
***************
*** 180,184 ****
              try
              {
!                 mi = type.GetMethod(methodName, bindingFlags|BindingFlags.FlattenHierarchy);
              }
              catch (AmbiguousMatchException)
--- 211,215 ----
              try
              {
!                 mi = type.GetMethod(methodName, bindingFlags | BindingFlags.FlattenHierarchy);
              }
              catch (AmbiguousMatchException)
***************
*** 194,202 ****
          }
  
!  
  
          private static MethodInfo[] GetCandidateMethods(Type type, string methodName, BindingFlags bindingFlags, int argCount)
          {
!             MethodInfo[] methods = type.GetMethods(bindingFlags|BindingFlags.FlattenHierarchy);
              ArrayList matches = new ArrayList();
  
--- 225,233 ----
          }
  
! 
  
          private static MethodInfo[] GetCandidateMethods(Type type, string methodName, BindingFlags bindingFlags, int argCount)
          {
!             MethodInfo[] methods = type.GetMethods(bindingFlags | BindingFlags.FlattenHierarchy);
              ArrayList matches = new ArrayList();
  
***************
*** 213,217 ****
                      {
                          ParameterInfo lastParameter = parameters[parameters.Length - 1];
!                         if (lastParameter.GetCustomAttributes(typeof (ParamArrayAttribute), false).Length > 0)
                          {
                              matches.Add(method);
--- 244,248 ----
                      {
                          ParameterInfo lastParameter = parameters[parameters.Length - 1];
!                         if (lastParameter.GetCustomAttributes(typeof(ParamArrayAttribute), false).Length > 0)
                          {
                              matches.Add(method);
***************
*** 221,226 ****
              }
  
!             return (MethodInfo[]) matches.ToArray(typeof(MethodInfo));
          }
      }
  }
--- 252,275 ----
              }
  
!             return (MethodInfo[])matches.ToArray(typeof(MethodInfo));
          }
+ 
+         // used to calculate signature hash while caring for arg positions
+         private static readonly int[] s_primes =
+             {
+                 17, 19, 23, 29
+                 , 31, 37, 41, 43, 47, 53, 59, 61, 67, 71
+                 , 73, 79, 83, 89, 97, 101, 103, 107, 109, 113
+                 , 127, 131, 137, 139, 149, 151, 157, 163, 167, 173
+                 , 179, 181, 191, 193, 197, 199, 211, 223, 227, 229
+                 , 233, 239, 241, 251, 257, 263, 269, 271, 277, 281
+                 , 283, 293, 307, 311, 313, 317, 331, 337, 347, 349
+                 , 353, 359, 367, 373, 379, 383, 389, 397, 401, 409
+                 , 419, 421, 431, 433, 439, 443, 449, 457, 461, 463
+                 , 467, 479, 487, 491, 499, 503, 509, 521, 523, 541
+                 , 547, 557, 563, 569, 571, 577, 587, 593, 599, 601
+                 , 607, 613, 617, 619, 631, 641, 643, 647, 653, 659
+                 , 661, 673, 677, 683, 691, 701, 709, 719, 727, 733
+             };
      }
  }

[Springnet-commits] Spring.Net/test/Spring/Spring.Core.Tests/Expressions ExpressionEvaluatorTests.cs, 1.70, 1.71

[Erich E. <oak...@us...>]

Update of /cvsroot/springnet/Spring.Net/test/Spring/Spring.Core.Tests/Expressions
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv11994/test/Spring/Spring.Core.Tests/Expressions

Modified Files:
	ExpressionEvaluatorTests.cs 
Log Message:
SPRNET-755

Index: ExpressionEvaluatorTests.cs
===================================================================
RCS file: /cvsroot/springnet/Spring.Net/test/Spring/Spring.Core.Tests/Expressions/ExpressionEvaluatorTests.cs,v
retrieving revision 1.70
retrieving revision 1.71
diff -C2 -d -r1.70 -r1.71
*** ExpressionEvaluatorTests.cs	11 Oct 2007 13:55:45 -0000	1.70
--- ExpressionEvaluatorTests.cs	6 Mar 2008 20:20:37 -0000	1.71
***************
*** 46,50 ****
  using Spring.Threading;
  using Spring.Util;
! using Foo=Spring.Expressions.Foo;
  
  #endregion
--- 46,50 ----
  using Spring.Threading;
  using Spring.Util;
! using Foo = Spring.Expressions.Foo;
  
[...2463 lines suppressed...]
  
--- 2767,2771 ----
  
          public Foo(int flag, Bar[] bars)
!         {
          }
  
***************
*** 2777,2781 ****
          public string MethodWithSimilarArguments(int flags, Bar[] bars)
          {
!             return "ExactMatch";            
          }
  
--- 2812,2816 ----
          public string MethodWithSimilarArguments(int flags, Bar[] bars)
          {
!             return "ExactMatch";
          }
  

[Springnet-commits] Spring.Net/src/Spring/Spring.Web/Web/UI/Controls DataBindingPanel.cs, 1.11, 1.12

[Erich E. <oak...@us...>]

Update of /cvsroot/springnet/Spring.Net/src/Spring/Spring.Web/Web/UI/Controls
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv16944

Modified Files:
	DataBindingPanel.cs 
Log Message:
fixed SPRNET-887

Index: DataBindingPanel.cs
===================================================================
RCS file: /cvsroot/springnet/Spring.Net/src/Spring/Spring.Web/Web/UI/Controls/DataBindingPanel.cs,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** DataBindingPanel.cs	2 Feb 2008 16:31:08 -0000	1.11
--- DataBindingPanel.cs	6 Mar 2008 19:03:24 -0000	1.12
***************
*** 288,294 ****
          /// Probe for bindingType of know controls
          /// </summary>
!         /// <param name="wc"></param>
!         /// <returns></returns>
!         private string AutoProbeBindingType(Control wc)
          {
              if (wc is ListBox && ((ListBox) wc).SelectionMode == ListSelectionMode.Multiple)
--- 288,294 ----
          /// Probe for bindingType of know controls
          /// </summary>
!         /// <param name="wc">the control, who's bindingType is to be determined</param>
!         /// <returns>null, if standard binding is to be used or the fully qualified typename of the binding implementation</returns>
!         protected virtual string AutoProbeBindingType(Control wc)
          {
              if (wc is ListBox && ((ListBox) wc).SelectionMode == ListSelectionMode.Multiple)
***************
*** 302,306 ****
          /// Probes for a few know controls and their properties.
          /// </summary>
!         private string AutoProbeSourceProperty(Control wc)
          {
              if (wc is ListBox && ((ListBox) wc).SelectionMode == ListSelectionMode.Multiple)
--- 302,309 ----
          /// Probes for a few know controls and their properties.
          /// </summary>
!         /// <returns>
!         /// The 'BindingSource' expression to be used for binding this control.
!         /// </returns>
!         protected virtual string AutoProbeSourceProperty(Control wc)
          {
              if (wc is ListBox && ((ListBox) wc).SelectionMode == ListSelectionMode.Multiple)
***************
*** 324,327 ****
--- 327,334 ----
                  return "Text";
              }
+             else if (wc is HiddenField)
+             {
+                 return "Value";
+             }
              else if (wc is RadioButtonGroup)
              {

[Springnet-commits] Spring.Net/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web Dao.xml, 1.3, 1.4 Web.config, 1.7, 1.8

[Erich E. <oak...@us...>]

Update of /cvsroot/springnet/Spring.Net/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv10388

Modified Files:
	Dao.xml Web.config 
Log Message:
minor cleanup

Index: Web.config
===================================================================
RCS file: /cvsroot/springnet/Spring.Net/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web/Web.config,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Web.config	21 Jan 2008 05:37:29 -0000	1.7
--- Web.config	6 Mar 2008 18:47:43 -0000	1.8
***************
*** 36,42 ****
      <context>
        <resource uri="~/Aspects.xml"/>
!         <resource uri="~/Dao.xml"/>
!         <resource uri="~/Services.xml"/>
!         <resource uri="~/Web.xml"/>
      </context>
    </spring>
--- 36,42 ----
      <context>
        <resource uri="~/Aspects.xml"/>
!       <resource uri="~/Dao.xml"/>
!       <resource uri="~/Services.xml"/>
!       <resource uri="~/Web.xml"/>
      </context>
    </spring>
***************
*** 62,72 ****
        <add verb="*" path="ContextMonitor.ashx" type="Spring.Web.Support.ContextMonitor, Spring.Web"/>
      </httpHandlers>
-     <trace enabled="true" requestLimit="20" pageOutput="false" traceMode="SortByTime" localOnly="true" writeToDiagnosticsTrace="true"/>
-     <!--
-             Set compilation debug="true" to insert debugging
-             symbols into the compiled page. Because this
-             affects performance, set this value to true only
-             during development.
-         -->
      <compilation debug="true">
        <assemblies>
--- 62,65 ----
***************
*** 78,82 ****
          <add assembly="System.Configuration, Version=2.0.0.0, Culture=neutral, PublicKeyToken=B03F5F7F11D50A3A"/>
          <add assembly="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=B03F5F7F11D50A3A"/>
!         <add assembly="System.EnterpriseServices, Version=2.0.0.0, Culture=neutral, PublicKeyToken=B03F5F7F11D50A3A"/></assemblies>
      </compilation>
      <pages>
--- 71,76 ----
          <add assembly="System.Configuration, Version=2.0.0.0, Culture=neutral, PublicKeyToken=B03F5F7F11D50A3A"/>
          <add assembly="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=B03F5F7F11D50A3A"/>
!         <add assembly="System.EnterpriseServices, Version=2.0.0.0, Culture=neutral, PublicKeyToken=B03F5F7F11D50A3A"/>
!       </assemblies>
      </compilation>
      <pages>
***************
*** 85,105 ****
        </controls>
      </pages>
-     <!--
-             The <authentication> section enables configuration
-             of the security authentication mode used by
-             ASP.NET to identify an incoming user.
-         -->
-     <!--
-             The <customErrors> section enables configuration
-             of what to do if/when an unhandled error occurs
-             during the execution of a request. Specifically,
-             it enables developers to configure html error pages
-             to be displayed in place of a error stack trace.
- 
-         <customErrors mode="RemoteOnly" defaultRedirect="GenericErrorPage.htm">
-             <error statusCode="403" redirect="NoAccess.htm" />
-             <error statusCode="404" redirect="FileNotFound.htm" />
-         </customErrors>
-         -->
    </system.web>
  </configuration>
--- 79,82 ----

Index: Dao.xml
===================================================================
RCS file: /cvsroot/springnet/Spring.Net/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web/Dao.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Dao.xml	29 Sep 2007 21:32:08 -0000	1.3
--- Dao.xml	6 Mar 2008 18:47:43 -0000	1.4
***************
*** 18,28 ****
                     connectionString="Integrated Security=false; Data Source=${db.datasource};Database=${db.database};User ID=${db.user};Password=${db.password};"/>
  
-   <!--
-   <object id="DbProvider" type="Spring.Data.Support.SqlProvider, Spring.Data">
-     <property name="ConnectionString"
-                 value="Data Source=${db.datasource};Database=${db.database};User ID=${db.user};Password=${db.password};Trusted_Connection=False"/>
-   </object>
-   -->
- 
    <object id="NHibernateSessionFactory" type="Spring.Data.NHibernate.LocalSessionFactoryObject, Spring.Data.NHibernate">
      <property name="DbProvider" ref="DbProvider"/>
--- 18,21 ----

[Springnet-commits] Spring.Net/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.2005/DI/HelloWorld Web.config, 1.3, 1.4

[Erich E. <oak...@us...>]

Update of /cvsroot/springnet/Spring.Net/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.2005/DI/HelloWorld
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv26091

Modified Files:
	Web.config 
Log Message:
fixed Control DI-by-typename sample

Index: Web.config
===================================================================
RCS file: /cvsroot/springnet/Spring.Net/examples/Spring/Spring.WebQuickStart/src/Spring.WebQuickStart.2005/DI/HelloWorld/Web.config,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Web.config	23 Aug 2007 10:37:37 -0000	1.3
--- Web.config	4 Mar 2008 22:04:40 -0000	1.4
***************
*** 21,25 ****
  
        <!-- use the typename as name to configure DI for any non-UserControl (Note: this will configure *all* TextBoxes!) -->
!       <object name="System.Web.UI.WebControls.TextBox">
          <property name="Text" value="initial text" />
        </object>
--- 21,25 ----
  
        <!-- use the typename as name to configure DI for any non-UserControl (Note: this will configure *all* TextBoxes!) -->
!       <object name="System.Web.UI.WebControls.TextBox" abstract="true">
          <property name="Text" value="initial text" />
        </object>

[Springnet-commits] Spring.Net/test/Spring/Spring.Aop.Tests/Aop/Framework/DynamicProxy InheritanceAopProxyTests.cs, 1.1, 1.2

[Bruno B. <bb...@us...>]

Update of /cvsroot/springnet/Spring.Net/test/Spring/Spring.Aop.Tests/Aop/Framework/DynamicProxy
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv28218

Modified Files:
	InheritanceAopProxyTests.cs 
Log Message:
Minor changes.

Index: InheritanceAopProxyTests.cs
===================================================================
RCS file: /cvsroot/springnet/Spring.Net/test/Spring/Spring.Aop.Tests/Aop/Framework/DynamicProxy/InheritanceAopProxyTests.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** InheritanceAopProxyTests.cs	6 Feb 2008 18:29:05 -0000	1.1
--- InheritanceAopProxyTests.cs	3 Mar 2008 09:29:17 -0000	1.2
***************
*** 242,245 ****
--- 242,263 ----
              Assert.AreEqual(2, proxiedClass.Value);
          }
+ 
+         //[Test]
+         //public void InterceptProtectedMethod()
+         //{
+         //    NopInterceptor ni = new NopInterceptor();
+ 
+         //    AdvisedSupport advised = new AdvisedSupport();
+         //    advised.Target = new InheritanceTestObject();
+         //    advised.AddAdvice(ni);
+ 
+         //    object proxy = CreateProxy(advised);
+         //    //DynamicProxyManager.SaveAssembly();
+ 
+         //    Assert.IsTrue(proxy is InheritanceTestObject);
+         //    InheritanceTestObject proxiedClass = proxy as InheritanceTestObject;
+         //    proxiedClass.Todo();
+         //    Assert.AreEqual(1, ni.Count);
+         //}
      }
  
***************
*** 309,312 ****
--- 327,341 ----
              this.Increment();
          }
+ 
+         // protected method call
+         public void Todo()
+         {
+             ProtectedTodo();
+         }
+ 
+         protected virtual void ProtectedTodo()
+         {
+ 
+         }
      }
  

[Springnet-commits] Spring.Net/src/Spring/Spring.Core/Objects/Factory/Config ConstructorArgumentValues.cs, 1.15, 1.16

[Bruno B. <bb...@us...>]

Update of /cvsroot/springnet/Spring.Net/src/Spring/Spring.Core/Objects/Factory/Config
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv28198

Modified Files:
	ConstructorArgumentValues.cs 
Log Message:
Minor changes.

Index: ConstructorArgumentValues.cs
===================================================================
RCS file: /cvsroot/springnet/Spring.Net/src/Spring/Spring.Core/Objects/Factory/Config/ConstructorArgumentValues.cs,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** ConstructorArgumentValues.cs	28 Dec 2007 18:43:23 -0000	1.15
--- ConstructorArgumentValues.cs	3 Mar 2008 09:29:07 -0000	1.16
***************
*** 271,283 ****
  		/// for the argument, or <see langword="null"/> if none set.
  		/// </returns>
! 		public virtual ValueHolder GetNamedArgumentValue(string name)
! 		{
! 			ValueHolder valueHolder = null;
! 			if (ContainsNamedArgument(name))
! 			{
! 				valueHolder = (ValueHolder) NamedArgumentValues[GetCanonicalNamedArgument(name)];
! 			}
! 			return valueHolder;
! 		}
  
  		/// <summary>
--- 271,283 ----
  		/// for the argument, or <see langword="null"/> if none set.
  		/// </returns>
!         public virtual ValueHolder GetNamedArgumentValue(string name)
!         {
!             ValueHolder valueHolder = null;
!             if (name != null && ContainsNamedArgument(name))
!             {
!                 valueHolder = (ValueHolder)NamedArgumentValues[GetCanonicalNamedArgument(name)];
!             }
!             return valueHolder;
!         }
  
  		/// <summary>

[Springnet-commits] Spring.Net/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy InheritanceAopProxyTypeBuilder.cs, 1.1, 1.2

[Bruno B. <bb...@us...>]

Update of /cvsroot/springnet/Spring.Net/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv27812/DynamicProxy

Modified Files:
	InheritanceAopProxyTypeBuilder.cs 
Log Message:
Minor changes.

Index: InheritanceAopProxyTypeBuilder.cs
===================================================================
RCS file: /cvsroot/springnet/Spring.Net/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/InheritanceAopProxyTypeBuilder.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** InheritanceAopProxyTypeBuilder.cs	6 Feb 2008 18:28:52 -0000	1.1
--- InheritanceAopProxyTypeBuilder.cs	3 Mar 2008 09:28:50 -0000	1.2
***************
*** 47,61 ****
  
          private IAdvised advised;
  
          /// <summary>
          /// AdvisedProxy instance calls should be delegated to.
          /// </summary>
!         protected FieldBuilder advisedProxyField;
!         
          #endregion
  
          #region Constructor (s) / Destructor
  
!          /// <summary>
          /// Creates a new instance of the 
          /// <see cref="CompositionAopProxyTypeBuilder"/> class.
--- 47,79 ----
  
          private IAdvised advised;
+         private bool proxyDeclaredMembersOnly = true;
  
          /// <summary>
          /// AdvisedProxy instance calls should be delegated to.
          /// </summary>
!         protected FieldBuilder advisedProxyField;       
! 
!         #endregion
! 
!         #region Properties
! 
!         /// <summary>
!         /// Gets or sets a value indicating whether inherited members should be proxied.
!         /// </summary>
!         /// <value>
!         /// <see langword="true"/> if inherited members should be proxied; 
!         /// otherwise, <see langword="false"/>.
!         /// </value>
!         public bool ProxyDeclaredMembersOnly
!         {
!             get { return proxyDeclaredMembersOnly; }
!             set { proxyDeclaredMembersOnly = value; }
!         }
! 
          #endregion
  
          #region Constructor (s) / Destructor
  
!         /// <summary>
          /// Creates a new instance of the 
          /// <see cref="CompositionAopProxyTypeBuilder"/> class.
***************
*** 142,146 ****
              InheritType(typeBuilder,
                  new BaseAopProxyMethodBuilder(typeBuilder, this, targetMethods, proxyMethods),
!                 TargetType, true);
  
              // implement IAdvised interface
--- 160,164 ----
              InheritType(typeBuilder,
                  new BaseAopProxyMethodBuilder(typeBuilder, this, targetMethods, proxyMethods),
!                 TargetType, ProxyDeclaredMembersOnly);
  
              // implement IAdvised interface

[Springnet-commits] Spring.Net/src/Spring/Spring.Aop/Aop/Framework/AutoProxy AbstractAutoProxyCreator.cs, 1.14, 1.15 ObjectNameAutoProxyCreator.cs, 1.7, 1.8

[Bruno B. <bb...@us...>]

Update of /cvsroot/springnet/Spring.Net/src/Spring/Spring.Aop/Aop/Framework/AutoProxy
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv27812/AutoProxy

Modified Files:
	AbstractAutoProxyCreator.cs ObjectNameAutoProxyCreator.cs 
Log Message:
Minor changes.

Index: AbstractAutoProxyCreator.cs
===================================================================
RCS file: /cvsroot/springnet/Spring.Net/src/Spring/Spring.Aop/Aop/Framework/AutoProxy/AbstractAutoProxyCreator.cs,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** AbstractAutoProxyCreator.cs	14 Jan 2008 20:49:47 -0000	1.14
--- AbstractAutoProxyCreator.cs	3 Mar 2008 09:28:49 -0000	1.15
***************
*** 366,370 ****
          /// <summary>
          /// Determines whether the object is an infrastructure type,
!         /// IAdvisor, IAdvice, IAspect, AbstractAutoProxyCreator
          /// </summary>
          /// <param name="type">The object type to compare</param>
--- 366,370 ----
          /// <summary>
          /// Determines whether the object is an infrastructure type,
!         /// IAdvisor, IAdvice, IAdvisors or AbstractAutoProxyCreator
          /// </summary>
          /// <param name="type">The object type to compare</param>

Index: ObjectNameAutoProxyCreator.cs
===================================================================
RCS file: /cvsroot/springnet/Spring.Net/src/Spring/Spring.Aop/Aop/Framework/AutoProxy/ObjectNameAutoProxyCreator.cs,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** ObjectNameAutoProxyCreator.cs	7 Sep 2007 01:51:49 -0000	1.7
--- ObjectNameAutoProxyCreator.cs	3 Mar 2008 09:28:49 -0000	1.8
***************
*** 44,48 ****
      /// </para>
      /// </remarks>
-     /// <seealso cref="Spring.Aop.Framework.AutoProxy.ObjectNameAutoProxyCreator.SetObjectNames"/>
      /// <seealso cref="Spring.Aop.Framework.AutoProxy.ObjectNameAutoProxyCreator.IsMatch"/>
      /// <author>Juergen Hoeller</author>
--- 44,47 ----
***************
*** 53,67 ****
          private IList objectNames;
  
- 
-         /// <summary>
-         /// Set the names of the objects that should automatically get wrapped with proxies.
-         /// A name can specify a prefix to match by ending with "*", e.g. "myObject,tx*"
-         /// will match the object named "myObject" and all objects whose name start with "tx".
-         /// </summary>
-         public void SetObjectNames(string[] objectNames)
-         {
-             this.objectNames = new ArrayList(objectNames);
-         }
- 
          /// <summary>
          /// Set the names of the objects in IList fashioned way that should automatically 
--- 52,55 ----

[Springnet-commits] Spring.Net.Integration/projects/Spring.Messaging.Nms/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Listener AbstractMessageListenerContainer.cs, 1.1, 1.2 SimpleMessageListenerContainer.cs, 1.2, 1.3

[Mark P. <mar...@us...>]

Update of /cvsroot/springnet/Spring.Net.Integration/projects/Spring.Messaging.Nms/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Listener
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv16438

Modified Files:
	AbstractMessageListenerContainer.cs 
	SimpleMessageListenerContainer.cs 
Log Message:
NMS - Add support for ISessionAwareMessageListener

Index: SimpleMessageListenerContainer.cs
===================================================================
RCS file: /cvsroot/springnet/Spring.Net.Integration/projects/Spring.Messaging.Nms/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Listener/SimpleMessageListenerContainer.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** SimpleMessageListenerContainer.cs	10 Oct 2007 21:03:03 -0000	1.2
--- SimpleMessageListenerContainer.cs	27 Feb 2008 16:53:44 -0000	1.3
***************
*** 58,62 ****
              //TODO TaskExectuor abstraction would go here...
  			
! 	    SimpleMessageListener listener = new SimpleMessageListener(this, session);
              consumer.Listener += new NMS.MessageListener(listener.OnMessage); 
              return consumer;
--- 58,62 ----
              //TODO TaskExectuor abstraction would go here...
  			
! 	        SimpleMessageListener listener = new SimpleMessageListener(this, session);
              consumer.Listener += new NMS.MessageListener(listener.OnMessage); 
              return consumer;

Index: AbstractMessageListenerContainer.cs
===================================================================
RCS file: /cvsroot/springnet/Spring.Net.Integration/projects/Spring.Messaging.Nms/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Listener/AbstractMessageListenerContainer.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** AbstractMessageListenerContainer.cs	2 Mar 2007 23:25:18 -0000	1.1
--- AbstractMessageListenerContainer.cs	27 Feb 2008 16:53:44 -0000	1.2
***************
*** 380,384 ****
          protected virtual void DoInvokeListener(ISessionAwareMessageListener listener, ISession session, IMessage message)
          {
!             logger.Warn("DoInvokeListener.ISessionAwareMessageListener not implemented");
          }
          
--- 380,414 ----
          protected virtual void DoInvokeListener(ISessionAwareMessageListener listener, ISession session, IMessage message)
          {
!             IConnection conToClose = null;
!             ISession sessionToClose = null;
!             try
!             {
!                 ISession sessionToUse = session;
!                 if (!ExposeListenerSession)
!                 {
!                     //We need to expose a separate Session.
!                     conToClose = CreateConnection();
!                     sessionToClose = CreateSession(conToClose);
!                     sessionToUse = sessionToClose;
!                 }
!                 // Actually invoke the message listener
!                 if (logger.IsDebugEnabled)
!                 {
!                     logger.Debug("Invoking listener with message of type [" + message.GetType() + 
!                         "] and session [" + sessionToUse + "]");
!                 }
!                 listener.OnMessage(message, sessionToUse);
!                 if (sessionToUse != session)
!                 {
!                     if (sessionToUse.Transacted)
!                     {
!                         NmsUtils.CommitIfNecessary(sessionToUse);
!                     }                        
!                 }
!             } finally
!             {
!                 NmsUtils.CloseSession(sessionToClose);
!                 NmsUtils.CloseConnection(conToClose);
!             }
          }
          

[Springnet-commits] Spring.Net/src/Spring/Spring.Web/Web/UI/Controls ValidationError.cs, 1.9, 1.10 ValidationSummary.cs, 1.9, 1.10

[Mark P. <mar...@us...>]

Update of /cvsroot/springnet/Spring.Net/src/Spring/Spring.Web/Web/UI/Controls
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv22469

Modified Files:
	ValidationError.cs ValidationSummary.cs 
Log Message:
SPRNET-558 -  Enable Data Validation Rendering UserControl (.NET 2.0 only)

Index: ValidationSummary.cs
===================================================================
RCS file: /cvsroot/springnet/Spring.Net/src/Spring/Spring.Web/Web/UI/Controls/ValidationSummary.cs,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** ValidationSummary.cs	26 Feb 2008 21:21:26 -0000	1.9
--- ValidationSummary.cs	26 Feb 2008 22:33:37 -0000	1.10
***************
*** 98,102 ****
                  {
                      IList errorMessages;
! 
                      System.Type t = typeof(Spring.Web.UI.Page);
  
--- 98,104 ----
                  {
                      IList errorMessages;
! #if NET_1_1
!                     errorMessages = this.Page.ValidationErrors.GetResolvedErrors(this.Provider, this.Page.MessageSource);
! #else                   
                      System.Type t = typeof(Spring.Web.UI.Page);
  
***************
*** 112,116 ****
                          errorMessages = this.Page.ValidationErrors.GetResolvedErrors(this.Provider, this.Page.MessageSource);
                      }
! 
                      Renderer.RenderErrors(Page, writer, errorMessages);
                  }
--- 114,118 ----
                          errorMessages = this.Page.ValidationErrors.GetResolvedErrors(this.Provider, this.Page.MessageSource);
                      }
! #endif
                      Renderer.RenderErrors(Page, writer, errorMessages);
                  }

Index: ValidationError.cs
===================================================================
RCS file: /cvsroot/springnet/Spring.Net/src/Spring/Spring.Web/Web/UI/Controls/ValidationError.cs,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** ValidationError.cs	26 Feb 2008 21:21:26 -0000	1.9
--- ValidationError.cs	26 Feb 2008 22:33:37 -0000	1.10
***************
*** 99,103 ****
  
                      System.Type t = typeof(Spring.Web.UI.Page);
! 
                      if (this.TemplateControl != null) t = this.TemplateControl.GetType();
  
--- 99,105 ----
  
                      System.Type t = typeof(Spring.Web.UI.Page);
! #if NET_1_1
!                     errorMessages = this.Page.ValidationErrors.GetResolvedErrors(this.Provider, this.Page.MessageSource);
! #else
                      if (this.TemplateControl != null) t = this.TemplateControl.GetType();
  
***************
*** 111,114 ****
--- 113,117 ----
                          errorMessages = this.Page.ValidationErrors.GetResolvedErrors(this.Provider, this.Page.MessageSource);
                      }
+ #endif
  
                      Renderer.RenderErrors(Page, writer, errorMessages);