Commit 3610ce8

@@ -5,7 +5,7 @@ using Gorilla.Commons.Infrastructure.Logging;
 using Gorilla.Commons.Utility.Core;
 using Gorilla.Commons.Utility.Extensions;
 
-namespace MoMoney.Infrastructure.transactions2
+namespace Gorilla.Commons.Infrastructure.Transactions
 {
     public class ChangeTracker<T> : IChangeTracker<T> where T : IIdentifiable<Guid>
     {

@@ -2,7 +2,7 @@ using System;
 using Gorilla.Commons.Infrastructure.Container;
 using Gorilla.Commons.Utility.Core;
 
-namespace MoMoney.Infrastructure.transactions2
+namespace Gorilla.Commons.Infrastructure.Transactions
 {
     public class ChangeTrackerFactory : IChangeTrackerFactory
     {

@@ -3,7 +3,7 @@ using developwithpassion.bdd.contexts;
 using Gorilla.Commons.Testing;
 using Gorilla.Commons.Utility.Core;
 
-namespace MoMoney.Infrastructure.transactions2
+namespace Gorilla.Commons.Infrastructure.Transactions
 {
     public class ChangeTrackerFactorySpecs
     {

@@ -3,7 +3,7 @@ using developwithpassion.bdd.contexts;
 using Gorilla.Commons.Testing;
 using Gorilla.Commons.Utility.Core;
 
-namespace MoMoney.Infrastructure.transactions2
+namespace Gorilla.Commons.Infrastructure.Transactions
 {
     public class ChangeTrackerSpecs
     {

@@ -1,6 +1,6 @@
 using System.Collections;
 
-namespace MoMoney.Infrastructure.transactions2
+namespace Gorilla.Commons.Infrastructure.Transactions
 {
     public interface IContext
     {

@@ -1,4 +1,4 @@
-namespace MoMoney.Infrastructure.transactions2
+namespace Gorilla.Commons.Infrastructure.Transactions
 {
     public class EmptyUnitOfWork : IUnitOfWork
     {

@@ -1,7 +1,7 @@
 using System;
 using Gorilla.Commons.Utility.Core;
 
-namespace MoMoney.Infrastructure.transactions2
+namespace Gorilla.Commons.Infrastructure.Transactions
 {
     public interface IChangeTracker : IDisposable
     {

@@ -1,7 +1,7 @@
 using System;
 using Gorilla.Commons.Utility.Core;
 
-namespace MoMoney.Infrastructure.transactions2
+namespace Gorilla.Commons.Infrastructure.Transactions
 {
     public interface IChangeTrackerFactory
     {

@@ -2,7 +2,7 @@ using System;
 using System.Collections.Generic;
 using Gorilla.Commons.Utility.Core;
 
-namespace MoMoney.Infrastructure.transactions2
+namespace Gorilla.Commons.Infrastructure.Transactions
 {
     public interface IDatabase
     {

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace MoMoney.Infrastructure.transactions2
+namespace Gorilla.Commons.Infrastructure.Transactions
 {
     public interface IDatabaseConnection : IDisposable
     {

@@ -2,7 +2,7 @@ using System;
 using System.Collections.Generic;
 using Gorilla.Commons.Utility.Core;
 
-namespace MoMoney.Infrastructure.transactions2
+namespace Gorilla.Commons.Infrastructure.Transactions
 {
     public class IdentityMapProxy<Key, Value> : IIdentityMap<Key, Value> where Value : IIdentifiable<Guid>
     {

@@ -1,7 +1,7 @@
 using developwithpassion.bdd.contexts;
 using Gorilla.Commons.Testing;
 
-namespace MoMoney.Infrastructure.transactions2
+namespace Gorilla.Commons.Infrastructure.Transactions
 {
     [Concern(typeof (IdentityMap<,>))]
     public class behaves_like_identity_map : concerns_for<IIdentityMap<int, string>, IdentityMap<int, string>>

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace MoMoney.Infrastructure.transactions2
+namespace Gorilla.Commons.Infrastructure.Transactions
 {
     public interface IIdentityMap<TKey, TValue>
     {

@@ -1,4 +1,4 @@
-namespace MoMoney.Infrastructure.transactions2
+namespace Gorilla.Commons.Infrastructure.Transactions
 {
     public interface IStatement
     {

@@ -1,7 +1,7 @@
 using System;
 using Gorilla.Commons.Utility.Core;
 
-namespace MoMoney.Infrastructure.transactions2
+namespace Gorilla.Commons.Infrastructure.Transactions
 {
     public interface IStatementRegistry
     {

@@ -4,7 +4,7 @@ using System.Linq;
 using Gorilla.Commons.Utility.Core;
 using Gorilla.Commons.Utility.Extensions;
 
-namespace MoMoney.Infrastructure.transactions2
+namespace Gorilla.Commons.Infrastructure.Transactions
 {
     public interface ISession : IDisposable
     {

@@ -1,6 +1,6 @@
 using Gorilla.Commons.Utility.Core;
 
-namespace MoMoney.Infrastructure.transactions2
+namespace Gorilla.Commons.Infrastructure.Transactions
 {
     public interface ISessionFactory : IFactory<ISession>
     {

@@ -1,7 +1,7 @@
 using developwithpassion.bdd.contexts;
 using Gorilla.Commons.Testing;
 
-namespace MoMoney.Infrastructure.transactions2
+namespace Gorilla.Commons.Infrastructure.Transactions
 {
     public class SessionFactorySpecs
     {

@@ -1,6 +1,6 @@
 using System;
 
-namespace MoMoney.Infrastructure.transactions2
+namespace Gorilla.Commons.Infrastructure.Transactions
 {
     public class SessionNotStartedException : Exception
     {

@@ -1,4 +1,4 @@
-namespace MoMoney.Infrastructure.transactions2
+namespace Gorilla.Commons.Infrastructure.Transactions
 {
     public interface ISessionProvider
     {

@@ -4,7 +4,7 @@ using developwithpassion.bdd.contexts;
 using Gorilla.Commons.Testing;
 using Gorilla.Commons.Utility.Core;
 
-namespace MoMoney.Infrastructure.transactions2
+namespace Gorilla.Commons.Infrastructure.Transactions
 {
     public class SessionSpecs
     {

@@ -2,7 +2,7 @@ using System;
 using Gorilla.Commons.Infrastructure.Logging;
 using Gorilla.Commons.Utility.Core;
 
-namespace MoMoney.Infrastructure.transactions2
+namespace Gorilla.Commons.Infrastructure.Transactions
 {
     public class StatementRegistry : IStatementRegistry
     {

@@ -1,7 +1,7 @@
 using System.Reflection;
 using Gorilla.Commons.Infrastructure.Logging;
 
-namespace MoMoney.Infrastructure.transactions2
+namespace Gorilla.Commons.Infrastructure.Transactions
 {
     public interface ITrackerEntry<T>
     {

@@ -1,7 +1,7 @@
 using Gorilla.Commons.Infrastructure.Cloning;
 using Gorilla.Commons.Utility.Core;
 
-namespace MoMoney.Infrastructure.transactions2
+namespace Gorilla.Commons.Infrastructure.Transactions
 {
     public interface ITrackerEntryMapper<T> : IMapper<T, ITrackerEntry<T>>
     {

@@ -4,7 +4,7 @@ using Gorilla.Commons.Testing;
 using Gorilla.Commons.Utility.Core;
 using Gorilla.Commons.Utility.Extensions;
 
-namespace MoMoney.Infrastructure.transactions2
+namespace Gorilla.Commons.Infrastructure.Transactions
 {
     public class TrackerEntrySpecs
     {

@@ -4,7 +4,7 @@ using System.Linq;
 using Gorilla.Commons.Utility.Core;
 using Gorilla.Commons.Utility.Extensions;
 
-namespace MoMoney.Infrastructure.transactions2
+namespace Gorilla.Commons.Infrastructure.Transactions
 {
     public interface ITransaction
     {

@@ -3,7 +3,7 @@ using developwithpassion.bdd.contexts;
 using Gorilla.Commons.Testing;
 using Gorilla.Commons.Utility.Core;
 
-namespace MoMoney.Infrastructure.transactions2
+namespace Gorilla.Commons.Infrastructure.Transactions
 {
     public class TransactionSpecs
     {
@@ -34,7 +34,7 @@ namespace MoMoney.Infrastructure.transactions2
 
     public class when_committing_a_transaction_and_an_item_in_the_identity_map_has_changed : behaves_like_transaction
     {
-        it should_commit_the_changes_to_that_item = () => tracker.was_told_to(x => x.commit_to(database));
+        it should_commit_the_changes_to_that_item = () => tracker.was_told_to<IChangeTracker<IMovie>>(x => x.commit_to(database));
 
         context c = () =>
                         {

@@ -1,6 +1,6 @@
 using System.Collections;
 
-namespace MoMoney.Infrastructure.transactions2
+namespace Gorilla.Commons.Infrastructure.Transactions
 {
     public interface IKey<T>
     {

@@ -1,6 +1,6 @@
 using System;
 
-namespace MoMoney.Infrastructure.transactions2
+namespace Gorilla.Commons.Infrastructure.Transactions
 {
     public interface IUnitOfWork : IDisposable
     {

@@ -1,6 +1,6 @@
 using Gorilla.Commons.Utility.Core;
 
-namespace MoMoney.Infrastructure.transactions2
+namespace Gorilla.Commons.Infrastructure.Transactions
 {
     public interface IUnitOfWorkFactory : IFactory<IUnitOfWork>
     {

@@ -109,6 +109,36 @@
     <Compile Include="Threading\WorkerThread.cs">
       <SubType>Component</SubType>
     </Compile>
+    <Compile Include="Transactions\ChangeTracker.cs" />
+    <Compile Include="Transactions\ChangeTrackerFactory.cs" />
+    <Compile Include="Transactions\ChangeTrackerFactorySpecs.cs" />
+    <Compile Include="Transactions\ChangeTrackerSpecs.cs" />
+    <Compile Include="Transactions\Context.cs" />
+    <Compile Include="Transactions\EmptyUnitOfWork.cs" />
+    <Compile Include="Transactions\IChangeTracker.cs" />
+    <Compile Include="Transactions\IChangeTrackerFactory.cs" />
+    <Compile Include="Transactions\IDatabase.cs" />
+    <Compile Include="Transactions\IDatabaseConnection.cs" />
+    <Compile Include="Transactions\IdentityMapProxy.cs" />
+    <Compile Include="Transactions\IdentityMapSpecs.cs" />
+    <Compile Include="Transactions\IIdentityMap.cs" />
+    <Compile Include="Transactions\IStatement.cs" />
+    <Compile Include="Transactions\IStatementRegistry.cs" />
+    <Compile Include="Transactions\Session.cs" />
+    <Compile Include="Transactions\SessionFactory.cs" />
+    <Compile Include="Transactions\SessionFactorySpecs.cs" />
+    <Compile Include="Transactions\SessionNotStartedException.cs" />
+    <Compile Include="Transactions\SessionProvider.cs" />
+    <Compile Include="Transactions\SessionSpecs.cs" />
+    <Compile Include="Transactions\StatementRegistry.cs" />
+    <Compile Include="Transactions\TrackerEntry.cs" />
+    <Compile Include="Transactions\TrackerEntryMapper.cs" />
+    <Compile Include="Transactions\TrackerEntrySpecs.cs" />
+    <Compile Include="Transactions\Transaction.cs" />
+    <Compile Include="Transactions\TransactionSpecs.cs" />
+    <Compile Include="Transactions\TypedKey.cs" />
+    <Compile Include="Transactions\UnitOfWork.cs" />
+    <Compile Include="Transactions\UnitOfWorkFactory.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Gorilla.Commons.Testing\Gorilla.Commons.Testing.csproj">

@@ -1,7 +1,7 @@
 using Db4objects.Db4o;
 using Db4objects.Db4o.Config;
 using Gorilla.Commons.Infrastructure.FileSystem;
-using MoMoney.Infrastructure.transactions2;
+using Gorilla.Commons.Infrastructure.Transactions;
 
 namespace MoMoney.DataAccess.Db40
 {

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using Db4objects.Db4o;
-using MoMoney.Infrastructure.transactions2;
+using Gorilla.Commons.Infrastructure.Transactions;
 
 namespace MoMoney.DataAccess.Db40
 {

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
+using Gorilla.Commons.Infrastructure.Transactions;
 using MoMoney.Domain.accounting;
 using MoMoney.Domain.repositories;
-using MoMoney.Infrastructure.transactions2;
 
 namespace MoMoney.DataAccess.repositories
 {

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
+using Gorilla.Commons.Infrastructure.Transactions;
 using MoMoney.Domain.accounting.billing;
 using MoMoney.Domain.repositories;
-using MoMoney.Infrastructure.transactions2;
 
 namespace MoMoney.DataAccess.repositories
 {

@@ -1,10 +1,10 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Gorilla.Commons.Infrastructure.Transactions;
 using Gorilla.Commons.Utility.Extensions;
 using MoMoney.Domain.accounting.billing;
 using MoMoney.Domain.repositories;
-using MoMoney.Infrastructure.transactions2;
 
 namespace MoMoney.DataAccess.repositories
 {

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
+using Gorilla.Commons.Infrastructure.Transactions;
 using MoMoney.Domain.accounting.financial_growth;
 using MoMoney.Domain.repositories;
-using MoMoney.Infrastructure.transactions2;
 
 namespace MoMoney.DataAccess.repositories
 {

@@ -1,5 +1,5 @@
 using Gorilla.Commons.Infrastructure.FileSystem;
-using MoMoney.Infrastructure.transactions2;
+using Gorilla.Commons.Infrastructure.Transactions;
 
 namespace MoMoney.DataAccess
 {

@@ -3,9 +3,9 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using Gorilla.Commons.Infrastructure.FileSystem;
+using Gorilla.Commons.Infrastructure.Transactions;
 using Gorilla.Commons.Utility.Core;
 using MoMoney.Domain.Core;
-using MoMoney.Infrastructure.transactions2;
 
 namespace MoMoney.DataAccess
 {

@@ -3,7 +3,7 @@ using Gorilla.Commons.Infrastructure.Threading;
 using Gorilla.Commons.Utility.Core;
 using MoMoney.Infrastructure.interceptors;
 
-namespace MoMoney.Infrastructure.Threading
+namespace MoMoney.Infrastructure.Interceptors
 {
     public class RunOnUIThread : IInterceptor
     {

@@ -1,34 +0,0 @@
-using Castle.Core.Interceptor;
-using Gorilla.Commons.Infrastructure.Eventing;
-using Gorilla.Commons.Infrastructure.Logging;
-using Gorilla.Commons.Utility.Core;
-
-namespace MoMoney.Infrastructure.transactions2
-{
-    public interface IUnitOfWorkInterceptor : IInterceptor
-    {
-    }
-
-    public class UnitOfWorkInterceptor : IUnitOfWorkInterceptor
-    {
-        readonly IEventAggregator broker;
-        readonly IUnitOfWorkFactory factory;
-
-        public UnitOfWorkInterceptor(IEventAggregator broker, IUnitOfWorkFactory factory)
-        {
-            this.broker = broker;
-            this.factory = factory;
-        }
-
-        public void Intercept(IInvocation invocation)
-        {
-            using (var unit_of_work = factory.create())
-            {
-                this.log().debug("intercepting: {0}", invocation);
-                invocation.Proceed();
-                broker.publish<ICallback<IUnitOfWork>>(x => x.run(unit_of_work));
-                unit_of_work.commit();
-            }
-        }
-    }
-}
\ No newline at end of file

@@ -132,38 +132,8 @@
     <Compile Include="Proxies\ProxyFactorySpecs.cs" />
     <Compile Include="Threading\Juval\Synchronizer.cs" />
     <Compile Include="Threading\Juval\WorkItem.cs" />
-    <Compile Include="Threading\RunOnUIThread.cs" />
-    <Compile Include="Transactions2\ChangeTracker.cs" />
-    <Compile Include="Transactions2\ChangeTrackerFactory.cs" />
-    <Compile Include="Transactions2\ChangeTrackerFactorySpecs.cs" />
-    <Compile Include="Transactions2\ChangeTrackerSpecs.cs" />
-    <Compile Include="Transactions2\Context.cs" />
-    <Compile Include="Transactions2\EmptyUnitOfWork.cs" />
-    <Compile Include="Transactions2\IChangeTracker.cs" />
-    <Compile Include="Transactions2\IChangeTrackerFactory.cs" />
-    <Compile Include="Transactions2\IDatabase.cs" />
-    <Compile Include="Transactions2\IDatabaseConnection.cs" />
-    <Compile Include="Transactions2\IdentityMapProxy.cs" />
-    <Compile Include="Transactions2\IdentityMapSpecs.cs" />
-    <Compile Include="Transactions2\IIdentityMap.cs" />
-    <Compile Include="Transactions2\IStatement.cs" />
-    <Compile Include="Transactions2\IStatementRegistry.cs" />
-    <Compile Include="Transactions2\Session.cs" />
-    <Compile Include="Transactions2\SessionFactory.cs" />
-    <Compile Include="Transactions2\SessionFactorySpecs.cs" />
-    <Compile Include="Transactions2\SessionNotStartedException.cs" />
-    <Compile Include="Transactions2\SessionProvider.cs" />
-    <Compile Include="Transactions2\SessionSpecs.cs" />
-    <Compile Include="Transactions2\StatementRegistry.cs" />
-    <Compile Include="Transactions2\TrackerEntry.cs" />
-    <Compile Include="Transactions2\TrackerEntryMapper.cs" />
-    <Compile Include="Transactions2\TrackerEntrySpecs.cs" />
-    <Compile Include="Transactions2\Transaction.cs" />
-    <Compile Include="Transactions2\TransactionSpecs.cs" />
-    <Compile Include="Transactions2\TypedKey.cs" />
-    <Compile Include="Transactions2\UnitOfWork.cs" />
-    <Compile Include="Transactions2\UnitOfWorkFactory.cs" />
-    <Compile Include="Transactions2\UnitOfWorkInterceptor.cs" />
+    <Compile Include="Interceptors\RunOnUIThread.cs" />
+    <Compile Include="Interceptors\UnitOfWorkInterceptor.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Gorilla.Commons.Infrastructure\Gorilla.Commons.Infrastructure.csproj">

@@ -1,10 +1,10 @@
 using Gorilla.Commons.Infrastructure.Eventing;
 using Gorilla.Commons.Infrastructure.FileSystem;
 using Gorilla.Commons.Infrastructure.Logging;
+using Gorilla.Commons.Infrastructure.Transactions;
 using Gorilla.Commons.Utility.Core;
 using Gorilla.Commons.Utility.Extensions;
 using MoMoney.DataAccess;
-using MoMoney.Infrastructure.transactions2;
 using MoMoney.Presentation.Model.messages;
 
 namespace MoMoney.Presentation.Model.Projects

@@ -2,10 +2,10 @@ using System;
 using developwithpassion.bdd.contexts;
 using Gorilla.Commons.Infrastructure.Eventing;
 using Gorilla.Commons.Infrastructure.FileSystem;
+using Gorilla.Commons.Infrastructure.Transactions;
 using Gorilla.Commons.Testing;
 using Gorilla.Commons.Utility.Extensions;
 using MoMoney.DataAccess;
-using MoMoney.Infrastructure.transactions2;
 using MoMoney.Presentation.Model.messages;
 
 namespace MoMoney.Presentation.Model.Projects

@@ -1,6 +1,6 @@
 using Gorilla.Commons.Utility.Core;
+using MoMoney.Infrastructure.Interceptors;
 using MoMoney.Infrastructure.proxies;
-using MoMoney.Infrastructure.Threading;
 
 namespace MoMoney.boot.container.registration.proxy_configuration
 {

@@ -1,6 +1,6 @@
 using Gorilla.Commons.Utility.Core;
+using MoMoney.Infrastructure.Interceptors;
 using MoMoney.Infrastructure.proxies;
-using MoMoney.Infrastructure.Threading;
 
 namespace MoMoney.boot.container.registration
 {

@@ -1,9 +1,9 @@
 using Gorilla.Commons.Infrastructure.Container;
+using Gorilla.Commons.Infrastructure.Transactions;
 using Gorilla.Commons.Utility.Core;
 using Gorilla.Commons.Utility.Extensions;
 using MoMoney.DataAccess;
 using MoMoney.Infrastructure.Container;
-using MoMoney.Infrastructure.transactions2;
 
 namespace MoMoney.boot.container.registration
 {

@@ -1,10 +1,10 @@
 using Gorilla.Commons.Infrastructure.Eventing;
 using Gorilla.Commons.Infrastructure.Registries;
 using Gorilla.Commons.Infrastructure.Threading;
+using Gorilla.Commons.Infrastructure.Transactions;
 using Gorilla.Commons.Utility.Core;
 using MoMoney.Infrastructure.Container;
 //using MoMoney.Infrastructure.transactions;
-using MoMoney.Infrastructure.transactions2;
 using MoMoney.Presentation.Model.Projects;
 
 namespace MoMoney.boot.container.registration

@@ -3,8 +3,8 @@ using MoMoney.Domain.accounting.billing;
 using MoMoney.Domain.repositories;
 using MoMoney.Infrastructure.Container;
 using MoMoney.Infrastructure.interceptors;
+using MoMoney.Infrastructure.Interceptors;
 using MoMoney.Infrastructure.proxies;
-using MoMoney.Infrastructure.transactions2;
 using MoMoney.Tasks.application;
 
 namespace MoMoney.boot.container.registration