diff --git a/src/Spring/Spring.Web.Conversation.NHibernate32/AssemblyInfo.cs b/src/Spring/Spring.Web.Conversation.NHibernate32/AssemblyInfo.cs index 5d832ca3..522926df 100644 --- a/src/Spring/Spring.Web.Conversation.NHibernate32/AssemblyInfo.cs +++ b/src/Spring/Spring.Web.Conversation.NHibernate32/AssemblyInfo.cs @@ -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")] \ No newline at end of file +[assembly: AssemblyTitle("Spring.Web.Conversation.NHibernate32. NHibernate 3.2 support.")] +[assembly: AssemblyDescription("Interfaces and classes that provide 'Long-Running Conversation' support in Spring.Net")] \ No newline at end of file diff --git a/src/Spring/Spring.Web.Conversation.NHibernate32/Data/NHibernate/Support/SessionPerConversationScope.cs b/src/Spring/Spring.Web.Conversation.NHibernate32/Data/NHibernate/Support/SessionPerConversationScope.cs index 1668c315..0baa2cdf 100644 --- a/src/Spring/Spring.Web.Conversation.NHibernate32/Data/NHibernate/Support/SessionPerConversationScope.cs +++ b/src/Spring/Spring.Web.Conversation.NHibernate32/Data/NHibernate/Support/SessionPerConversationScope.cs @@ -30,8 +30,8 @@ using Spring.Threading; 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 @@ namespace Spring.Data.NHibernate.Support /// /// This sessionHolder creates a session for the active conversation only if it is - /// needed (). + /// needed (). /// /// /// Although a NHibernateSession defers creation of db-connections until they are really diff --git a/src/Spring/Spring.Web.Conversation.NHibernate32/Spring.Web.Conversation.NHibernate32.2010.csproj b/src/Spring/Spring.Web.Conversation.NHibernate32/Spring.Web.Conversation.NHibernate32.2010.csproj index 12bafed2..f7ad11f7 100644 --- a/src/Spring/Spring.Web.Conversation.NHibernate32/Spring.Web.Conversation.NHibernate32.2010.csproj +++ b/src/Spring/Spring.Web.Conversation.NHibernate32/Spring.Web.Conversation.NHibernate32.2010.csproj @@ -58,14 +58,14 @@ CommonAssemblyInfo.cs - - - - - - + + + + + + diff --git a/src/Spring/Spring.Web.Conversation.NHibernate32/Spring.Web.Conversation.NHibernate32.xml b/src/Spring/Spring.Web.Conversation.NHibernate32/Spring.Web.Conversation.NHibernate32.xml index 9b65367a..953538d6 100644 --- a/src/Spring/Spring.Web.Conversation.NHibernate32/Spring.Web.Conversation.NHibernate32.xml +++ b/src/Spring/Spring.Web.Conversation.NHibernate32/Spring.Web.Conversation.NHibernate32.xml @@ -4,479 +4,6 @@ Spring.Web.Conversation.NHibernate32 - - - HttpModule for ending Conversations with Timeout exceeded. - - Hailton de Castro - - - - Add PostRequestHandlerExecute event to clear conversations with timeout exceeded. - - - - - - Disposes of the resources (other than memory) used by the module that implements . - - - - - Handles the Unload event of the page control. - - The source of the event. - The instance containing the event data. - - Necessary for Redirect or Abort for any reason. - - - - - The Names of the s in the - - - - - Sets the that this - object runs in. - - - -

- Used to obtain the instances of -

-

- Invoked after population of normal object properties but before an - init callback such as - 's - - or a custom init-method. Invoked after the setting of any - 's - - property. -

- - - In the case of application context initialization errors. - - - If thrown by any application context methods. - - - - - - manager for Conversations. - - Hailton de Castro - - - - Returns the conversation if it is still alive, otherwise it returns null. - - - - - - - Ends all conversations with the timeout exceeded. - - - - - Close IDbConnections for that - use 'session-per-conversation'. It calls - in all conversations. - - - - - Release the ended conversations And removes them. - If the conversation supports 'session-per-conversation', also close the session. - - - - - Add conversation. If is null - it resolves to 'this'. - - - - If already has another manager. - - - - - Makes the 'root conversation' of - the current active conversation and open/reopen the - if - the conversation supports 'session-per-conversation'. Close all - the connection for all session before. - If is true will end all - paused conversations. - - - - - Returns the active conversation if exists, otherwise returns null. - It depends on - - - - - - If this is non-null run pattern 'session-per-conversation'. - Must be the same SessionFactory of the managed conversations. - - - - - - Ends the "paused conversations" in call to . - Important: Unexpected behavior may occur if there are nested conversations, - as in only the current conversation and its parents - are started, the 'conversations children' remain paused, so these will be ended. - Defaul value: false. - - - When it is true, "start/resume a conversation" will cause the other to be - ended and cleaned up. - - This is useful to avoid memory leak where there are many conversations. - This leak can be very considerable, as the conversation may keep a "NHibernate session" - that can contain many objects in its cache from the database queries. - - - - - - Port to conversation. If the object is not found in the current - conversation, will be tried on the parent if the parent is - not null. - - - If is different from spring name for this instance. - - Hailton de Castro - - - - Starts or resumes the conversation and the . - If is not null, so - is called to - Raise SessionHolder for make the reconnection. - - Make return false. - - Update the . - - - - - If this conversation is ended. - - If is not null and - different from - - - - - - - - Ends the conversation. End each of the 'inner conversations' in - . Returns false if the - conversation and all of - has already been ended. - - - - - If . - Session["spring.objects"] - is null. - - The 'spring session scopes' are not located in the key - 'spring.objects' of HttpSessionState. - - - - - - - Starts or resumes the conversation and each 'inner conversation' in - . - It is not about 'Session-per-conversation' because it is done by - . - - - - - Conversation id. - - - - - Return true until is called. - - - - - Return true if this conversation is ended. - - - - - Inner conversation. After added if the - is null it will resolve to 'this'. - - at - , - , - - if Circular Dependency is detected. - - - - Conversation parent. - - - - If this conversation already has a different parent. - - If this Conversation is not new. - - If Circular Dependency is detected. - - The Parent conversation is not new. - - - - - - - TimeOut for the conversation in milliseconds. - If 0 TimeOut will be ignored. - - - - - Last acces for a value into this Conversation or Inner Conversation. - Reset to DateTime.Now each time - is called. - - - - - Conversation Manager. When this is setted if - - returns null so AddConversation is called. - - - - - that is stored in the root conversation. - - - must support 'session-per-conversation'. - - - - - - If this is non-null run pattern 'session-per-conversation'. - It also depends on and . - must support ConversationManager. - - - - - - If this is non-null run pattern 'session-per-conversation'. - It also depends on and . - must support ConversationManager. - - - - - - Indicates that the conversation is paused. - - - - - List that make validation for Circular Dependency for - - Hailton de Castro - - - - Contructor. - - The that owns this . - - - - Common Helper to be run before insert. - - - - - - Common Helper to be run after insert. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - This was made to stay under session scope. - - Hailton de Castro - Based on @@ -520,10 +47,10 @@ NOOP. - + Open a new session or reconect the - in . + in . Participating in an existing session registed with is not alowed. @@ -539,17 +66,17 @@ - + Close the current view's session and unregisters from . - The session factory that on use + The session factory that on use A list of conversations which the session can be closed or disconnected If start/resume a conversation from a - when exists a different + when exists a different with open registered on If the holder on , is not a . @@ -584,14 +111,14 @@ This sessionHolder creates a session for the active conversation only if it is - needed (). + needed (). Although a NHibernateSession defers creation of db-connections until they are really needed, instantiation a session is still more expensive than using LazySessionHolder. - + Initialize a new instance. @@ -601,303 +128,6 @@ Create a new session on demand - - - Semaphore to synchronize writes to the dictionary. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Ends all conversations and Closes all their Session. - - - - - Remove conversation. - - - - - - - - - - - "SessionFactory" name in the current context. - This approach is required to support serialization. - - - - - - - - - - - - - - - Returns the current context. Supports serialization and deserialization. - - - - - Implementation of conversation in the infrastructure of Spring. - It avoid Circular Dependencies. - - Hailton de Castro - - - - Default message for "CONVERSATION ALREADY HAS A PARENT" error. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - A String representation from conversation. - - - - - - - - - - - - - - - - Default 180000. - - - - - - - - - - - - - - - . - - - - - - - - - - - - - - - "SessionFactory" name in the current context. - This approach is required to support serialization. - - - - - - - - - - "DbProvider" name in the current context. - This approach is required to support serialization. - - - - - - - - - - - - - - - - - - - - . It is used to valddate - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Returns the current context. Supports serialization and deserialization. - - Setting for @@ -954,5 +184,775 @@ within a transaction. + + + Port to conversation. If the object is not found in the current + conversation, will be tried on the parent if the parent is + not null. + + + If is different from spring name for this instance. + + Hailton de Castro + + + + Starts or resumes the conversation and the . + If is not null, so + is called to + Raise SessionHolder for make the reconnection. + + Make return false. + + Update the . + + + + + If this conversation is ended. + + If is not null and + different from + + + + + + + + Ends the conversation. End each of the 'inner conversations' in + . Returns false if the + conversation and all of + has already been ended. + + + + + If . + Session["spring.objects"] + is null. + + The 'spring session scopes' are not located in the key + 'spring.objects' of HttpSessionState. + + + + + + + Starts or resumes the conversation and each 'inner conversation' in + . + It is not about 'Session-per-conversation' because it is done by + . + + + + + Conversation id. + + + + + Return true until is called. + + + + + Return true if this conversation is ended. + + + + + Inner conversation. After added if the + is null it will resolve to 'this'. + + at + , + , + + if Circular Dependency is detected. + + + + Conversation parent. + + + + If this conversation already has a different parent. + + If this Conversation is not new. + + If Circular Dependency is detected. + + The Parent conversation is not new. + + + + + + + TimeOut for the conversation in milliseconds. + If 0 TimeOut will be ignored. + + + + + Last acces for a value into this Conversation or Inner Conversation. + Reset to DateTime.Now each time + is called. + + + + + Conversation Manager. When this is setted if + + returns null so AddConversation is called. + + + + + that is stored in the root conversation. + + + must support 'session-per-conversation'. + + + + + + If this is non-null run pattern 'session-per-conversation'. + It also depends on and . + must support ConversationManager. + + + + + + If this is non-null run pattern 'session-per-conversation'. + It also depends on and . + must support ConversationManager. + + + + + + Indicates that the conversation is paused. + + + + + manager for Conversations. + + Hailton de Castro + + + + Returns the conversation if it is still alive, otherwise it returns null. + + + + + + + Ends all conversations with the timeout exceeded. + + + + + Close IDbConnections for that + use 'session-per-conversation'. It calls + in all conversations. + + + + + Release the ended conversations And removes them. + If the conversation supports 'session-per-conversation', also close the session. + + + + + Add conversation. If is null + it resolves to 'this'. + + + + If already has another manager. + + + + + Makes the 'root conversation' of + the current active conversation and open/reopen the + if + the conversation supports 'session-per-conversation'. Close all + the connection for all session before. + If is true will end all + paused conversations. + + + + + Returns the active conversation if exists, otherwise returns null. + It depends on + + + + + + If this is non-null run pattern 'session-per-conversation'. + Must be the same SessionFactory of the managed conversations. + + + + + + Ends the "paused conversations" in call to . + Important: Unexpected behavior may occur if there are nested conversations, + as in only the current conversation and its parents + are started, the 'conversations children' remain paused, so these will be ended. + Defaul value: false. + + + When it is true, "start/resume a conversation" will cause the other to be + ended and cleaned up. + + This is useful to avoid memory leak where there are many conversations. + This leak can be very considerable, as the conversation may keep a "NHibernate session" + that can contain many objects in its cache from the database queries. + + + + + + HttpModule for ending Conversations with Timeout exceeded. + + Hailton de Castro + + + + Add PostRequestHandlerExecute event to clear conversations with timeout exceeded. + + + + + + Disposes of the resources (other than memory) used by the module that implements . + + + + + Handles the Unload event of the page control. + + The source of the event. + The instance containing the event data. + + Necessary for Redirect or Abort for any reason. + + + + + The Names of the s in the + + + + + Sets the that this + object runs in. + + + +

