From bfb5f3758d77fd722b4e08777ec069ea56b53a18 Mon Sep 17 00:00:00 2001
From: lahma <marko.lahma@gmail.com>
Date: Tue, 15 Dec 2009 09:18:42 +0000
Subject: [PATCH] NH12: Make LocalSessionFactoryObject's ApplicationContext
 getter protected to allow easier BytecodeProvider integration with
 inheritance NH12: Small fix to resource loader selection Fix
 Spring.Messaging.2005 project file

---
 .../Data/NHibernate/LocalSessionFactoryObject.cs               | 3 ++-
 src/Spring/Spring.Messaging/Spring.Messaging.2005.csproj       | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/Spring/Spring.Data.NHibernate12/Data/NHibernate/LocalSessionFactoryObject.cs b/src/Spring/Spring.Data.NHibernate12/Data/NHibernate/LocalSessionFactoryObject.cs
index 4f68daab..77585bd5 100644
--- a/src/Spring/Spring.Data.NHibernate12/Data/NHibernate/LocalSessionFactoryObject.cs
+++ b/src/Spring/Spring.Data.NHibernate12/Data/NHibernate/LocalSessionFactoryObject.cs
@@ -127,6 +127,7 @@ namespace Spring.Data.NHibernate
 		public IApplicationContext ApplicationContext
 		{
 			set { this.applicationContext = value; }
+            protected get { return this.applicationContext; }
 		}
 
 		/// <summary>
@@ -368,7 +369,7 @@ namespace Spring.Data.NHibernate
 
                 foreach (string resourceName in mappingResources)
                 {
-                    config.AddInputStream(resourceLoader.GetResource(resourceName).InputStream);
+                    config.AddInputStream(loader.GetResource(resourceName).InputStream);
                 }
             }
 
diff --git a/src/Spring/Spring.Messaging/Spring.Messaging.2005.csproj b/src/Spring/Spring.Messaging/Spring.Messaging.2005.csproj
index f9b60d1f..99aa9c9a 100644
--- a/src/Spring/Spring.Messaging/Spring.Messaging.2005.csproj
+++ b/src/Spring/Spring.Messaging/Spring.Messaging.2005.csproj
@@ -50,6 +50,7 @@
     <Compile Include="Messaging\Core\MessageQueueGatewaySupport.cs" />
     <Compile Include="Messaging\Core\MessageQueueMetadata.cs" />
     <Compile Include="Messaging\Core\MessageQueueMetadataCache.cs" />
+    <Compile Include="Messaging\Core\QueueUtils.cs" />
     <Compile Include="Messaging\Listener\AbstractSendToQueueExceptionHandler.cs" />
     <Compile Include="Messaging\Listener\AbstractTransactionalMessageListenerContainer.cs" />
     <Compile Include="Messaging\Listener\DistributedTxMessageListenerContainer.cs" />
@@ -81,7 +82,6 @@
     <Compile Include="Messaging\Support\Converters\XmlMessageConverter.cs" />
     <Compile Include="Messaging\Support\MessageQueueCreatorDelegate.cs" />
     <Compile Include="Messaging\Support\MessageQueueFactoryObject.cs" />
-    <Compile Include="Messaging\Support\QueueUtils.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Spring.Core\Spring.Core.2005.csproj">