Permalink
Browse files

renaming ConversationWA folders to Conversation

  • Loading branch information...
1 parent b4b8c90 commit 261bd9cae099f4f43ad4b615544df7bbfe98d5f4 @sbohlen sbohlen committed Dec 27, 2012
Showing with 1,086 additions and 1,077 deletions.
  1. +2 −2 src/Spring/Spring.Web.Conversation.NHibernate32/AssemblyInfo.cs
  2. +2 −2 ...pring/Spring.Web.Conversation.NHibernate32/Data/NHibernate/Support/SessionPerConversationScope.cs
  3. +6 −6 src/Spring/Spring.Web.Conversation.NHibernate32/Spring.Web.Conversation.NHibernate32.2010.csproj
  4. +456 −456 src/Spring/Spring.Web.Conversation.NHibernate32/Spring.Web.Conversation.NHibernate32.xml
  5. +4 −7 ...eb.Conversation.NHibernate32/{ConversationWA → Web/Conversation}/HttpModule/ConversationModule.cs
  6. +1 −3 .../Spring.Web.Conversation.NHibernate32/{ConversationWA → Web/Conversation}/IConversationManager.cs
  7. +2 −11 ...ng/Spring.Web.Conversation.NHibernate32/{ConversationWA → Web/Conversation}/IConversationState.cs
  8. +2 −2 ...g.Web.Conversation.NHibernate32/{ConversationWA/Impl → Web/Conversation}/InnerConversationList.cs
  9. +2 −2 ....Web.Conversation.NHibernate32/{ConversationWA/Impl → Web/Conversation}/WebConversationManager.cs
  10. +5 −5 ....Conversation.NHibernate32/{ConversationWA/Impl → Web/Conversation}/WebConversationSpringState.cs
  11. +2 −2 src/Spring/Spring.Web.Conversation.NHibernate33/AssemblyInfo.cs
  12. +0 −1 src/Spring/Spring.Web.Conversation.NHibernate33/ConversationWA/HttpModule/dontdelete.txt
  13. +0 −1 src/Spring/Spring.Web.Conversation.NHibernate33/ConversationWA/dontdelete.txt
  14. +16 −16 src/Spring/Spring.Web.Conversation.NHibernate33/Spring.Web.Conversation.NHibernate33.2010.csproj
  15. +358 −358 src/Spring/Spring.Web.Conversation.NHibernate33/Spring.Web.Conversation.NHibernate33.XML
  16. +2 −2 test/Spring/Spring.Web.Conversation.NHibernate32.Tests/AssemblyInfo.cs
  17. +3 −2 ...Web.Conversation.NHibernate32.Tests/{ConversationWA → Conversation}/PatialEndConvBeginBasePage.cs
  18. +3 −2 ...g.Web.Conversation.NHibernate32.Tests/{ConversationWA → Conversation}/PatialEndConvEndBasePage.cs
  19. +1 −1 ...onversation.NHibernate32.Tests/{ConversationWA → Conversation}/SerializeConversationTestModule.cs
  20. +1 −1 test/Spring/Spring.Web.Conversation.NHibernate32.Tests/{ConversationWA → Conversation}/SimpleTest.cs
  21. BIN ...g.Web.Conversation.NHibernate32.Tests/{ConversationWA → Conversation}/WebConversationStateTest.cs
  22. 0 .../Data/Spring/{ConversationWA → Conversation}/WebConversationStateTest/CircularDependenceTest.aspx
  23. +2 −1 ...ta/Spring/{ConversationWA → Conversation}/WebConversationStateTest/CircularDependenceTest.aspx.cs
  24. 0 ...a/Spring/{ConversationWA → Conversation}/WebConversationStateTest/ConnectionReleaseModeIssue.aspx
  25. +3 −2 ...pring/{ConversationWA → Conversation}/WebConversationStateTest/ConnectionReleaseModeIssue.aspx.cs
  26. 0 ...ata/Spring/{ConversationWA → Conversation}/WebConversationStateTest/EndConversationTestBegin.aspx
  27. +2 −1 .../Spring/{ConversationWA → Conversation}/WebConversationStateTest/EndConversationTestBegin.aspx.cs
  28. 0 .../Data/Spring/{ConversationWA → Conversation}/WebConversationStateTest/EndConversationTestEnd.aspx
  29. +2 −1 ...ta/Spring/{ConversationWA → Conversation}/WebConversationStateTest/EndConversationTestEnd.aspx.cs
  30. 0 ...ta/Spring/{ConversationWA → Conversation}/WebConversationStateTest/EndPausedSessionIsClosedA.aspx
  31. +2 −1 ...Spring/{ConversationWA → Conversation}/WebConversationStateTest/EndPausedSessionIsClosedA.aspx.cs
  32. 0 ...ta/Spring/{ConversationWA → Conversation}/WebConversationStateTest/EndPausedSessionIsClosedB.aspx
  33. +2 −1 ...Spring/{ConversationWA → Conversation}/WebConversationStateTest/EndPausedSessionIsClosedB.aspx.cs
  34. 0 ...e32.Tests/Data/Spring/{ConversationWA → Conversation}/WebConversationStateTest/EndPausedTest.aspx
  35. +2 −1 ....Tests/Data/Spring/{ConversationWA → Conversation}/WebConversationStateTest/EndPausedTest.aspx.cs
  36. 0 ...Data/Spring/{ConversationWA → Conversation}/WebConversationStateTest/GetParentObjetFromChild.aspx
  37. +2 −1 ...a/Spring/{ConversationWA → Conversation}/WebConversationStateTest/GetParentObjetFromChild.aspx.cs
  38. 0 ...ernate32.Tests/Data/Spring/{ConversationWA → Conversation}/WebConversationStateTest/IoeTests.aspx
  39. +2 −2 ...ate32.Tests/Data/Spring/{ConversationWA → Conversation}/WebConversationStateTest/IoeTests.aspx.cs
  40. 0 ...Data/Spring/{ConversationWA → Conversation}/WebConversationStateTest/PatialEndConv_A_B_Begin.aspx
  41. +1 −1 ...a/Spring/{ConversationWA → Conversation}/WebConversationStateTest/PatialEndConv_A_B_Begin.aspx.cs
  42. 0 ...s/Data/Spring/{ConversationWA → Conversation}/WebConversationStateTest/PatialEndConv_A_B_End.aspx
  43. +1 −1 ...ata/Spring/{ConversationWA → Conversation}/WebConversationStateTest/PatialEndConv_A_B_End.aspx.cs
  44. 0 ...s/Data/Spring/{ConversationWA → Conversation}/WebConversationStateTest/PatialEndConv_A_Begin.aspx
  45. +1 −1 ...ata/Spring/{ConversationWA → Conversation}/WebConversationStateTest/PatialEndConv_A_Begin.aspx.cs
  46. 0 ...sts/Data/Spring/{ConversationWA → Conversation}/WebConversationStateTest/PatialEndConv_A_End.aspx
  47. +1 −1 .../Data/Spring/{ConversationWA → Conversation}/WebConversationStateTest/PatialEndConv_A_End.aspx.cs
  48. 0 ...ng/{ConversationWA → Conversation}/WebConversationStateTest/RedirectErrorNoPauseConversation.aspx
  49. +2 −1 ...{ConversationWA → Conversation}/WebConversationStateTest/RedirectErrorNoPauseConversation.aspx.cs
  50. 0 ...Data/Spring/{ConversationWA → Conversation}/WebConversationStateTest/SPCLazyLoadTest_A_Begin.aspx
  51. +2 −1 ...a/Spring/{ConversationWA → Conversation}/WebConversationStateTest/SPCLazyLoadTest_A_Begin.aspx.cs
  52. 0 ...ata/Spring/{ConversationWA → Conversation}/WebConversationStateTest/SPCLazyLoadTest_A_Status.aspx
  53. +2 −1 .../Spring/{ConversationWA → Conversation}/WebConversationStateTest/SPCLazyLoadTest_A_Status.aspx.cs
  54. 0 ...ng/{ConversationWA → Conversation}/WebConversationStateTest/SPCSwitchConversationSameRequest.aspx
  55. +2 −1 ...{ConversationWA → Conversation}/WebConversationStateTest/SPCSwitchConversationSameRequest.aspx.cs
  56. 0 ...ta/Spring/{ConversationWA → Conversation}/WebConversationStateTest/SerializeConversationTest.aspx
  57. +3 −2 ...Spring/{ConversationWA → Conversation}/WebConversationStateTest/SerializeConversationTest.aspx.cs
  58. 0 ....Tests/Data/Spring/{ConversationWA → Conversation}/WebConversationStateTest/SessionIsClosedA.aspx
  59. +2 −1 ...sts/Data/Spring/{ConversationWA → Conversation}/WebConversationStateTest/SessionIsClosedA.aspx.cs
  60. 0 ....Tests/Data/Spring/{ConversationWA → Conversation}/WebConversationStateTest/SessionIsClosedB.aspx
  61. +2 −1 ...sts/Data/Spring/{ConversationWA → Conversation}/WebConversationStateTest/SessionIsClosedB.aspx.cs
  62. 0 ...Tests/Data/Spring/{ConversationWA → Conversation}/WebConversationStateTest/TimeOut_NoTimeOut.aspx
  63. +2 −1 ...ts/Data/Spring/{ConversationWA → Conversation}/WebConversationStateTest/TimeOut_NoTimeOut.aspx.cs
  64. 0 ...sts/Data/Spring/{ConversationWA → Conversation}/WebConversationStateTest/TimeOut_WithTimeOut.aspx
  65. +2 −1 .../Data/Spring/{ConversationWA → Conversation}/WebConversationStateTest/TimeOut_WithTimeOut.aspx.cs
  66. +4 −4 ...Hibernate32.Tests/Data/Spring/{ConversationWA → Conversation}/WebConversationStateTest/Web.Config
  67. +1 −1 ...rnate32.Tests/Data/Spring/{ConversationWA → Conversation}/WebConversationStateTest/log4net.config
  68. +30 −30 ...32.Tests/Data/Spring/{ConversationWA → Conversation}/WebConversationStateTest/services.xml.config
  69. BIN .../Data/Spring/{ConversationWA → Conversation}/WebConversationStateTest/sqlite/conversationTests.db
  70. +4 −4 ...e32.Tests/Data/Spring/{ConversationWA → Conversation}/WebConversationStateTest/web.config.net-2.0
  71. +1 −1 test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Entities/SPCDetailEnt.cs
  72. +1 −1 test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Entities/SPCMasterEnt.cs
  73. +10 −10 ...Spring.Web.Conversation.NHibernate32.Tests/Spring.Web.Conversation.NHibernate32.Tests.2008.csproj
  74. +54 −54 ...Spring.Web.Conversation.NHibernate32.Tests/Spring.Web.Conversation.NHibernate32.Tests.2010.csproj
  75. +4 −4 ...Hibernate33.Tests/Data/Spring/{ConversationWA → Conversation}/WebConversationStateTest/Web.Config
  76. +30 −30 ...33.Tests/Data/Spring/{ConversationWA → Conversation}/WebConversationStateTest/services.xml.config
  77. +4 −4 ...e33.Tests/Data/Spring/{ConversationWA → Conversation}/WebConversationStateTest/web.config.net-2.0
  78. +14 −14 ...Spring.Web.Conversation.NHibernate33.Tests/Spring.Web.Conversation.NHibernate33.Tests.2008.csproj
  79. +19 −13 ...Spring.Web.Conversation.NHibernate33.Tests/Spring.Web.Conversation.NHibernate33.Tests.2010.csproj