+ Used to obtain the instances of +

+

+ Invoked after population of normal object properties but before an + init callback such as + 's + + or a custom init-method. Invoked after the setting of any + 's + + property. +

+ + + In the case of application context initialization errors. + + + If thrown by any application context methods. + + + + + + List that make validation for Circular Dependency for + + Hailton de Castro + + + + Contructor. + + The that owns this . + + + + Common Helper to be run before insert. + + + + + + Common Helper to be run after insert. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Implementation of conversation in the infrastructure of Spring. + It avoid Circular Dependencies. + + Hailton de Castro + + + + Default message for "CONVERSATION ALREADY HAS A PARENT" error. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + A String representation from conversation. + + + + + + + + + + + + + + + + Default 180000. + + + + + + + + + + + + + + + . + + + + + + + + + + + + + + + "SessionFactory" name in the current context. + This approach is required to support serialization. + + + + + + + + + + "DbProvider" name in the current context. + This approach is required to support serialization. + + + + + + + + + + + + + + + + + + + + . It is used to valddate + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Returns the current context. Supports serialization and deserialization. + + + + + This was made to stay under session scope. + + Hailton de Castro + + + + Semaphore to synchronize writes to the dictionary. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Ends all conversations and Closes all their Session. + + + + + Remove conversation. + + + + + + + + + + + "SessionFactory" name in the current context. + This approach is required to support serialization. + + + + + + + + + + + + + + + Returns the current context. Supports serialization and deserialization. + + diff --git a/src/Spring/Spring.Web.Conversation.NHibernate32/ConversationWA/HttpModule/ConversationModule.cs b/src/Spring/Spring.Web.Conversation.NHibernate32/Web/Conversation/HttpModule/ConversationModule.cs similarity index 96% rename from src/Spring/Spring.Web.Conversation.NHibernate32/ConversationWA/HttpModule/ConversationModule.cs rename to src/Spring/Spring.Web.Conversation.NHibernate32/Web/Conversation/HttpModule/ConversationModule.cs index 8b044a43..ed3dbded 100644 --- a/src/Spring/Spring.Web.Conversation.NHibernate32/ConversationWA/HttpModule/ConversationModule.cs +++ b/src/Spring/Spring.Web.Conversation.NHibernate32/Web/Conversation/HttpModule/ConversationModule.cs @@ -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 { /// /// HttpModule for ending Conversations with Timeout exceeded. @@ -38,12 +35,12 @@ namespace Spring.ConversationWA.HttpModule { private static readonly ILog LOG = LogManager.GetLogger(typeof(ConversationModule)); - private IList conversationManagerName; + private IList conversationManagerName; /// /// The Names of the s in the /// - public IList ConversationManagerNameList + public IList ConversationManagerNameList { get { return conversationManagerName; } set { conversationManagerName = value; } diff --git a/src/Spring/Spring.Web.Conversation.NHibernate32/ConversationWA/IConversationManager.cs b/src/Spring/Spring.Web.Conversation.NHibernate32/Web/Conversation/IConversationManager.cs similarity index 98% rename from src/Spring/Spring.Web.Conversation.NHibernate32/ConversationWA/IConversationManager.cs rename to src/Spring/Spring.Web.Conversation.NHibernate32/Web/Conversation/IConversationManager.cs index 754b5f0b..1852c6f5 100644 --- a/src/Spring/Spring.Web.Conversation.NHibernate32/ConversationWA/IConversationManager.cs +++ b/src/Spring/Spring.Web.Conversation.NHibernate32/Web/Conversation/IConversationManager.cs @@ -19,11 +19,9 @@ #endregion using System; -using System.Collections.Generic; -using System.Text; using NHibernate; -namespace Spring.ConversationWA +namespace Spring.Web.Conversation { /// /// manager for Conversations. diff --git a/src/Spring/Spring.Web.Conversation.NHibernate32/ConversationWA/IConversationState.cs b/src/Spring/Spring.Web.Conversation.NHibernate32/Web/Conversation/IConversationState.cs similarity index 95% rename from src/Spring/Spring.Web.Conversation.NHibernate32/ConversationWA/IConversationState.cs rename to src/Spring/Spring.Web.Conversation.NHibernate32/Web/Conversation/IConversationState.cs index 028f40b6..40b76889 100644 --- a/src/Spring/Spring.Web.Conversation.NHibernate32/ConversationWA/IConversationState.cs +++ b/src/Spring/Spring.Web.Conversation.NHibernate32/Web/Conversation/IConversationState.cs @@ -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 { /// /// Port to conversation. If the object is not found in the current @@ -43,7 +34,7 @@ namespace Spring.ConversationWA /// If is different from spring name for this instance. /// /// Hailton de Castro - public interface IConversationState: IDictionary + public interface IConversationState: IDictionary { /// /// Conversation id. diff --git a/src/Spring/Spring.Web.Conversation.NHibernate32/ConversationWA/Impl/InnerConversationList.cs b/src/Spring/Spring.Web.Conversation.NHibernate32/Web/Conversation/InnerConversationList.cs similarity index 99% rename from src/Spring/Spring.Web.Conversation.NHibernate32/ConversationWA/Impl/InnerConversationList.cs rename to src/Spring/Spring.Web.Conversation.NHibernate32/Web/Conversation/InnerConversationList.cs index 065be83d..0d54855d 100644 --- a/src/Spring/Spring.Web.Conversation.NHibernate32/ConversationWA/Impl/InnerConversationList.cs +++ b/src/Spring/Spring.Web.Conversation.NHibernate32/Web/Conversation/InnerConversationList.cs @@ -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 { /// /// List that make validation for Circular Dependency for diff --git a/src/Spring/Spring.Web.Conversation.NHibernate32/ConversationWA/Impl/WebConversationManager.cs b/src/Spring/Spring.Web.Conversation.NHibernate32/Web/Conversation/WebConversationManager.cs similarity index 99% rename from src/Spring/Spring.Web.Conversation.NHibernate32/ConversationWA/Impl/WebConversationManager.cs rename to src/Spring/Spring.Web.Conversation.NHibernate32/Web/Conversation/WebConversationManager.cs index 8d9ef260..156b5262 100644 --- a/src/Spring/Spring.Web.Conversation.NHibernate32/ConversationWA/Impl/WebConversationManager.cs +++ b/src/Spring/Spring.Web.Conversation.NHibernate32/Web/Conversation/WebConversationManager.cs @@ -23,12 +23,12 @@ using System.Collections.Generic; 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 { /// /// This was made to stay under session scope. diff --git a/src/Spring/Spring.Web.Conversation.NHibernate32/ConversationWA/Impl/WebConversationSpringState.cs b/src/Spring/Spring.Web.Conversation.NHibernate32/Web/Conversation/WebConversationSpringState.cs similarity index 99% rename from src/Spring/Spring.Web.Conversation.NHibernate32/ConversationWA/Impl/WebConversationSpringState.cs rename to src/Spring/Spring.Web.Conversation.NHibernate32/Web/Conversation/WebConversationSpringState.cs index 3267bb69..bb6d66b5 100644 --- a/src/Spring/Spring.Web.Conversation.NHibernate32/ConversationWA/Impl/WebConversationSpringState.cs +++ b/src/Spring/Spring.Web.Conversation.NHibernate32/Web/Conversation/WebConversationSpringState.cs @@ -19,17 +19,17 @@ #endregion using System; -using System.Web; -using Spring.Objects.Factory; -using Common.Logging; -using System.Collections.Generic; using System.Collections; -using Spring.Data.Common; +using System.Collections.Generic; +using System.Web; +using Common.Logging; 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 { /// /// Implementation of conversation in the infrastructure of Spring. diff --git a/src/Spring/Spring.Web.Conversation.NHibernate33/AssemblyInfo.cs b/src/Spring/Spring.Web.Conversation.NHibernate33/AssemblyInfo.cs index 6931d3d5..d5d05ee6 100644 --- a/src/Spring/Spring.Web.Conversation.NHibernate33/AssemblyInfo.cs +++ b/src/Spring/Spring.Web.Conversation.NHibernate33/AssemblyInfo.cs @@ -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")] \ No newline at end of file +[assembly: AssemblyTitle("Spring.Web.Conversation.NHibernate33. NHibernate 3.3 support.")] +[assembly: AssemblyDescription("Interfaces and classes that provide 'Long-Running Conversation' support in Spring.Net")] \ No newline at end of file diff --git a/src/Spring/Spring.Web.Conversation.NHibernate33/ConversationWA/HttpModule/dontdelete.txt b/src/Spring/Spring.Web.Conversation.NHibernate33/ConversationWA/HttpModule/dontdelete.txt deleted file mode 100644 index 55d0ec6d..00000000 --- a/src/Spring/Spring.Web.Conversation.NHibernate33/ConversationWA/HttpModule/dontdelete.txt +++ /dev/null @@ -1 +0,0 @@ -sources are linked here from Spring.ConversationWA.NH32 \ No newline at end of file diff --git a/src/Spring/Spring.Web.Conversation.NHibernate33/ConversationWA/dontdelete.txt b/src/Spring/Spring.Web.Conversation.NHibernate33/ConversationWA/dontdelete.txt deleted file mode 100644 index 55d0ec6d..00000000 --- a/src/Spring/Spring.Web.Conversation.NHibernate33/ConversationWA/dontdelete.txt +++ /dev/null @@ -1 +0,0 @@ -sources are linked here from Spring.ConversationWA.NH32 \ No newline at end of file diff --git a/src/Spring/Spring.Web.Conversation.NHibernate33/Spring.Web.Conversation.NHibernate33.2010.csproj b/src/Spring/Spring.Web.Conversation.NHibernate33/Spring.Web.Conversation.NHibernate33.2010.csproj index 6353035f..aced41a8 100644 --- a/src/Spring/Spring.Web.Conversation.NHibernate33/Spring.Web.Conversation.NHibernate33.2010.csproj +++ b/src/Spring/Spring.Web.Conversation.NHibernate33/Spring.Web.Conversation.NHibernate33.2010.csproj @@ -57,30 +57,30 @@ CommonAssemblyInfo.cs - - Conversation\HttpModule\ConversationModule.cs - - - Conversation\IConversationManager.cs - - - Conversation\IConversationState.cs - - - Conversation\Impl\InnerConversationList.cs - - - Conversation\Impl\WebConversationManager.cs - - - Conversation\Impl\WebConversationSpringState.cs - Data\NHibernate\Support\SessionPerConversationScope.cs Data\NHibernate\Support\SessionPerConversationSettings.cs + + Web\Conversation\HttpModule\ConversationModule.cs + + + Web\Conversation\IConversationManager.cs + + + Web\Conversation\IConversationState.cs + + + Web\Conversation\InnerConversationList.cs + + + Web\Conversation\WebConversationManager.cs + + + Web\Conversation\WebConversationSpringState.cs + diff --git a/src/Spring/Spring.Web.Conversation.NHibernate33/Spring.Web.Conversation.NHibernate33.XML b/src/Spring/Spring.Web.Conversation.NHibernate33/Spring.Web.Conversation.NHibernate33.XML index cab74383..3e824e7c 100644 --- a/src/Spring/Spring.Web.Conversation.NHibernate33/Spring.Web.Conversation.NHibernate33.XML +++ b/src/Spring/Spring.Web.Conversation.NHibernate33/Spring.Web.Conversation.NHibernate33.XML @@ -4,479 +4,6 @@ Spring.Web.Conversation.NHibernate33 - - - HttpModule for ending Conversations with Timeout exceeded. - - Hailton de Castro - - - - Add PostRequestHandlerExecute event to clear conversations with timeout exceeded. - - - - - - Disposes of the resources (other than memory) used by the module that implements . - - - - - Handles the Unload event of the page control. - - The source of the event. - The instance containing the event data. - - Necessary for Redirect or Abort for any reason. - - - - - The Names of the s in the - - - - - Sets the that this - object runs in. - - - -

- Used to obtain the instances of -

-

- Invoked after population of normal object properties but before an - init callback such as - 's - - or a custom init-method. Invoked after the setting of any - 's - - property. -

- - - In the case of application context initialization errors. - - - If thrown by any application context methods. - - - - - - manager for Conversations. - - Hailton de Castro - - - - Returns the conversation if it is still alive, otherwise it returns null. - - - - - - - Ends all conversations with the timeout exceeded. - - - - - Close IDbConnections for that - use 'session-per-conversation'. It calls - in all conversations. - - - - - Release the ended conversations And removes them. - If the conversation supports 'session-per-conversation', also close the session. - - - - - Add conversation. If is null - it resolves to 'this'. - - - - If already has another manager. - - - - - Makes the 'root conversation' of - the current active conversation and open/reopen the - if - the conversation supports 'session-per-conversation'. Close all - the connection for all session before. - If is true will end all - paused conversations. - - - - - Returns the active conversation if exists, otherwise returns null. - It depends on - - - - - - If this is non-null run pattern 'session-per-conversation'. - Must be the same SessionFactory of the managed conversations. - - - - - - Ends the "paused conversations" in call to . - Important: Unexpected behavior may occur if there are nested conversations, - as in only the current conversation and its parents - are started, the 'conversations children' remain paused, so these will be ended. - Defaul value: false. - - - When it is true, "start/resume a conversation" will cause the other to be - ended and cleaned up. - - This is useful to avoid memory leak where there are many conversations. - This leak can be very considerable, as the conversation may keep a "NHibernate session" - that can contain many objects in its cache from the database queries. - - - - - - Port to conversation. If the object is not found in the current - conversation, will be tried on the parent if the parent is - not null. - - - If is different from spring name for this instance. - - Hailton de Castro - - - - Starts or resumes the conversation and the . - If is not null, so - is called to - Raise SessionHolder for make the reconnection. - - Make return false. - - Update the . - - - - - If this conversation is ended. - - If is not null and - different from - - - - - - - - Ends the conversation. End each of the 'inner conversations' in - . Returns false if the - conversation and all of - has already been ended. - - - - - If . - Session["spring.objects"] - is null. - - The 'spring session scopes' are not located in the key - 'spring.objects' of HttpSessionState. - - - - - - - Starts or resumes the conversation and each 'inner conversation' in - . - It is not about 'Session-per-conversation' because it is done by - . - - - - - Conversation id. - - - - - Return true until is called. - - - - - Return true if this conversation is ended. - - - - - Inner conversation. After added if the - is null it will resolve to 'this'. - - at - , - , - - if Circular Dependency is detected. - - - - Conversation parent. - - - - If this conversation already has a different parent. - - If this Conversation is not new. - - If Circular Dependency is detected. - - The Parent conversation is not new. - - - - - - - TimeOut for the conversation in milliseconds. - If 0 TimeOut will be ignored. - - - - - Last acces for a value into this Conversation or Inner Conversation. - Reset to DateTime.Now each time - is called. - - - - - Conversation Manager. When this is setted if - - returns null so AddConversation is called. - - - - - that is stored in the root conversation. - - - must support 'session-per-conversation'. - - - - - - If this is non-null run pattern 'session-per-conversation'. - It also depends on and . - must support ConversationManager. - - - - - - If this is non-null run pattern 'session-per-conversation'. - It also depends on and . - must support ConversationManager. - - - - - - Indicates that the conversation is paused. - - - - - List that make validation for Circular Dependency for - - Hailton de Castro - - - - Contructor. - - The that owns this . - - - - Common Helper to be run before insert. - - - - - - Common Helper to be run after insert. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - This was made to stay under session scope. - - Hailton de Castro - Based on @@ -520,10 +47,10 @@ NOOP. - + Open a new session or reconect the - in . + in . Participating in an existing session registed with is not alowed. @@ -539,17 +66,17 @@ - + Close the current view's session and unregisters from . - The session factory that on use + The session factory that on use A list of conversations which the session can be closed or disconnected If start/resume a conversation from a - when exists a different + when exists a different with open registered on If the holder on , is not a . @@ -584,14 +111,14 @@ This sessionHolder creates a session for the active conversation only if it is - needed (). + needed (). Although a NHibernateSession defers creation of db-connections until they are really needed, instantiation a session is still more expensive than using LazySessionHolder. - + Initialize a new instance. @@ -601,303 +128,6 @@ Create a new session on demand - - - Semaphore to synchronize writes to the dictionary. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Ends all conversations and Closes all their Session. - - - - - Remove conversation. - - - - - - - - - - - "SessionFactory" name in the current context. - This approach is required to support serialization. - - - - - - - - - - - - - - - Returns the current context. Supports serialization and deserialization. - - - - - Implementation of conversation in the infrastructure of Spring. - It avoid Circular Dependencies. - - Hailton de Castro - - - - Default message for "CONVERSATION ALREADY HAS A PARENT" error. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - A String representation from conversation. - - - - - - - - - - - - - - - - Default 180000. - - - - - - - - - - - - - - - . - - - - - - - - - - - - - - - "SessionFactory" name in the current context. - This approach is required to support serialization. - - - - - - - - - - "DbProvider" name in the current context. - This approach is required to support serialization. - - - - - - - - - - - - - - - - - - - - . It is used to valddate - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Returns the current context. Supports serialization and deserialization. - - Setting for @@ -954,5 +184,775 @@ within a transaction. + + + manager for Conversations. + + Hailton de Castro + + + + Returns the conversation if it is still alive, otherwise it returns null. + + + + + + + Ends all conversations with the timeout exceeded. + + + + + Close IDbConnections for that + use 'session-per-conversation'. It calls + in all conversations. + + + + + Release the ended conversations And removes them. + If the conversation supports 'session-per-conversation', also close the session. + + + + + Add conversation. If is null + it resolves to 'this'. + + + + If already has another manager. + + + + + Makes the 'root conversation' of + the current active conversation and open/reopen the + if + the conversation supports 'session-per-conversation'. Close all + the connection for all session before. + If is true will end all + paused conversations. + + + + + Returns the active conversation if exists, otherwise returns null. + It depends on + + + + + + If this is non-null run pattern 'session-per-conversation'. + Must be the same SessionFactory of the managed conversations. + + + + + + Ends the "paused conversations" in call to . + Important: Unexpected behavior may occur if there are nested conversations, + as in only the current conversation and its parents + are started, the 'conversations children' remain paused, so these will be ended. + Defaul value: false. + + + When it is true, "start/resume a conversation" will cause the other to be + ended and cleaned up. + + This is useful to avoid memory leak where there are many conversations. + This leak can be very considerable, as the conversation may keep a "NHibernate session" + that can contain many objects in its cache from the database queries. + + + + + + Port to conversation. If the object is not found in the current + conversation, will be tried on the parent if the parent is + not null. + + + If is different from spring name for this instance. + + Hailton de Castro + + + + Starts or resumes the conversation and the . + If is not null, so + is called to + Raise SessionHolder for make the reconnection. + + Make return false. + + Update the . + + + + + If this conversation is ended. + + If is not null and + different from + + + + + + + + Ends the conversation. End each of the 'inner conversations' in + . Returns false if the + conversation and all of + has already been ended. + + + + + If . + Session["spring.objects"] + is null. + + The 'spring session scopes' are not located in the key + 'spring.objects' of HttpSessionState. + + + + + + + Starts or resumes the conversation and each 'inner conversation' in + . + It is not about 'Session-per-conversation' because it is done by + . + + + + + Conversation id. + + + + + Return true until is called. + + + + + Return true if this conversation is ended. + + + + + Inner conversation. After added if the + is null it will resolve to 'this'. + + at + , + , + + if Circular Dependency is detected. + + + + Conversation parent. + + + + If this conversation already has a different parent. + + If this Conversation is not new. + + If Circular Dependency is detected. + + The Parent conversation is not new. + + + + + + + TimeOut for the conversation in milliseconds. + If 0 TimeOut will be ignored. + + + + + Last acces for a value into this Conversation or Inner Conversation. + Reset to DateTime.Now each time + is called. + + + + + Conversation Manager. When this is setted if + + returns null so AddConversation is called. + + + + + that is stored in the root conversation. + + + must support 'session-per-conversation'. + + + + + + If this is non-null run pattern 'session-per-conversation'. + It also depends on and . + must support ConversationManager. + + + + + + If this is non-null run pattern 'session-per-conversation'. + It also depends on and . + must support ConversationManager. + + + + + + Indicates that the conversation is paused. + + + + + List that make validation for Circular Dependency for + + Hailton de Castro + + + + Contructor. + + The that owns this . + + + + Common Helper to be run before insert. + + + + + + Common Helper to be run after insert. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + This was made to stay under session scope. + + Hailton de Castro + + + + Semaphore to synchronize writes to the dictionary. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Ends all conversations and Closes all their Session. + + + + + Remove conversation. + + + + + + + + + + + "SessionFactory" name in the current context. + This approach is required to support serialization. + + + + + + + + + + + + + + + Returns the current context. Supports serialization and deserialization. + + + + + Implementation of conversation in the infrastructure of Spring. + It avoid Circular Dependencies. + + Hailton de Castro + + + + Default message for "CONVERSATION ALREADY HAS A PARENT" error. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + A String representation from conversation. + + + + + + + + + + + + + + + + Default 180000. + + + + + + + + + + + + + + + . + + + + + + + + + + + + + + + "SessionFactory" name in the current context. + This approach is required to support serialization. + + + + + + + + + + "DbProvider" name in the current context. + This approach is required to support serialization. + + + + + + + + + + + + + + + + + + + + . It is used to valddate + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Returns the current context. Supports serialization and deserialization. + + + + + HttpModule for ending Conversations with Timeout exceeded. + + Hailton de Castro + + + + Add PostRequestHandlerExecute event to clear conversations with timeout exceeded. + + + + + + Disposes of the resources (other than memory) used by the module that implements . + + + + + Handles the Unload event of the page control. + + The source of the event. + The instance containing the event data. + + Necessary for Redirect or Abort for any reason. + + + + + The Names of the s in the + + + + + Sets the that this + object runs in. + + + +

+ Used to obtain the instances of +

+

+ Invoked after population of normal object properties but before an + init callback such as + 's + + or a custom init-method. Invoked after the setting of any + 's + + property. +

+ + + In the case of application context initialization errors. + + + If thrown by any application context methods. + + + diff --git a/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/AssemblyInfo.cs b/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/AssemblyInfo.cs index 9ac8b150..a7102825 100644 --- a/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/AssemblyInfo.cs +++ b/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/AssemblyInfo.cs @@ -1,5 +1,5 @@ using System.Reflection; using System.Runtime.CompilerServices; -[assembly: AssemblyTitle("Spring.ConversationWA.NH32 Integration Tests")] -[assembly: AssemblyDescription("Integration tests for Spring.ConversationWA.NH32.Tests assembly")] +[assembly: AssemblyTitle("Spring.Web.Conversation.NH32 Integration Tests")] +[assembly: AssemblyDescription("Integration tests for Spring.Web.Conversation.NH32.Tests assembly")] diff --git a/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/ConversationWA/PatialEndConvBeginBasePage.cs b/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Conversation/PatialEndConvBeginBasePage.cs similarity index 94% rename from test/Spring/Spring.Web.Conversation.NHibernate32.Tests/ConversationWA/PatialEndConvBeginBasePage.cs rename to test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Conversation/PatialEndConvBeginBasePage.cs index e27db7e4..aa059233 100644 --- a/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/ConversationWA/PatialEndConvBeginBasePage.cs +++ b/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Conversation/PatialEndConvBeginBasePage.cs @@ -21,10 +21,11 @@ using System; using System.Collections.Generic; using System.Text; +using Spring.Web.Conversation; using Spring.Web.UI; -using Spring.ConversationWA; +using Spring.Web.Conversation; -namespace Spring.ConversationWA +namespace Spring.Web.Conversation { /// /// Base class for test pages for test diff --git a/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/ConversationWA/PatialEndConvEndBasePage.cs b/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Conversation/PatialEndConvEndBasePage.cs similarity index 94% rename from test/Spring/Spring.Web.Conversation.NHibernate32.Tests/ConversationWA/PatialEndConvEndBasePage.cs rename to test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Conversation/PatialEndConvEndBasePage.cs index ec901bf2..8768c896 100644 --- a/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/ConversationWA/PatialEndConvEndBasePage.cs +++ b/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Conversation/PatialEndConvEndBasePage.cs @@ -21,10 +21,11 @@ using System; using System.Collections.Generic; using System.Text; +using Spring.Web.Conversation; using Spring.Web.UI; -using Spring.ConversationWA; +using Spring.Web.Conversation; -namespace Spring.ConversationWA +namespace Spring.Web.Conversation { /// /// Base class for test pages for test diff --git a/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/ConversationWA/SerializeConversationTestModule.cs b/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Conversation/SerializeConversationTestModule.cs similarity index 99% rename from test/Spring/Spring.Web.Conversation.NHibernate32.Tests/ConversationWA/SerializeConversationTestModule.cs rename to test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Conversation/SerializeConversationTestModule.cs index 7d7bcc5c..50ce4e60 100644 --- a/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/ConversationWA/SerializeConversationTestModule.cs +++ b/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Conversation/SerializeConversationTestModule.cs @@ -30,7 +30,7 @@ using System.Runtime.Serialization; using System.Reflection; using Spring.Entities; -namespace Spring.ConversationWA +namespace Spring.Web.Conversation { /// /// Module that forces the serialization and deserialization of the session content to simulate a clustered server for diff --git a/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/ConversationWA/SimpleTest.cs b/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Conversation/SimpleTest.cs similarity index 96% rename from test/Spring/Spring.Web.Conversation.NHibernate32.Tests/ConversationWA/SimpleTest.cs rename to test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Conversation/SimpleTest.cs index e4fbee69..0e933a05 100644 --- a/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/ConversationWA/SimpleTest.cs +++ b/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Conversation/SimpleTest.cs @@ -24,7 +24,7 @@ using System.Linq; using System.Text; using NUnit.Framework; -namespace Spring.ConversationWA +namespace Spring.Web.Conversation { [TestFixture] public class SimpleTest diff --git a/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/ConversationWA/WebConversationStateTest.cs b/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Conversation/WebConversationStateTest.cs similarity index 99% rename from test/Spring/Spring.Web.Conversation.NHibernate32.Tests/ConversationWA/WebConversationStateTest.cs rename to test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Conversation/WebConversationStateTest.cs index 07246fca..4b62beb2 100644 Binary files a/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/ConversationWA/WebConversationStateTest.cs and b/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Conversation/WebConversationStateTest.cs differ diff --git a/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/ConversationWA/WebConversationStateTest/CircularDependenceTest.aspx b/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/Conversation/WebConversationStateTest/CircularDependenceTest.aspx similarity index 100% rename from test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/ConversationWA/WebConversationStateTest/CircularDependenceTest.aspx rename to test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/Conversation/WebConversationStateTest/CircularDependenceTest.aspx diff --git a/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/ConversationWA/WebConversationStateTest/CircularDependenceTest.aspx.cs b/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/Conversation/WebConversationStateTest/CircularDependenceTest.aspx.cs similarity index 97% rename from test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/ConversationWA/WebConversationStateTest/CircularDependenceTest.aspx.cs rename to test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/Conversation/WebConversationStateTest/CircularDependenceTest.aspx.cs index 432cbb1d..4bcd85e4 100644 --- a/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/ConversationWA/WebConversationStateTest/CircularDependenceTest.aspx.cs +++ b/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/Conversation/WebConversationStateTest/CircularDependenceTest.aspx.cs @@ -8,12 +8,13 @@ using System.Web.UI; using System.Web.UI.WebControls; using System.Web.UI.WebControls.WebParts; using System.Web.UI.HtmlControls; -using Spring.ConversationWA; +using Spring.Web.Conversation; using NUnit.Framework; using Spring.Context.Support; using System.Text; using Common.Logging; using Spring.Context; +using Spring.Web.Conversation; public partial class CircularDependenceTest : System.Web.UI.Page, IApplicationContextAware { diff --git a/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/ConversationWA/WebConversationStateTest/ConnectionReleaseModeIssue.aspx b/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/Conversation/WebConversationStateTest/ConnectionReleaseModeIssue.aspx similarity index 100% rename from test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/ConversationWA/WebConversationStateTest/ConnectionReleaseModeIssue.aspx rename to test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/Conversation/WebConversationStateTest/ConnectionReleaseModeIssue.aspx diff --git a/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/ConversationWA/WebConversationStateTest/ConnectionReleaseModeIssue.aspx.cs b/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/Conversation/WebConversationStateTest/ConnectionReleaseModeIssue.aspx.cs similarity index 98% rename from test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/ConversationWA/WebConversationStateTest/ConnectionReleaseModeIssue.aspx.cs rename to test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/Conversation/WebConversationStateTest/ConnectionReleaseModeIssue.aspx.cs index 57477f82..3cf21876 100644 --- a/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/ConversationWA/WebConversationStateTest/ConnectionReleaseModeIssue.aspx.cs +++ b/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/Conversation/WebConversationStateTest/ConnectionReleaseModeIssue.aspx.cs @@ -8,7 +8,7 @@ using System.Web.UI; using System.Web.UI.WebControls; using System.Web.UI.WebControls.WebParts; using System.Web.UI.HtmlControls; -using Spring.ConversationWA; +using Spring.Web.Conversation; using Spring.Data.NHibernate.Support; using NHibernate; using Spring.Entities; @@ -19,9 +19,10 @@ using NHibernate.Impl; using System.Reflection; using NHibernate.Cfg; using Spring.Context; +using Spring.Web.Conversation; /// -/// Page for . +/// Page for . /// public partial class ConnectionReleaseModeIssue : System.Web.UI.Page, IApplicationContextAware { diff --git a/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/ConversationWA/WebConversationStateTest/EndConversationTestBegin.aspx b/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/Conversation/WebConversationStateTest/EndConversationTestBegin.aspx similarity index 100% rename from test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/ConversationWA/WebConversationStateTest/EndConversationTestBegin.aspx rename to test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/Conversation/WebConversationStateTest/EndConversationTestBegin.aspx diff --git a/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/ConversationWA/WebConversationStateTest/EndConversationTestBegin.aspx.cs b/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/Conversation/WebConversationStateTest/EndConversationTestBegin.aspx.cs similarity index 94% rename from test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/ConversationWA/WebConversationStateTest/EndConversationTestBegin.aspx.cs rename to test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/Conversation/WebConversationStateTest/EndConversationTestBegin.aspx.cs index 8bd19962..271ad21c 100644 --- a/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/ConversationWA/WebConversationStateTest/EndConversationTestBegin.aspx.cs +++ b/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/Conversation/WebConversationStateTest/EndConversationTestBegin.aspx.cs @@ -8,8 +8,9 @@ using System.Web.UI; using System.Web.UI.WebControls; using System.Web.UI.WebControls.WebParts; using System.Web.UI.HtmlControls; -using Spring.ConversationWA; +using Spring.Web.Conversation; using Spring.Bsn; +using Spring.Web.Conversation; public partial class EndConversationTestBegin : System.Web.UI.Page { diff --git a/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/ConversationWA/WebConversationStateTest/EndConversationTestEnd.aspx b/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/Conversation/WebConversationStateTest/EndConversationTestEnd.aspx similarity index 100% rename from test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/ConversationWA/WebConversationStateTest/EndConversationTestEnd.aspx rename to test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/Conversation/WebConversationStateTest/EndConversationTestEnd.aspx diff --git a/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/ConversationWA/WebConversationStateTest/EndConversationTestEnd.aspx.cs b/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/Conversation/WebConversationStateTest/EndConversationTestEnd.aspx.cs similarity index 93% rename from test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/ConversationWA/WebConversationStateTest/EndConversationTestEnd.aspx.cs rename to test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/Conversation/WebConversationStateTest/EndConversationTestEnd.aspx.cs index 72169e2c..a8f37d48 100644 --- a/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/ConversationWA/WebConversationStateTest/EndConversationTestEnd.aspx.cs +++ b/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/Conversation/WebConversationStateTest/EndConversationTestEnd.aspx.cs @@ -9,7 +9,8 @@ using System.Web.UI.WebControls; using System.Web.UI.WebControls.WebParts; using System.Web.UI.HtmlControls; using Spring.Bsn; -using Spring.ConversationWA; +using Spring.Web.Conversation; +using Spring.Web.Conversation; public partial class EndConversationTestEnd : System.Web.UI.Page { diff --git a/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/ConversationWA/WebConversationStateTest/EndPausedSessionIsClosedA.aspx b/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/Conversation/WebConversationStateTest/EndPausedSessionIsClosedA.aspx similarity index 100% rename from test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/ConversationWA/WebConversationStateTest/EndPausedSessionIsClosedA.aspx rename to test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/Conversation/WebConversationStateTest/EndPausedSessionIsClosedA.aspx diff --git a/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/ConversationWA/WebConversationStateTest/EndPausedSessionIsClosedA.aspx.cs b/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/Conversation/WebConversationStateTest/EndPausedSessionIsClosedA.aspx.cs similarity index 94% rename from test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/ConversationWA/WebConversationStateTest/EndPausedSessionIsClosedA.aspx.cs rename to test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/Conversation/WebConversationStateTest/EndPausedSessionIsClosedA.aspx.cs index 93cf58b7..58e9ceed 100644 --- a/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/ConversationWA/WebConversationStateTest/EndPausedSessionIsClosedA.aspx.cs +++ b/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/Conversation/WebConversationStateTest/EndPausedSessionIsClosedA.aspx.cs @@ -8,9 +8,10 @@ using System.Web.UI; using System.Web.UI.WebControls; using System.Web.UI.WebControls.WebParts; using System.Web.UI.HtmlControls; -using Spring.ConversationWA; +using Spring.Web.Conversation; using Spring.Entities; using NHibernate; +using Spring.Web.Conversation; public partial class EndPausedSessionIsClosedA : System.Web.UI.Page { diff --git a/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/ConversationWA/WebConversationStateTest/EndPausedSessionIsClosedB.aspx b/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/Conversation/WebConversationStateTest/EndPausedSessionIsClosedB.aspx similarity index 100% rename from test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/ConversationWA/WebConversationStateTest/EndPausedSessionIsClosedB.aspx rename to test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/Conversation/WebConversationStateTest/EndPausedSessionIsClosedB.aspx diff --git a/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/ConversationWA/WebConversationStateTest/EndPausedSessionIsClosedB.aspx.cs b/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/Conversation/WebConversationStateTest/EndPausedSessionIsClosedB.aspx.cs similarity index 94% rename from test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/ConversationWA/WebConversationStateTest/EndPausedSessionIsClosedB.aspx.cs rename to test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/Conversation/WebConversationStateTest/EndPausedSessionIsClosedB.aspx.cs index d0e0a17d..707c2193 100644 --- a/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/ConversationWA/WebConversationStateTest/EndPausedSessionIsClosedB.aspx.cs +++ b/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/Conversation/WebConversationStateTest/EndPausedSessionIsClosedB.aspx.cs @@ -8,9 +8,10 @@ using System.Web.UI; using System.Web.UI.WebControls; using System.Web.UI.WebControls.WebParts; using System.Web.UI.HtmlControls; -using Spring.ConversationWA; +using Spring.Web.Conversation; using NHibernate; using Spring.Entities; +using Spring.Web.Conversation; public partial class EndPausedSessionIsClosedB : System.Web.UI.Page { diff --git a/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/ConversationWA/WebConversationStateTest/EndPausedTest.aspx b/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/Conversation/WebConversationStateTest/EndPausedTest.aspx similarity index 100% rename from test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/ConversationWA/WebConversationStateTest/EndPausedTest.aspx rename to test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/Conversation/WebConversationStateTest/EndPausedTest.aspx diff --git a/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/ConversationWA/WebConversationStateTest/EndPausedTest.aspx.cs b/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/Conversation/WebConversationStateTest/EndPausedTest.aspx.cs similarity index 95% rename from test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/ConversationWA/WebConversationStateTest/EndPausedTest.aspx.cs rename to test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/Conversation/WebConversationStateTest/EndPausedTest.aspx.cs index e6818adf..1db9c7a2 100644 --- a/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/ConversationWA/WebConversationStateTest/EndPausedTest.aspx.cs +++ b/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/Conversation/WebConversationStateTest/EndPausedTest.aspx.cs @@ -8,7 +8,8 @@ using System.Web.UI; using System.Web.UI.WebControls; using System.Web.UI.WebControls.WebParts; using System.Web.UI.HtmlControls; -using Spring.ConversationWA; +using Spring.Web.Conversation; +using Spring.Web.Conversation; public partial class EndPausedTest : System.Web.UI.Page { diff --git a/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/ConversationWA/WebConversationStateTest/GetParentObjetFromChild.aspx b/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/Conversation/WebConversationStateTest/GetParentObjetFromChild.aspx similarity index 100% rename from test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/ConversationWA/WebConversationStateTest/GetParentObjetFromChild.aspx rename to test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/Conversation/WebConversationStateTest/GetParentObjetFromChild.aspx diff --git a/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/ConversationWA/WebConversationStateTest/GetParentObjetFromChild.aspx.cs b/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/Conversation/WebConversationStateTest/GetParentObjetFromChild.aspx.cs similarity index 93% rename from test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/ConversationWA/WebConversationStateTest/GetParentObjetFromChild.aspx.cs rename to test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/Conversation/WebConversationStateTest/GetParentObjetFromChild.aspx.cs index 74c42826..d3a369e5 100644 --- a/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/ConversationWA/WebConversationStateTest/GetParentObjetFromChild.aspx.cs +++ b/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/Conversation/WebConversationStateTest/GetParentObjetFromChild.aspx.cs @@ -8,7 +8,8 @@ using System.Web.UI; using System.Web.UI.WebControls; using System.Web.UI.WebControls.WebParts; using System.Web.UI.HtmlControls; -using Spring.ConversationWA; +using Spring.Web.Conversation; +using Spring.Web.Conversation; public partial class GetParentObjetFromChild : System.Web.UI.Page { diff --git a/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/ConversationWA/WebConversationStateTest/IoeTests.aspx b/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/Conversation/WebConversationStateTest/IoeTests.aspx similarity index 100% rename from test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/ConversationWA/WebConversationStateTest/IoeTests.aspx rename to test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/Conversation/WebConversationStateTest/IoeTests.aspx diff --git a/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/ConversationWA/WebConversationStateTest/IoeTests.aspx.cs b/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/Conversation/WebConversationStateTest/IoeTests.aspx.cs similarity index 99% rename from test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/ConversationWA/WebConversationStateTest/IoeTests.aspx.cs rename to test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/Conversation/WebConversationStateTest/IoeTests.aspx.cs index f4d9f887..7b43b600 100644 --- a/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/ConversationWA/WebConversationStateTest/IoeTests.aspx.cs +++ b/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/Conversation/WebConversationStateTest/IoeTests.aspx.cs @@ -8,13 +8,13 @@ using System.Web.UI; using System.Web.UI.WebControls; using System.Web.UI.WebControls.WebParts; using System.Web.UI.HtmlControls; -using Spring.ConversationWA; -using Spring.ConversationWA.Impl; +using Spring.Web.Conversation; using System.Text.RegularExpressions; using NHibernate; using Spring.Data.NHibernate.Support; using Common.Logging; using Spring.Objects.Factory; +using Spring.Web.Conversation; public partial class IoeTests : System.Web.UI.Page { diff --git a/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/ConversationWA/WebConversationStateTest/PatialEndConv_A_B_Begin.aspx b/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/Conversation/WebConversationStateTest/PatialEndConv_A_B_Begin.aspx similarity index 100% rename from test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/ConversationWA/WebConversationStateTest/PatialEndConv_A_B_Begin.aspx rename to test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/Conversation/WebConversationStateTest/PatialEndConv_A_B_Begin.aspx diff --git a/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/ConversationWA/WebConversationStateTest/PatialEndConv_A_B_Begin.aspx.cs b/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/Conversation/WebConversationStateTest/PatialEndConv_A_B_Begin.aspx.cs similarity index 91% rename from test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/ConversationWA/WebConversationStateTest/PatialEndConv_A_B_Begin.aspx.cs rename to test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/Conversation/WebConversationStateTest/PatialEndConv_A_B_Begin.aspx.cs index 3f37dff6..9460da36 100644 --- a/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/ConversationWA/WebConversationStateTest/PatialEndConv_A_B_Begin.aspx.cs +++ b/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/Conversation/WebConversationStateTest/PatialEndConv_A_B_Begin.aspx.cs @@ -8,7 +8,7 @@ using System.Web.UI; using System.Web.UI.WebControls; using System.Web.UI.WebControls.WebParts; using System.Web.UI.HtmlControls; -using Spring.ConversationWA; +using Spring.Web.Conversation; public partial class PatialEndConv_A_B_Begin : PatialEndConvBeginBasePage { diff --git a/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/ConversationWA/WebConversationStateTest/PatialEndConv_A_B_End.aspx b/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/Conversation/WebConversationStateTest/PatialEndConv_A_B_End.aspx similarity index 100% rename from test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/ConversationWA/WebConversationStateTest/PatialEndConv_A_B_End.aspx rename to test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/Conversation/WebConversationStateTest/PatialEndConv_A_B_End.aspx diff --git a/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/ConversationWA/WebConversationStateTest/PatialEndConv_A_B_End.aspx.cs b/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/Conversation/WebConversationStateTest/PatialEndConv_A_B_End.aspx.cs similarity index 91% rename from test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/ConversationWA/WebConversationStateTest/PatialEndConv_A_B_End.aspx.cs rename to test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/Conversation/WebConversationStateTest/PatialEndConv_A_B_End.aspx.cs index 4a44c4c6..96029400 100644 --- a/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/ConversationWA/WebConversationStateTest/PatialEndConv_A_B_End.aspx.cs +++ b/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/Conversation/WebConversationStateTest/PatialEndConv_A_B_End.aspx.cs @@ -8,7 +8,7 @@ using System.Web.UI; using System.Web.UI.WebControls; using System.Web.UI.WebControls.WebParts; using System.Web.UI.HtmlControls; -using Spring.ConversationWA; +using Spring.Web.Conversation; public partial class PatialEndConv_A_B_End : PatialEndConvEndBasePage { diff --git a/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/ConversationWA/WebConversationStateTest/PatialEndConv_A_Begin.aspx b/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/Conversation/WebConversationStateTest/PatialEndConv_A_Begin.aspx similarity index 100% rename from test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/ConversationWA/WebConversationStateTest/PatialEndConv_A_Begin.aspx rename to test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/Conversation/WebConversationStateTest/PatialEndConv_A_Begin.aspx diff --git a/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/ConversationWA/WebConversationStateTest/PatialEndConv_A_Begin.aspx.cs b/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/Conversation/WebConversationStateTest/PatialEndConv_A_Begin.aspx.cs similarity index 91% rename from test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/ConversationWA/WebConversationStateTest/PatialEndConv_A_Begin.aspx.cs rename to test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/Conversation/WebConversationStateTest/PatialEndConv_A_Begin.aspx.cs index d4fb8b8f..3c12ab44 100644 --- a/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/ConversationWA/WebConversationStateTest/PatialEndConv_A_Begin.aspx.cs +++ b/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/Conversation/WebConversationStateTest/PatialEndConv_A_Begin.aspx.cs @@ -8,7 +8,7 @@ using System.Web.UI; using System.Web.UI.WebControls; using System.Web.UI.WebControls.WebParts; using System.Web.UI.HtmlControls; -using Spring.ConversationWA; +using Spring.Web.Conversation; public partial class PatialEndConv_A_Begin : PatialEndConvBeginBasePage { diff --git a/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/ConversationWA/WebConversationStateTest/PatialEndConv_A_End.aspx b/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/Conversation/WebConversationStateTest/PatialEndConv_A_End.aspx similarity index 100% rename from test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/ConversationWA/WebConversationStateTest/PatialEndConv_A_End.aspx rename to test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/Conversation/WebConversationStateTest/PatialEndConv_A_End.aspx diff --git a/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/ConversationWA/WebConversationStateTest/PatialEndConv_A_End.aspx.cs b/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/Conversation/WebConversationStateTest/PatialEndConv_A_End.aspx.cs similarity index 91% rename from test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/ConversationWA/WebConversationStateTest/PatialEndConv_A_End.aspx.cs rename to test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/Conversation/WebConversationStateTest/PatialEndConv_A_End.aspx.cs index b3a14a4a..d13ecc5f 100644 --- a/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/ConversationWA/WebConversationStateTest/PatialEndConv_A_End.aspx.cs +++ b/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/Conversation/WebConversationStateTest/PatialEndConv_A_End.aspx.cs @@ -8,7 +8,7 @@ using System.Web.UI; using System.Web.UI.WebControls; using System.Web.UI.WebControls.WebParts; using System.Web.UI.HtmlControls; -using Spring.ConversationWA; +using Spring.Web.Conversation; public partial class PatialEndConv_A_End : PatialEndConvEndBasePage { diff --git a/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/ConversationWA/WebConversationStateTest/RedirectErrorNoPauseConversation.aspx b/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/Conversation/WebConversationStateTest/RedirectErrorNoPauseConversation.aspx similarity index 100% rename from test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/ConversationWA/WebConversationStateTest/RedirectErrorNoPauseConversation.aspx rename to test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/Conversation/WebConversationStateTest/RedirectErrorNoPauseConversation.aspx diff --git a/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/ConversationWA/WebConversationStateTest/RedirectErrorNoPauseConversation.aspx.cs b/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/Conversation/WebConversationStateTest/RedirectErrorNoPauseConversation.aspx.cs similarity index 96% rename from test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/ConversationWA/WebConversationStateTest/RedirectErrorNoPauseConversation.aspx.cs rename to test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/Conversation/WebConversationStateTest/RedirectErrorNoPauseConversation.aspx.cs index c75562b5..45734d8e 100644 --- a/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/ConversationWA/WebConversationStateTest/RedirectErrorNoPauseConversation.aspx.cs +++ b/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/Conversation/WebConversationStateTest/RedirectErrorNoPauseConversation.aspx.cs @@ -8,10 +8,11 @@ using System.Web.UI; using System.Web.UI.WebControls; using System.Web.UI.WebControls.WebParts; using System.Web.UI.HtmlControls; -using Spring.ConversationWA; +using Spring.Web.Conversation; using Spring.Entities; using System.Threading; using NHibernate; +using Spring.Web.Conversation; public partial class RedirectErrorNoPauseConversation : System.Web.UI.Page { diff --git a/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/ConversationWA/WebConversationStateTest/SPCLazyLoadTest_A_Begin.aspx b/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/Conversation/WebConversationStateTest/SPCLazyLoadTest_A_Begin.aspx similarity index 100% rename from test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/ConversationWA/WebConversationStateTest/SPCLazyLoadTest_A_Begin.aspx rename to test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/Conversation/WebConversationStateTest/SPCLazyLoadTest_A_Begin.aspx diff --git a/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/ConversationWA/WebConversationStateTest/SPCLazyLoadTest_A_Begin.aspx.cs b/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/Conversation/WebConversationStateTest/SPCLazyLoadTest_A_Begin.aspx.cs similarity index 95% rename from test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/ConversationWA/WebConversationStateTest/SPCLazyLoadTest_A_Begin.aspx.cs rename to test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/Conversation/WebConversationStateTest/SPCLazyLoadTest_A_Begin.aspx.cs index 6322c478..34d4a3bc 100644 --- a/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/ConversationWA/WebConversationStateTest/SPCLazyLoadTest_A_Begin.aspx.cs +++ b/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/Conversation/WebConversationStateTest/SPCLazyLoadTest_A_Begin.aspx.cs @@ -8,9 +8,10 @@ using System.Web.UI; using System.Web.UI.WebControls; using System.Web.UI.WebControls.WebParts; using System.Web.UI.HtmlControls; -using Spring.ConversationWA; +using Spring.Web.Conversation; using NHibernate; using Spring.Entities; +using Spring.Web.Conversation; public partial class SPCLazyLoadTest_A_Begin : System.Web.UI.Page { diff --git a/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/ConversationWA/WebConversationStateTest/SPCLazyLoadTest_A_Status.aspx b/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/Conversation/WebConversationStateTest/SPCLazyLoadTest_A_Status.aspx similarity index 100% rename from test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/ConversationWA/WebConversationStateTest/SPCLazyLoadTest_A_Status.aspx rename to test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/Conversation/WebConversationStateTest/SPCLazyLoadTest_A_Status.aspx diff --git a/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/ConversationWA/WebConversationStateTest/SPCLazyLoadTest_A_Status.aspx.cs b/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/Conversation/WebConversationStateTest/SPCLazyLoadTest_A_Status.aspx.cs similarity index 96% rename from test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/ConversationWA/WebConversationStateTest/SPCLazyLoadTest_A_Status.aspx.cs rename to test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/Conversation/WebConversationStateTest/SPCLazyLoadTest_A_Status.aspx.cs index a71b4809..cd42af6c 100644 --- a/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/ConversationWA/WebConversationStateTest/SPCLazyLoadTest_A_Status.aspx.cs +++ b/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/Conversation/WebConversationStateTest/SPCLazyLoadTest_A_Status.aspx.cs @@ -8,10 +8,11 @@ using System.Web.UI; using System.Web.UI.WebControls; using System.Web.UI.WebControls.WebParts; using System.Web.UI.HtmlControls; -using Spring.ConversationWA; +using Spring.Web.Conversation; using Spring.Entities; using Common.Logging; using NHibernate; +using Spring.Web.Conversation; public partial class SPCLazyLoadTest_A_Status : System.Web.UI.Page { diff --git a/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/ConversationWA/WebConversationStateTest/SPCSwitchConversationSameRequest.aspx b/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/Conversation/WebConversationStateTest/SPCSwitchConversationSameRequest.aspx similarity index 100% rename from test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/ConversationWA/WebConversationStateTest/SPCSwitchConversationSameRequest.aspx rename to test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/Conversation/WebConversationStateTest/SPCSwitchConversationSameRequest.aspx diff --git a/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/ConversationWA/WebConversationStateTest/SPCSwitchConversationSameRequest.aspx.cs b/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/Conversation/WebConversationStateTest/SPCSwitchConversationSameRequest.aspx.cs similarity index 98% rename from test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/ConversationWA/WebConversationStateTest/SPCSwitchConversationSameRequest.aspx.cs rename to test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/Conversation/WebConversationStateTest/SPCSwitchConversationSameRequest.aspx.cs index cba1168d..4c007b86 100644 --- a/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/ConversationWA/WebConversationStateTest/SPCSwitchConversationSameRequest.aspx.cs +++ b/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/Conversation/WebConversationStateTest/SPCSwitchConversationSameRequest.aspx.cs @@ -8,10 +8,11 @@ using System.Web.UI; using System.Web.UI.WebControls; using System.Web.UI.WebControls.WebParts; using System.Web.UI.HtmlControls; -using Spring.ConversationWA; +using Spring.Web.Conversation; using Spring.Entities; using NHibernate; using Common.Logging; +using Spring.Web.Conversation; public partial class SPCSwitchConversationSameRequest : System.Web.UI.Page { diff --git a/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/ConversationWA/WebConversationStateTest/SerializeConversationTest.aspx b/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/Conversation/WebConversationStateTest/SerializeConversationTest.aspx similarity index 100% rename from test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/ConversationWA/WebConversationStateTest/SerializeConversationTest.aspx rename to test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/Conversation/WebConversationStateTest/SerializeConversationTest.aspx diff --git a/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/ConversationWA/WebConversationStateTest/SerializeConversationTest.aspx.cs b/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/Conversation/WebConversationStateTest/SerializeConversationTest.aspx.cs similarity index 93% rename from test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/ConversationWA/WebConversationStateTest/SerializeConversationTest.aspx.cs rename to test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/Conversation/WebConversationStateTest/SerializeConversationTest.aspx.cs index e8bcc30e..dbf90110 100644 --- a/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/ConversationWA/WebConversationStateTest/SerializeConversationTest.aspx.cs +++ b/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/Conversation/WebConversationStateTest/SerializeConversationTest.aspx.cs @@ -8,7 +8,7 @@ using System.Web.UI; using System.Web.UI.WebControls; using System.Web.UI.WebControls.WebParts; using System.Web.UI.HtmlControls; -using Spring.ConversationWA; +using Spring.Web.Conversation; using Spring.Data.NHibernate.Support; using NHibernate; using Spring.Entities; @@ -22,9 +22,10 @@ using Spring.Context; using System.Collections.Generic; using System.Runtime.Serialization.Formatters.Binary; using System.IO; +using Spring.Web.Conversation; /// -/// Page for . +/// Page for . /// public partial class SerializeConversationTest : System.Web.UI.Page { diff --git a/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/ConversationWA/WebConversationStateTest/SessionIsClosedA.aspx b/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/Conversation/WebConversationStateTest/SessionIsClosedA.aspx similarity index 100% rename from test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/ConversationWA/WebConversationStateTest/SessionIsClosedA.aspx rename to test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/Conversation/WebConversationStateTest/SessionIsClosedA.aspx diff --git a/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/ConversationWA/WebConversationStateTest/SessionIsClosedA.aspx.cs b/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/Conversation/WebConversationStateTest/SessionIsClosedA.aspx.cs similarity index 94% rename from test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/ConversationWA/WebConversationStateTest/SessionIsClosedA.aspx.cs rename to test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/Conversation/WebConversationStateTest/SessionIsClosedA.aspx.cs index e3a2034c..6d15a5b5 100644 --- a/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/ConversationWA/WebConversationStateTest/SessionIsClosedA.aspx.cs +++ b/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/Conversation/WebConversationStateTest/SessionIsClosedA.aspx.cs @@ -8,9 +8,10 @@ using System.Web.UI; using System.Web.UI.WebControls; using System.Web.UI.WebControls.WebParts; using System.Web.UI.HtmlControls; -using Spring.ConversationWA; +using Spring.Web.Conversation; using Spring.Entities; using NHibernate; +using Spring.Web.Conversation; public partial class SessionIsClosedA : System.Web.UI.Page { diff --git a/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/ConversationWA/WebConversationStateTest/SessionIsClosedB.aspx b/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/Conversation/WebConversationStateTest/SessionIsClosedB.aspx similarity index 100% rename from test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/ConversationWA/WebConversationStateTest/SessionIsClosedB.aspx rename to test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/Conversation/WebConversationStateTest/SessionIsClosedB.aspx diff --git a/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/ConversationWA/WebConversationStateTest/SessionIsClosedB.aspx.cs b/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/Conversation/WebConversationStateTest/SessionIsClosedB.aspx.cs similarity index 97% rename from test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/ConversationWA/WebConversationStateTest/SessionIsClosedB.aspx.cs rename to test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/Conversation/WebConversationStateTest/SessionIsClosedB.aspx.cs index 29e9c77c..3aef8424 100644 --- a/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/ConversationWA/WebConversationStateTest/SessionIsClosedB.aspx.cs +++ b/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/Conversation/WebConversationStateTest/SessionIsClosedB.aspx.cs @@ -8,9 +8,10 @@ using System.Web.UI; using System.Web.UI.WebControls; using System.Web.UI.WebControls.WebParts; using System.Web.UI.HtmlControls; -using Spring.ConversationWA; +using Spring.Web.Conversation; using Spring.Entities; using NHibernate; +using Spring.Web.Conversation; public partial class SessionIsClosedB : System.Web.UI.Page { diff --git a/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/ConversationWA/WebConversationStateTest/TimeOut_NoTimeOut.aspx b/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/Conversation/WebConversationStateTest/TimeOut_NoTimeOut.aspx similarity index 100% rename from test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/ConversationWA/WebConversationStateTest/TimeOut_NoTimeOut.aspx rename to test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/Conversation/WebConversationStateTest/TimeOut_NoTimeOut.aspx diff --git a/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/ConversationWA/WebConversationStateTest/TimeOut_NoTimeOut.aspx.cs b/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/Conversation/WebConversationStateTest/TimeOut_NoTimeOut.aspx.cs similarity index 94% rename from test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/ConversationWA/WebConversationStateTest/TimeOut_NoTimeOut.aspx.cs rename to test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/Conversation/WebConversationStateTest/TimeOut_NoTimeOut.aspx.cs index c3df4bcc..69254992 100644 --- a/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/ConversationWA/WebConversationStateTest/TimeOut_NoTimeOut.aspx.cs +++ b/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/Conversation/WebConversationStateTest/TimeOut_NoTimeOut.aspx.cs @@ -8,7 +8,8 @@ using System.Web.UI; using System.Web.UI.WebControls; using System.Web.UI.WebControls.WebParts; using System.Web.UI.HtmlControls; -using Spring.ConversationWA; +using Spring.Web.Conversation; +using Spring.Web.Conversation; public partial class TimeOut_NoTimeOut : System.Web.UI.Page { diff --git a/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/ConversationWA/WebConversationStateTest/TimeOut_WithTimeOut.aspx b/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/Conversation/WebConversationStateTest/TimeOut_WithTimeOut.aspx similarity index 100% rename from test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/ConversationWA/WebConversationStateTest/TimeOut_WithTimeOut.aspx rename to test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/Conversation/WebConversationStateTest/TimeOut_WithTimeOut.aspx diff --git a/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/ConversationWA/WebConversationStateTest/TimeOut_WithTimeOut.aspx.cs b/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/Conversation/WebConversationStateTest/TimeOut_WithTimeOut.aspx.cs similarity index 92% rename from test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/ConversationWA/WebConversationStateTest/TimeOut_WithTimeOut.aspx.cs rename to test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/Conversation/WebConversationStateTest/TimeOut_WithTimeOut.aspx.cs index fd5b7948..b619add2 100644 --- a/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/ConversationWA/WebConversationStateTest/TimeOut_WithTimeOut.aspx.cs +++ b/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/Conversation/WebConversationStateTest/TimeOut_WithTimeOut.aspx.cs @@ -8,7 +8,8 @@ using System.Web.UI; using System.Web.UI.WebControls; using System.Web.UI.WebControls.WebParts; using System.Web.UI.HtmlControls; -using Spring.ConversationWA; +using Spring.Web.Conversation; +using Spring.Web.Conversation; public partial class TimeOut_WithTimeOut : System.Web.UI.Page { diff --git a/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/ConversationWA/WebConversationStateTest/Web.Config b/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/Conversation/WebConversationStateTest/Web.Config similarity index 87% rename from test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/ConversationWA/WebConversationStateTest/Web.Config rename to test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/Conversation/WebConversationStateTest/Web.Config index d4a6028c..a5bcf380 100644 --- a/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/ConversationWA/WebConversationStateTest/Web.Config +++ b/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/Conversation/WebConversationStateTest/Web.Config @@ -48,9 +48,9 @@ - + - + @@ -63,9 +63,9 @@ - + - + diff --git a/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/ConversationWA/WebConversationStateTest/log4net.config b/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/Conversation/WebConversationStateTest/log4net.config similarity index 98% rename from test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/ConversationWA/WebConversationStateTest/log4net.config rename to test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/Conversation/WebConversationStateTest/log4net.config index f1b8bbb6..c683e949 100644 --- a/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/ConversationWA/WebConversationStateTest/log4net.config +++ b/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/Conversation/WebConversationStateTest/log4net.config @@ -61,7 +61,7 @@ - + \ No newline at end of file diff --git a/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/ConversationWA/WebConversationStateTest/services.xml.config b/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/Conversation/WebConversationStateTest/services.xml.config similarity index 79% rename from test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/ConversationWA/WebConversationStateTest/services.xml.config rename to test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/Conversation/WebConversationStateTest/services.xml.config index 66d238b8..3dce57b8 100644 --- a/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/ConversationWA/WebConversationStateTest/services.xml.config +++ b/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/Conversation/WebConversationStateTest/services.xml.config @@ -12,12 +12,12 @@ - + - + @@ -25,7 +25,7 @@ - + @@ -33,7 +33,7 @@ - + @@ -52,7 +52,7 @@ - + @@ -62,10 +62,10 @@ - + - + @@ -74,20 +74,20 @@ - + - + - + - + @@ -97,7 +97,7 @@ - + @@ -110,7 +110,7 @@ - + @@ -147,7 +147,7 @@ - + @@ -160,14 +160,14 @@ - + - + @@ -180,7 +180,7 @@ - + @@ -197,14 +197,14 @@ - + - + @@ -217,15 +217,15 @@ - + - + - + @@ -238,14 +238,14 @@ - + - + @@ -261,21 +261,21 @@ - + - + - + @@ -287,7 +287,7 @@ - + @@ -303,7 +303,7 @@ - + @@ -313,7 +313,7 @@ - + diff --git a/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/ConversationWA/WebConversationStateTest/sqlite/conversationTests.db b/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/Conversation/WebConversationStateTest/sqlite/conversationTests.db similarity index 100% rename from test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/ConversationWA/WebConversationStateTest/sqlite/conversationTests.db rename to test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/Conversation/WebConversationStateTest/sqlite/conversationTests.db diff --git a/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/ConversationWA/WebConversationStateTest/web.config.net-2.0 b/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/Conversation/WebConversationStateTest/web.config.net-2.0 similarity index 87% rename from test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/ConversationWA/WebConversationStateTest/web.config.net-2.0 rename to test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/Conversation/WebConversationStateTest/web.config.net-2.0 index 53340b86..8a5ec4ce 100644 --- a/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/ConversationWA/WebConversationStateTest/web.config.net-2.0 +++ b/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/Conversation/WebConversationStateTest/web.config.net-2.0 @@ -48,9 +48,9 @@ - + - + @@ -63,9 +63,9 @@ - + - + diff --git a/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Entities/SPCDetailEnt.cs b/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Entities/SPCDetailEnt.cs index 0d8c16cf..e9b0204e 100644 --- a/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Entities/SPCDetailEnt.cs +++ b/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Entities/SPCDetailEnt.cs @@ -21,7 +21,7 @@ using System; using System.Collections.Generic; using System.Text; -using Spring.ConversationWA; +using Spring.Web.Conversation; namespace Spring.Entities { diff --git a/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Entities/SPCMasterEnt.cs b/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Entities/SPCMasterEnt.cs index 988d42f1..9e716d20 100644 --- a/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Entities/SPCMasterEnt.cs +++ b/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Entities/SPCMasterEnt.cs @@ -21,7 +21,7 @@ using System; using System.Collections.Generic; using System.Text; -using Spring.ConversationWA; +using Spring.Web.Conversation; namespace Spring.Entities { diff --git a/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Spring.Web.Conversation.NHibernate32.Tests.2008.csproj b/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Spring.Web.Conversation.NHibernate32.Tests.2008.csproj index 760e8a7d..cef0c663 100644 --- a/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Spring.Web.Conversation.NHibernate32.Tests.2008.csproj +++ b/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Spring.Web.Conversation.NHibernate32.Tests.2008.csproj @@ -76,15 +76,15 @@ - + ASPXCodeBehind - + ASPXCodeBehind - - - + + + @@ -116,9 +116,9 @@ - - - + + + @@ -126,7 +126,7 @@ - + @@ -143,7 +143,7 @@ echo "Copying TestWebs to output directory" rd /S /Q "$(TargetDir)Data" xcopy "$(ProjectDir)Data" "$(TargetDir)Data\" /y /s -rd /S /Q "$(TargetDir)Data\Spring\ConversationWA\WebConversationStateTest\Bin" +rd /S /Q "$(TargetDir)Data\Spring\Conversation\WebConversationStateTest\Bin" \ No newline at end of file diff --git a/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Spring.Web.Conversation.NHibernate32.Tests.2010.csproj b/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Spring.Web.Conversation.NHibernate32.Tests.2010.csproj index 75208d59..6172345b 100644 --- a/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Spring.Web.Conversation.NHibernate32.Tests.2010.csproj +++ b/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Spring.Web.Conversation.NHibernate32.Tests.2010.csproj @@ -90,100 +90,100 @@ - + ASPXCodeBehind - + ASPXCodeBehind - - - - + + + + CircularDependenceTest.aspx ASPXCodeBehind - + ConnectionReleaseModeIssue.aspx ASPXCodeBehind - + EndConversationTestBegin.aspx ASPXCodeBehind - + EndConversationTestEnd.aspx ASPXCodeBehind - + EndPausedSessionIsClosedA.aspx ASPXCodeBehind - + EndPausedSessionIsClosedB.aspx ASPXCodeBehind - + EndPausedTest.aspx ASPXCodeBehind - + GetParentObjetFromChild.aspx ASPXCodeBehind - + IoeTests.aspx ASPXCodeBehind - + PatialEndConv_A_Begin.aspx ASPXCodeBehind - + PatialEndConv_A_B_Begin.aspx ASPXCodeBehind - + PatialEndConv_A_B_End.aspx ASPXCodeBehind - + PatialEndConv_A_End.aspx ASPXCodeBehind - + RedirectErrorNoPauseConversation.aspx ASPXCodeBehind - + SerializeConversationTest.aspx ASPXCodeBehind - + SessionIsClosedA.aspx ASPXCodeBehind - + SessionIsClosedB.aspx ASPXCodeBehind - + SPCLazyLoadTest_A_Begin.aspx ASPXCodeBehind - + SPCLazyLoadTest_A_Status.aspx ASPXCodeBehind - + SPCSwitchConversationSameRequest.aspx ASPXCodeBehind - + TimeOut_NoTimeOut.aspx ASPXCodeBehind - + TimeOut_WithTimeOut.aspx ASPXCodeBehind @@ -218,9 +218,9 @@ - - - + + + @@ -228,7 +228,7 @@ - + @@ -256,30 +256,30 @@ - - - - - - - - - + + + + + + + + + Code - - - - - - - - - - - - - + + + + + + + + + + + + + @@ -238,14 +238,14 @@ - + - + @@ -261,21 +261,21 @@ - + - + - + @@ -287,7 +287,7 @@ - + @@ -303,7 +303,7 @@ - + @@ -313,7 +313,7 @@ - + diff --git a/test/Spring/Spring.Web.Conversation.NHibernate33.Tests/Data/Spring/ConversationWA/WebConversationStateTest/web.config.net-2.0 b/test/Spring/Spring.Web.Conversation.NHibernate33.Tests/Data/Spring/Conversation/WebConversationStateTest/web.config.net-2.0 similarity index 87% rename from test/Spring/Spring.Web.Conversation.NHibernate33.Tests/Data/Spring/ConversationWA/WebConversationStateTest/web.config.net-2.0 rename to test/Spring/Spring.Web.Conversation.NHibernate33.Tests/Data/Spring/Conversation/WebConversationStateTest/web.config.net-2.0 index 7fd6e56b..e76ebbf6 100644 --- a/test/Spring/Spring.Web.Conversation.NHibernate33.Tests/Data/Spring/ConversationWA/WebConversationStateTest/web.config.net-2.0 +++ b/test/Spring/Spring.Web.Conversation.NHibernate33.Tests/Data/Spring/Conversation/WebConversationStateTest/web.config.net-2.0 @@ -48,9 +48,9 @@ - + - + @@ -63,9 +63,9 @@ - + - + diff --git a/test/Spring/Spring.Web.Conversation.NHibernate33.Tests/Spring.Web.Conversation.NHibernate33.Tests.2008.csproj b/test/Spring/Spring.Web.Conversation.NHibernate33.Tests/Spring.Web.Conversation.NHibernate33.Tests.2008.csproj index 16e64a2b..b8a46346 100644 --- a/test/Spring/Spring.Web.Conversation.NHibernate33.Tests/Spring.Web.Conversation.NHibernate33.Tests.2008.csproj +++ b/test/Spring/Spring.Web.Conversation.NHibernate33.Tests/Spring.Web.Conversation.NHibernate33.Tests.2008.csproj @@ -89,19 +89,19 @@ Bsn\NoDeferedErrorBsnImpl.cs - - ConversationWA\PatialEndConvBeginBasePage.cs + + Conversation\PatialEndConvBeginBasePage.cs ASPXCodeBehind - - ConversationWA\PatialEndConvEndBasePage.cs + + Conversation\PatialEndConvEndBasePage.cs ASPXCodeBehind - - ConversationWA\SerializeConversationTestModule.cs + + Conversation\SerializeConversationTestModule.cs - - ConversationWA\WebConversationStateTest.cs + + Conversation\WebConversationStateTest.cs Entities\SPCDetailEnt.cs @@ -140,19 +140,19 @@ - - + + - - Data\Spring\ConversationWA\WebConversationStateTest\log4net.config + + Data\Spring\Conversation\WebConversationStateTest\log4net.config - + @@ -170,7 +170,7 @@ rd /S /Q "$(TargetDir)Data" xcopy "$(ProjectDir)..\Spring.Web.Conversation.NHibernate32.Tests\Data" "$(TargetDir)Data\" /y /s xcopy "$(ProjectDir)Data" "$(TargetDir)Data\" /y /s -rd /S /Q "$(TargetDir)Data\Spring\ConversationWA\WebConversationStateTest\Bin" +rd /S /Q "$(TargetDir)Data\Spring\Conversation\WebConversationStateTest\Bin" \ No newline at end of file diff --git a/test/Spring/Spring.Web.Conversation.NHibernate33.Tests/Spring.Web.Conversation.NHibernate33.Tests.2010.csproj b/test/Spring/Spring.Web.Conversation.NHibernate33.Tests/Spring.Web.Conversation.NHibernate33.Tests.2010.csproj index da5c0a6f..760580ae 100644 --- a/test/Spring/Spring.Web.Conversation.NHibernate33.Tests/Spring.Web.Conversation.NHibernate33.Tests.2010.csproj +++ b/test/Spring/Spring.Web.Conversation.NHibernate33.Tests/Spring.Web.Conversation.NHibernate33.Tests.2010.csproj @@ -99,16 +99,22 @@ Bsn\NoDeferedErrorBsnImpl.cs - - ConversationWA\PatialEndConvBeginBasePage.cs + + Conversation\PatialEndConvBeginBasePage.cs ASPXCodeBehind - - ConversationWA\PatialEndConvEndBasePage.cs + + Conversation\PatialEndConvEndBasePage.cs ASPXCodeBehind - - ConversationWA\WebConversationStateTest.cs + + Conversation\SerializeConversationTestModule.cs + + + Conversation\SimpleTest.cs + + + Conversation\WebConversationStateTest.cs Entities\SPCDetailEnt.cs @@ -147,20 +153,20 @@ - - - + + + - - Data\Spring\ConversationWA\WebConversationStateTest\log4net.config + + Data\Spring\Conversation\WebConversationStateTest\log4net.config - + @@ -200,7 +206,7 @@ rd /S /Q "$(TargetDir)Data" xcopy "$(ProjectDir)..\Spring.Web.Conversation.NHibernate32.Tests\Data" "$(TargetDir)Data\" /y /s xcopy "$(ProjectDir)Data" "$(TargetDir)Data\" /y /s -rd /S /Q "$(TargetDir)Data\Spring\ConversationWA\WebConversationStateTest\Bin" +rd /S /Q "$(TargetDir)Data\Spring\Conversation\WebConversationStateTest\Bin" \ No newline at end of file