diff --git a/Spring.build b/Spring.build index ccd409f2..43f099c5 100644 --- a/Spring.build +++ b/Spring.build @@ -780,6 +780,8 @@ Commandline Examples: + + @@ -1614,6 +1616,7 @@ Commandline Examples: + diff --git a/examples/Spring/Spring.NmsQuickStart/src/Spring/Spring.NmsQuickStart.Client/Config/Messaging.xml b/examples/Spring/Spring.NmsQuickStart/src/Spring/Spring.NmsQuickStart.Client/Config/Messaging.xml index f3b9dcda..193882bf 100644 --- a/examples/Spring/Spring.NmsQuickStart/src/Spring/Spring.NmsQuickStart.Client/Config/Messaging.xml +++ b/examples/Spring/Spring.NmsQuickStart/src/Spring/Spring.NmsQuickStart.Client/Config/Messaging.xml @@ -3,10 +3,15 @@ xmlns:nms="http://www.springframework.net/nms"> - - - + + + + + + + + diff --git a/examples/Spring/Spring.NmsQuickStart/src/Spring/Spring.NmsQuickStart.Server/Config/Messaging.xml b/examples/Spring/Spring.NmsQuickStart/src/Spring/Spring.NmsQuickStart.Server/Config/Messaging.xml index 0b3efe39..373559af 100644 --- a/examples/Spring/Spring.NmsQuickStart/src/Spring/Spring.NmsQuickStart.Server/Config/Messaging.xml +++ b/examples/Spring/Spring.NmsQuickStart/src/Spring/Spring.NmsQuickStart.Server/Config/Messaging.xml @@ -2,8 +2,13 @@ - - + + + + + + + diff --git a/lib/Net/2.0/Apache.NMS.ActiveMQ.dll b/lib/Net/2.0/Apache.NMS.ActiveMQ.dll index 2617b34f..466cab50 100644 Binary files a/lib/Net/2.0/Apache.NMS.ActiveMQ.dll and b/lib/Net/2.0/Apache.NMS.ActiveMQ.dll differ diff --git a/lib/Net/2.0/Apache.NMS.ActiveMQ.pdb b/lib/Net/2.0/Apache.NMS.ActiveMQ.pdb index decbb448..0d806019 100644 Binary files a/lib/Net/2.0/Apache.NMS.ActiveMQ.pdb and b/lib/Net/2.0/Apache.NMS.ActiveMQ.pdb differ diff --git a/lib/Net/2.0/Apache.NMS.dll b/lib/Net/2.0/Apache.NMS.dll index b1c5e174..6296874f 100644 Binary files a/lib/Net/2.0/Apache.NMS.dll and b/lib/Net/2.0/Apache.NMS.dll differ diff --git a/lib/Net/2.0/Apache.NMS.pdb b/lib/Net/2.0/Apache.NMS.pdb index 4bbe3cf9..875745b4 100644 Binary files a/lib/Net/2.0/Apache.NMS.pdb and b/lib/Net/2.0/Apache.NMS.pdb differ diff --git a/src/Spring/Spring.Core/Spring.Core.2003.csproj b/src/Spring/Spring.Core/Spring.Core.2003.csproj index 03ebab20..19a35adc 100644 --- a/src/Spring/Spring.Core/Spring.Core.2003.csproj +++ b/src/Spring/Spring.Core/Spring.Core.2003.csproj @@ -17,7 +17,7 @@ DelaySign = "false" OutputType = "Library" PreBuildEvent = "rem $(ProjectDir)..\..\..\tools\antlr-2.7.6\antlr-2.7.6.exe -o $(ProjectDir)\Expressions\Parser $(ProjectDir)\Expressions\Expression.g" - PostBuildEvent = "" + PostBuildEvent = "rem" RootNamespace = "Spring" RunPostBuildEvent = "OnBuildSuccess" StartupObject = "" @@ -34,7 +34,7 @@ FileAlignment = "4096" IncrementalBuild = "false" NoStdLib = "false" - NoWarn = "219, 162, 675,1591" + NoWarn = "219, 162, 675,1591,618" Optimize = "false" OutputPath = "..\..\..\build\VS.Net.2003\Spring.Core\Debug-1.1\" RegisterForComInterop = "false" diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Connections/CachedMessageProducer.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Connections/CachedMessageProducer.cs index e398fde3..8089eaf8 100644 --- a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Connections/CachedMessageProducer.cs +++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Connections/CachedMessageProducer.cs @@ -178,6 +178,15 @@ namespace Spring.Messaging.Nms.Connections { return target.CreateBytesMessage(body); } + + /// + /// Creates the stream message. + /// + /// A new stream message. + public IStreamMessage CreateStreamMessage() + { + return target.CreateStreamMessage(); + } #endregion /// diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Connections/CachedSession.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Connections/CachedSession.cs index f0912d67..22ae9bb2 100644 --- a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Connections/CachedSession.cs +++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Connections/CachedSession.cs @@ -506,6 +506,16 @@ namespace Spring.Messaging.Nms.Connections return target.CreateBytesMessage(body); } + /// + /// Creates the stream message. + /// + /// + public IStreamMessage CreateStreamMessage() + { + this.transactionOpen = true; + return target.CreateStreamMessage(); + } + /// /// Commits this instance. /// @@ -568,6 +578,29 @@ namespace Spring.Messaging.Nms.Connections this.transactionOpen = true; target.Dispose(); } + + /// + /// Creates the queue browser with a specified selector + /// + /// The queue. + /// The selector. + /// The Queue browser + public IQueueBrowser CreateBrowser(IQueue queue, string selector) + { + this.transactionOpen = true; + return target.CreateBrowser(queue, selector); + } + + /// + /// Creates the queue browser. + /// + /// The queue. + /// The Queue browser + public IQueueBrowser CreateBrowser(IQueue queue) + { + this.transactionOpen = true; + return target.CreateBrowser(queue); + } #endregion /// diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Connections/SingleConnectionFactory.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Connections/SingleConnectionFactory.cs index 69ee6caa..b79d54c4 100644 --- a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Connections/SingleConnectionFactory.cs +++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Connections/SingleConnectionFactory.cs @@ -199,6 +199,25 @@ namespace Spring.Messaging.Nms.Connections set { reconnectOnException = value; } } + /// + /// Get/or set the broker Uri. + /// + public Uri BrokerUri + { + get { return targetConnectionFactory.BrokerUri; } + set { targetConnectionFactory.BrokerUri = value; } + } + + /// + /// Get/or set the redelivery policy that new IConnection objects are + /// assigned upon creation. + /// + public IRedeliveryPolicy RedeliveryPolicy + { + get { return targetConnectionFactory.RedeliveryPolicy; } + set { targetConnectionFactory.RedeliveryPolicy = value; } + } + /// /// Gets the connection monitor. /// @@ -511,6 +530,30 @@ namespace Spring.Messaging.Nms.Connections } } + public event ConnectionInterruptedListener ConnectionInterruptedListener + { + add + { + target.ConnectionInterruptedListener += value; + } + remove + { + target.ConnectionInterruptedListener -= value; + } + } + + public event ConnectionResumedListener ConnectionResumedListener + { + add + { + target.ConnectionResumedListener += value; + } + remove + { + target.ConnectionResumedListener -= value; + } + } + public AcknowledgementMode AcknowledgementMode { @@ -528,6 +571,19 @@ namespace Spring.Messaging.Nms.Connections { get { return target.IsStarted; } } + + + public IConnectionMetaData MetaData + { + get { return target.MetaData; } + } + + + public IRedeliveryPolicy RedeliveryPolicy + { + get { return target.RedeliveryPolicy; } + set { target.RedeliveryPolicy = value; } + } #endregion /// diff --git a/test/Spring/Spring.Messaging.Nms.Integration.Tests/Messaging/Nms/Core/NmsTemplateTests.xml b/test/Spring/Spring.Messaging.Nms.Integration.Tests/Messaging/Nms/Core/NmsTemplateTests.xml index 2dbee763..4b766b64 100644 --- a/test/Spring/Spring.Messaging.Nms.Integration.Tests/Messaging/Nms/Core/NmsTemplateTests.xml +++ b/test/Spring/Spring.Messaging.Nms.Integration.Tests/Messaging/Nms/Core/NmsTemplateTests.xml @@ -19,7 +19,7 @@ - + diff --git a/test/Spring/Spring.Messaging.Nms.Integration.Tests/Spring.Messaging.Nms.Integration.Tests.dll.config b/test/Spring/Spring.Messaging.Nms.Integration.Tests/Spring.Messaging.Nms.Integration.Tests.dll.config index b7db2817..b6614d9d 100644 --- a/test/Spring/Spring.Messaging.Nms.Integration.Tests/Spring.Messaging.Nms.Integration.Tests.dll.config +++ b/test/Spring/Spring.Messaging.Nms.Integration.Tests/Spring.Messaging.Nms.Integration.Tests.dll.config @@ -1,3 +1,14 @@  - + + + + + + + + + + + + diff --git a/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Connections/CachingConnectionFactoryTests.cs b/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Connections/CachingConnectionFactoryTests.cs index a3e0b4e1..ae849ce7 100644 --- a/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Connections/CachingConnectionFactoryTests.cs +++ b/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Connections/CachingConnectionFactoryTests.cs @@ -30,7 +30,7 @@ using Rhino.Mocks; namespace Spring.Messaging.Nms.Connections { /// - /// This class contains tests for + /// This class contains tests for CachingConnectionFactory /// /// Mark Pollack [TestFixture] @@ -242,8 +242,7 @@ namespace Spring.Messaging.Nms.Connections IMessageConsumer consumerB = sessionB.CreateConsumer(destination); TestMessageConsumer tmpB = GetTestMessageConsumer(consumerB); - Assert.AreSame(tmpA, tmpB); - + Assert.AreSame(tmpA, tmpB); mocks.VerifyAll(); } diff --git a/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Connections/TestConnection.cs b/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Connections/TestConnection.cs index ecc041ce..e7fa24bb 100644 --- a/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Connections/TestConnection.cs +++ b/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Connections/TestConnection.cs @@ -19,7 +19,14 @@ namespace Spring.Messaging.Nms.Connections get { return closeCount; } } + public IConnectionMetaData MetaData + { + get { throw new NotImplementedException(); } + } + public event ExceptionListener ExceptionListener; + public event ConnectionInterruptedListener ConnectionInterruptedListener; + public event ConnectionResumedListener ConnectionResumedListener; public ISession CreateSession() { @@ -61,6 +68,12 @@ namespace Spring.Messaging.Nms.Connections set { } } + public IRedeliveryPolicy RedeliveryPolicy + { + get { throw new NotImplementedException(); } + set { throw new NotImplementedException(); } + } + public void Dispose() { } diff --git a/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Connections/TestConnectionFactory.cs b/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Connections/TestConnectionFactory.cs index 3227d3be..f474f87e 100644 --- a/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Connections/TestConnectionFactory.cs +++ b/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Connections/TestConnectionFactory.cs @@ -1,5 +1,6 @@ +using System; using Apache.NMS; namespace Spring.Messaging.Nms.Connections @@ -18,6 +19,18 @@ namespace Spring.Messaging.Nms.Connections return new TestConnection(); } + public Uri BrokerUri + { + get { throw new NotImplementedException(); } + set { throw new NotImplementedException(); } + } + + public IRedeliveryPolicy RedeliveryPolicy + { + get { throw new NotImplementedException(); } + set { throw new NotImplementedException(); } + } + #endregion } } \ No newline at end of file diff --git a/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Connections/TestMessageProducer.cs b/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Connections/TestMessageProducer.cs index ecc77dec..5b5505c4 100644 --- a/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Connections/TestMessageProducer.cs +++ b/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Connections/TestMessageProducer.cs @@ -90,6 +90,11 @@ namespace Spring.Messaging.Nms.Connections throw new NotImplementedException(); } + public IStreamMessage CreateStreamMessage() + { + throw new NotImplementedException(); + } + public MsgDeliveryMode DeliveryMode { get { return msgDeliveryMode; } diff --git a/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Connections/TestSession.cs b/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Connections/TestSession.cs index 86948314..3b043903 100644 --- a/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Connections/TestSession.cs +++ b/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Connections/TestSession.cs @@ -21,14 +21,12 @@ using System; using Apache.NMS; using Apache.NMS.ActiveMQ.Commands; -using Rhino.Mocks; namespace Spring.Messaging.Nms.Connections { public class TestSession : ISession { - private MockRepository mocks = new MockRepository(); private int closeCount; private int createdCount; @@ -114,6 +112,16 @@ namespace Spring.Messaging.Nms.Connections throw new NotImplementedException(); } + public IQueueBrowser CreateBrowser(IQueue queue) + { + throw new NotImplementedException(); + } + + public IQueueBrowser CreateBrowser(IQueue queue, string selector) + { + throw new NotImplementedException(); + } + public void DeleteDurableConsumer(string name, TimeSpan requestTimeout) { throw new NotImplementedException(); @@ -183,6 +191,11 @@ namespace Spring.Messaging.Nms.Connections throw new NotImplementedException(); } + public IStreamMessage CreateStreamMessage() + { + throw new NotImplementedException(); + } + public void Close() { closeCount++; diff --git a/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Core/SimpleMessageConverterTests.cs b/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Core/SimpleMessageConverterTests.cs index e0e78c39..3edd6754 100644 --- a/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Core/SimpleMessageConverterTests.cs +++ b/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Core/SimpleMessageConverterTests.cs @@ -25,6 +25,7 @@ using System.Collections; using System.Text; using Apache.NMS; using Apache.NMS.ActiveMQ.OpenWire; +using Apache.NMS.Util; using NUnit.Framework; using Rhino.Mocks; using Spring.Messaging.Nms.Support.Converter; diff --git a/test/Spring/Spring.Messaging.Nms.Tests/Spring.Messaging.Nms.Tests.dll.config b/test/Spring/Spring.Messaging.Nms.Tests/Spring.Messaging.Nms.Tests.dll.config index 8d7d63c5..ece79ddf 100644 --- a/test/Spring/Spring.Messaging.Nms.Tests/Spring.Messaging.Nms.Tests.dll.config +++ b/test/Spring/Spring.Messaging.Nms.Tests/Spring.Messaging.Nms.Tests.dll.config @@ -15,7 +15,7 @@ See the License for the specific language governing permissions and limitations under the License. --> - +
diff --git a/test/Spring/Spring.Services.Tests/Spring.Services.Tests.2003.csproj b/test/Spring/Spring.Services.Tests/Spring.Services.Tests.2003.csproj index 49e176a5..ed64cc1b 100644 --- a/test/Spring/Spring.Services.Tests/Spring.Services.Tests.2003.csproj +++ b/test/Spring/Spring.Services.Tests/Spring.Services.Tests.2003.csproj @@ -17,7 +17,7 @@ DelaySign = "false" OutputType = "Library" PreBuildEvent = "" - PostBuildEvent = 'echo "Copying .xml files for Spring.Services tests" xcopy "$(ProjectDir)Data" ..\..\..\..\build\VS.Net.2003\Spring.Services.Tests\$(ConfigurationName)\ /y /s /q /d xcopy "$(ProjectDir)$(TargetFileName)-1.1.config" ..\..\..\..\build\VS.Net.2003\Spring.Services.Tests\$(ConfigurationName)\$(TargetFileName).config' + PostBuildEvent = 'echo "Copying .xml files for Spring.Services tests" xcopy /f /y /s /d /i "$(ProjectDir)Data" ..\..\..\..\build\VS.NET.2003\Spring.Services.Tests\$(ConfigurationName)\ rem xcopy "$(ProjectDir)$(TargetFileName)-1.1.config" ..\..\..\..\build\VS.NET.2003\Spring.Services.Tests\$(ConfigurationName)\$(TargetFileName).config /s /q copy /y "$(ProjectDir)$(TargetFileName)-1.1.config" ..\..\..\..\build\VS.Net.2003\Spring.Services.Tests\$(ConfigurationName)\$(TargetFileName).config ' RootNamespace = "Spring" RunPostBuildEvent = "OnBuildSuccess" StartupObject = "" diff --git a/test/Spring/Spring.Web.Tests/Spring.Web.Tests.2003.csproj b/test/Spring/Spring.Web.Tests/Spring.Web.Tests.2003.csproj index bab40c93..1e5e0b7e 100644 --- a/test/Spring/Spring.Web.Tests/Spring.Web.Tests.2003.csproj +++ b/test/Spring/Spring.Web.Tests/Spring.Web.Tests.2003.csproj @@ -316,7 +316,7 @@ />