@@ -21,5 +21,5 @@
using System;
using System.Reflection;
-[assembly: AssemblyTitle("Spring.ConversationWA.NH32. NHibernate 3.2 support.")]
-[assembly: AssemblyDescription("Interfaces and classes that provide 'Conversation Workaround' support in Spring.Net")]
+[assembly: AssemblyTitle("Spring.Web.Conversation.NHibernate32. NHibernate 3.2 support.")]
+[assembly: AssemblyDescription("Interfaces and classes that provide 'Long-Running Conversation' support in Spring.Net")]
@@ -30,8 +30,8 @@
using Spring.Transaction.Support;
using Spring.Util;
using System.Data;
-using Spring.ConversationWA;
using System.Collections.Generic;
+using Spring.Web.Conversation;
#endregion
@@ -369,7 +369,7 @@ private void DoOpenSession(IConversationState conversation)
/// <summary>
/// This sessionHolder creates a session for the active conversation only if it is
- /// needed (<see cref="Spring.ConversationWA.IConversationState.StartResumeConversation"/>).
+ /// needed (<see cref="IConversationState.StartResumeConversation"/>).
/// </summary>
/// <remarks>
/// Although a NHibernateSession defers creation of db-connections until they are really
@@ -58,14 +58,14 @@
<Link>CommonAssemblyInfo.cs</Link>
</Compile>
<Compile Include="AssemblyInfo.cs" />
- <Compile Include="ConversationWA\HttpModule\ConversationModule.cs" />
- <Compile Include="ConversationWA\IConversationManager.cs" />
- <Compile Include="ConversationWA\IConversationState.cs" />
- <Compile Include="ConversationWA\Impl\InnerConversationList.cs" />
- <Compile Include="ConversationWA\Impl\WebConversationManager.cs" />
- <Compile Include="ConversationWA\Impl\WebConversationSpringState.cs" />
<Compile Include="Data\NHibernate\Support\SessionPerConversationScope.cs" />
<Compile Include="Data\NHibernate\Support\SessionPerConversationSettings.cs" />
+ <Compile Include="Web\Conversation\HttpModule\ConversationModule.cs" />
+ <Compile Include="Web\Conversation\IConversationManager.cs" />
+ <Compile Include="Web\Conversation\IConversationState.cs" />
+ <Compile Include="Web\Conversation\InnerConversationList.cs" />
+ <Compile Include="Web\Conversation\WebConversationManager.cs" />
+ <Compile Include="Web\Conversation\WebConversationSpringState.cs" />
</ItemGroup>
<ItemGroup>
<None Include="..\..\..\build-support\tools\nant\schema\nant.xsd">

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -20,15 +20,12 @@
using System;
using System.Collections.Generic;
-using System.Text;
using System.Web;
-using Spring.Context.Support;
-using Common.Logging;
-using Spring.Data.NHibernate.Support;
using System.Web.UI;
+using Common.Logging;
using Spring.Context;
-namespace Spring.ConversationWA.HttpModule
+namespace Spring.Web.Conversation.HttpModule
{
/// <summary>
/// HttpModule for ending Conversations with Timeout exceeded.
@@ -38,12 +35,12 @@ public class ConversationModule : IHttpModule, IApplicationContextAware
{
private static readonly ILog LOG = LogManager.GetLogger(typeof(ConversationModule));
- private IList<String> conversationManagerName;
+ private IList<string> conversationManagerName;
/// <summary>
/// The Names of the <see cref="IConversationManager"/>s in the <see cref="IApplicationContext"/>
/// </summary>
- public IList<String> ConversationManagerNameList
+ public IList<string> ConversationManagerNameList
{
get { return conversationManagerName; }
set { conversationManagerName = value; }
@@ -19,11 +19,9 @@
#endregion
using System;
-using System.Collections.Generic;
-using System.Text;
using NHibernate;
-namespace Spring.ConversationWA
+namespace Spring.Web.Conversation
{
/// <summary>
/// manager for Conversations.
@@ -19,20 +19,11 @@
#endregion
using System;
-using System.Data;
-using System.Configuration;
-using System.Web;
-using System.Web.Security;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.WebControls.WebParts;
-using System.Web.UI.HtmlControls;
using System.Collections.Generic;
-using System.Collections;
using NHibernate;
using Spring.Data.Common;
-namespace Spring.ConversationWA
+namespace Spring.Web.Conversation
{
/// <summary>
/// Port to conversation. If the object is not found in the current
@@ -43,7 +34,7 @@ namespace Spring.ConversationWA
/// If <see cref="Id"/> is different from spring name for this instance.
/// </exception>
/// <author>Hailton de Castro</author>
- public interface IConversationState: IDictionary<String, Object>
+ public interface IConversationState: IDictionary<string, object>
{
/// <summary>
/// Conversation id.
@@ -19,12 +19,12 @@
#endregion
using System;
-using System.Collections.Generic;
using System.Collections;
+using System.Collections.Generic;
using Common.Logging;
using Iesi.Collections.Generic;
-namespace Spring.ConversationWA.Impl
+namespace Spring.Web.Conversation
{
/// <summary>
/// List that make validation for Circular Dependency for <see cref="IConversationState"/>
@@ -23,12 +23,12 @@
using System.Threading;
using System.Web;
using Common.Logging;
-using Spring.Data.NHibernate.Support;
using NHibernate;
using Spring.Context;
using Spring.Context.Support;
+using Spring.Data.NHibernate.Support;
-namespace Spring.ConversationWA.Impl
+namespace Spring.Web.Conversation
{
/// <summary>
/// This was made to stay under session scope.
@@ -19,17 +19,17 @@
#endregion
using System;
+using System.Collections;
+using System.Collections.Generic;
using System.Web;
-using Spring.Objects.Factory;
using Common.Logging;
-using System.Collections.Generic;
-using System.Collections;
-using Spring.Data.Common;
using NHibernate;
using Spring.Context;
using Spring.Context.Support;
+using Spring.Data.Common;
+using Spring.Objects.Factory;
-namespace Spring.ConversationWA.Impl
+namespace Spring.Web.Conversation
{
/// <summary>
/// Implementation of conversation in the infrastructure of Spring.
@@ -1,5 +1,5 @@
using System;
using System.Reflection;
-[assembly: AssemblyTitle("Spring.ConversationWA.NH33. NHibernate 3.3 support.")]
-[assembly: AssemblyDescription("Interfaces and classes that provide 'Conversation Workaround' support in Spring.Net")]
+[assembly: AssemblyTitle("Spring.Web.Conversation.NHibernate33. NHibernate 3.3 support.")]
+[assembly: AssemblyDescription("Interfaces and classes that provide 'Long-Running Conversation' support in Spring.Net")]
@@ -1 +0,0 @@
-sources are linked here from Spring.ConversationWA.NH32
@@ -1 +0,0 @@
-sources are linked here from Spring.ConversationWA.NH32
@@ -57,29 +57,29 @@
<Compile Include="..\CommonAssemblyInfo.cs">
<Link>CommonAssemblyInfo.cs</Link>
</Compile>
- <Compile Include="..\Spring.Web.Conversation.NHibernate32\ConversationWA\HttpModule\ConversationModule.cs">
- <Link>Conversation\HttpModule\ConversationModule.cs</Link>
+ <Compile Include="..\Spring.Web.Conversation.NHibernate32\Data\NHibernate\Support\SessionPerConversationScope.cs">
+ <Link>Data\NHibernate\Support\SessionPerConversationScope.cs</Link>
</Compile>
- <Compile Include="..\Spring.Web.Conversation.NHibernate32\ConversationWA\IConversationManager.cs">
- <Link>Conversation\IConversationManager.cs</Link>
+ <Compile Include="..\Spring.Web.Conversation.NHibernate32\Data\NHibernate\Support\SessionPerConversationSettings.cs">
+ <Link>Data\NHibernate\Support\SessionPerConversationSettings.cs</Link>
</Compile>
- <Compile Include="..\Spring.Web.Conversation.NHibernate32\ConversationWA\IConversationState.cs">
- <Link>Conversation\IConversationState.cs</Link>
+ <Compile Include="..\Spring.Web.Conversation.NHibernate32\Web\Conversation\HttpModule\ConversationModule.cs">
+ <Link>Web\Conversation\HttpModule\ConversationModule.cs</Link>
</Compile>
- <Compile Include="..\Spring.Web.Conversation.NHibernate32\ConversationWA\Impl\InnerConversationList.cs">
- <Link>Conversation\Impl\InnerConversationList.cs</Link>
+ <Compile Include="..\Spring.Web.Conversation.NHibernate32\Web\Conversation\IConversationManager.cs">
+ <Link>Web\Conversation\IConversationManager.cs</Link>
</Compile>
- <Compile Include="..\Spring.Web.Conversation.NHibernate32\ConversationWA\Impl\WebConversationManager.cs">
- <Link>Conversation\Impl\WebConversationManager.cs</Link>
+ <Compile Include="..\Spring.Web.Conversation.NHibernate32\Web\Conversation\IConversationState.cs">
+ <Link>Web\Conversation\IConversationState.cs</Link>
</Compile>
- <Compile Include="..\Spring.Web.Conversation.NHibernate32\ConversationWA\Impl\WebConversationSpringState.cs">
- <Link>Conversation\Impl\WebConversationSpringState.cs</Link>
+ <Compile Include="..\Spring.Web.Conversation.NHibernate32\Web\Conversation\InnerConversationList.cs">
+ <Link>Web\Conversation\InnerConversationList.cs</Link>
</Compile>
- <Compile Include="..\Spring.Web.Conversation.NHibernate32\Data\NHibernate\Support\SessionPerConversationScope.cs">
- <Link>Data\NHibernate\Support\SessionPerConversationScope.cs</Link>
+ <Compile Include="..\Spring.Web.Conversation.NHibernate32\Web\Conversation\WebConversationManager.cs">
+ <Link>Web\Conversation\WebConversationManager.cs</Link>
</Compile>
- <Compile Include="..\Spring.Web.Conversation.NHibernate32\Data\NHibernate\Support\SessionPerConversationSettings.cs">
- <Link>Data\NHibernate\Support\SessionPerConversationSettings.cs</Link>
+ <Compile Include="..\Spring.Web.Conversation.NHibernate32\Web\Conversation\WebConversationSpringState.cs">
+ <Link>Web\Conversation\WebConversationSpringState.cs</Link>
</Compile>
<Compile Include="AssemblyInfo.cs" />
</ItemGroup>
Oops, something went wrong.

0 comments on commit 261bd9c

Please sign in to comment.