diff --git a/lib/Net/2.0/Apache.NMS.MSMQ.dll b/lib/Net/2.0/Apache.NMS.MSMQ.dll new file mode 100644 index 00000000..2620faf1 Binary files /dev/null and b/lib/Net/2.0/Apache.NMS.MSMQ.dll differ diff --git a/lib/Net/2.0/Apache.NMS.dll b/lib/Net/2.0/Apache.NMS.dll new file mode 100644 index 00000000..efe6be21 Binary files /dev/null and b/lib/Net/2.0/Apache.NMS.dll differ diff --git a/lib/Net/2.0/NMS.dll b/lib/Net/2.0/NMS.dll deleted file mode 100644 index 7a8e73fe..00000000 Binary files a/lib/Net/2.0/NMS.dll and /dev/null differ diff --git a/src/Spring/Spring.Aop/Aspects/Exceptions/LogExceptionHandler.cs b/src/Spring/Spring.Aop/Aspects/Exceptions/LogExceptionHandler.cs index 36334288..f4cd6492 100644 --- a/src/Spring/Spring.Aop/Aspects/Exceptions/LogExceptionHandler.cs +++ b/src/Spring/Spring.Aop/Aspects/Exceptions/LogExceptionHandler.cs @@ -1,90 +1,117 @@ -#region License - -/* - * Copyright 2002-2007 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#endregion - -using System; -using System.Collections; -using Common.Logging; -using Spring.Expressions; - -namespace Spring.Aspects.Exceptions -{ - /// - /// Log the exceptions. Default log nameis "LogExceptionHandler" and log level is Debug - /// - /// Mark Pollack - public class LogExceptionHandler : AbstractExceptionHandler - { - private string logName = "LogExceptionHandler"; - - - /// - /// Initializes a new instance of the class. - /// - public LogExceptionHandler() - { - ContinueProcessing = true; - } - - /// - /// Initializes a new instance of the class. - /// - /// The exception names. - public LogExceptionHandler(string[] exceptionNames) : base(exceptionNames) - { - ContinueProcessing = true; - } - - - - /// - /// Gets or sets the name of the log. - /// - /// The name of the log. - public string LogName - { - get { return logName; } - set { logName = value; } - } - - - /// - /// Handles the exception. - /// - /// the calling context dictionary - /// - /// The return value from handling the exception, if not rethrown or a new exception is thrown. - /// - public override object HandleException(IDictionary callContextDictionary) - { - ILog log = LogManager.GetLogger(logName); - callContextDictionary.Add("log", log); - try - { - IExpression expression = Expression.Parse(ActionExpressionText); - expression.GetValue(null, callContextDictionary); - } - catch (Exception e) - { - log.Warn("Was not able to evaluate action expression [" + ActionExpressionText + "]", e); - } - return "logged"; - } - } +#region License + +/* + * Copyright 2002-2007 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#endregion + +using System; +using System.Collections; +using Common.Logging; +using Spring.Expressions; + +namespace Spring.Aspects.Exceptions +{ + /// + /// Log the exceptions. Default log nameis "LogExceptionHandler" and log level is Debug + /// + /// Mark Pollack + public class LogExceptionHandler : AbstractExceptionHandler + { + #region Fields + private string logName = "LogExceptionHandler"; + + private LogLevel logLevel = LogLevel.Trace; + + private bool logMessageOnly = false; + #endregion + + + /// + /// Initializes a new instance of the class. + /// + public LogExceptionHandler() + { + ContinueProcessing = true; + } + + /// + /// Initializes a new instance of the class. + /// + /// The exception names. + public LogExceptionHandler(string[] exceptionNames) : base(exceptionNames) + { + ContinueProcessing = true; + } + + + + /// + /// Gets or sets the name of the log. + /// + /// The name of the log. + public string LogName + { + get { return logName; } + set { logName = value; } + } + + + /// + /// Gets or sets the log level. + /// + /// The log level. + public LogLevel LogLevel + { + get { return logLevel; } + set { logLevel = value; } + } + + /// + /// Gets or sets a value indicating whether to log message only, and not pass in the + /// exception to the logging API + /// + /// true if log message only; otherwise, false. + public bool LogMessageOnly + { + get { return logMessageOnly; } + set { logMessageOnly = value; } + } + + /// + /// Handles the exception. + /// + /// the calling context dictionary + /// + /// The return value from handling the exception, if not rethrown or a new exception is thrown. + /// + public override object HandleException(IDictionary callContextDictionary) + { + ILog log = LogManager.GetLogger(logName); + callContextDictionary.Add("log", log); + try + { + IExpression expression = Expression.Parse(ActionExpressionText); + expression.GetValue(null, callContextDictionary); + } + catch (Exception e) + { + log.Warn("Was not able to evaluate action expression [" + ActionExpressionText + "]", e); + } + return "logged"; + } + } } \ No newline at end of file diff --git a/src/Spring/Spring.Data.NHibernate/Data/NHibernate/HibernateTransactionManager.cs b/src/Spring/Spring.Data.NHibernate/Data/NHibernate/HibernateTransactionManager.cs index 165bf517..3671c8e9 100644 --- a/src/Spring/Spring.Data.NHibernate/Data/NHibernate/HibernateTransactionManager.cs +++ b/src/Spring/Spring.Data.NHibernate/Data/NHibernate/HibernateTransactionManager.cs @@ -348,7 +348,7 @@ namespace Spring.Data.NHibernate protected override void DoBegin(object transaction, ITransactionDefinition definition) { HibernateTransactionObject txObject = (HibernateTransactionObject) transaction; - + if (DbProvider != null && TransactionSynchronizationManager.HasResource(DbProvider) && !txObject.ConnectionHolder.SynchronizedWithTransaction) { diff --git a/src/Spring/Spring.Data.NHibernate12/Data/NHibernate/LocalSessionFactoryObject.cs b/src/Spring/Spring.Data.NHibernate12/Data/NHibernate/LocalSessionFactoryObject.cs index 647c8aac..d6cc8192 100644 --- a/src/Spring/Spring.Data.NHibernate12/Data/NHibernate/LocalSessionFactoryObject.cs +++ b/src/Spring/Spring.Data.NHibernate12/Data/NHibernate/LocalSessionFactoryObject.cs @@ -198,11 +198,11 @@ namespace Spring.Data.NHibernate #endregion - #region Methods + #region Methods - #endregion + #endregion - /// + /// /// Return the singleon session factory. /// /// The singleon session factory. @@ -286,6 +286,7 @@ namespace Spring.Data.NHibernate } } + IResourceLoader resourceLoader = new ConfigurableResourceLoader(); if (this.mappingResources != null) diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Connections/ConnectionFactoryUtils.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Connections/ConnectionFactoryUtils.cs index 33595649..cfaddb46 100644 --- a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Connections/ConnectionFactoryUtils.cs +++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Connections/ConnectionFactoryUtils.cs @@ -21,7 +21,7 @@ using System; using Spring.Transaction.Support; using Spring.Util; -using NMS; +using Apache.NMS; namespace Spring.Messaging.Nms.IConnections { @@ -90,7 +90,7 @@ namespace Spring.Messaging.Nms.IConnections { conHolderToUse = new NmsResourceHolder(); } - NMS.IConnection con = resourceFactory.GetConnection(conHolderToUse); + Apache.NMS.IConnection con = resourceFactory.GetConnection(conHolderToUse); ISession session = null; try { @@ -153,12 +153,12 @@ namespace Spring.Messaging.Nms.IConnections private IConnectionFactory cf; private bool synchedLocalTransactionAllowed; - public AnonymousClassResourceFactory(NMS.IConnection existingCon, IConnectionFactory cf, bool synchedLocalTransactionAllowed) + public AnonymousClassResourceFactory(Apache.NMS.IConnection existingCon, IConnectionFactory cf, bool synchedLocalTransactionAllowed) { InitBlock(existingCon, cf, synchedLocalTransactionAllowed); } - private void InitBlock(NMS.IConnection existingCon, IConnectionFactory cf, bool synchedLocalTransactionAllowed) + private void InitBlock(Apache.NMS.IConnection existingCon, IConnectionFactory cf, bool synchedLocalTransactionAllowed) { this.existingCon = existingCon; this.cf = cf; @@ -169,18 +169,18 @@ namespace Spring.Messaging.Nms.IConnections { return holder.GetSession(typeof(ISession), existingCon); } - - public virtual NMS.IConnection GetConnection(NmsResourceHolder holder) + + public virtual Apache.NMS.IConnection GetConnection(NmsResourceHolder holder) { return (existingCon != null ? existingCon : holder.GetConnection()); } - - public virtual NMS.IConnection CreateConnection() + + public virtual Apache.NMS.IConnection CreateConnection() { return cf.CreateConnection(); } - - public virtual ISession CreateSession(NMS.IConnection con) + + public virtual ISession CreateSession(Apache.NMS.IConnection con) { if (synchedLocalTransactionAllowed) { @@ -236,7 +236,7 @@ namespace Spring.Messaging.Nms.IConnections /// the new NMS ISession /// /// NMSException if thrown by NMS API methods - ISession CreateSession(NMS.IConnection con); + ISession CreateSession(Apache.NMS.IConnection con); /// diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Connections/NmsResourceHolder.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Connections/NmsResourceHolder.cs index 085ccf77..868f6305 100644 --- a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Connections/NmsResourceHolder.cs +++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Connections/NmsResourceHolder.cs @@ -24,7 +24,7 @@ using Common.Logging; using Spring.Collections; using Spring.Transaction.Support; using Spring.Util; -using NMS; +using Apache.NMS; namespace Spring.Messaging.Nms.IConnections { @@ -71,7 +71,7 @@ namespace Spring.Messaging.Nms.IConnections /// /// the NMS ISession /// - public NmsResourceHolder(NMS.IConnection connection, ISession session) + public NmsResourceHolder(Apache.NMS.IConnection connection, ISession session) { AddConnection(connection); AddSession(session, connection); @@ -93,7 +93,7 @@ namespace Spring.Messaging.Nms.IConnections #region Methods - public void AddConnection(NMS.IConnection connection) + public void AddConnection(Apache.NMS.IConnection connection) { //TODO - update Assert utility class... //Assert.isTrue(!this.frozen, "Cannot add IConnection because NmsResourceHolder is frozen"); @@ -109,7 +109,7 @@ namespace Spring.Messaging.Nms.IConnections AddSession(session, null); } - public void AddSession(ISession session, NMS.IConnection connection) + public void AddSession(ISession session, Apache.NMS.IConnection connection) { //TOOD update AssertUtils class //Assert.isTrue(!this.frozen, "Cannot add ISession because NmsResourceHolder is frozen"); @@ -130,12 +130,12 @@ namespace Spring.Messaging.Nms.IConnections } } - public virtual NMS.IConnection GetConnection() + public virtual Apache.NMS.IConnection GetConnection() { - return (!(this.connections.Count == 0) ? (NMS.IConnection)this.connections[0] : null); + return (!(this.connections.Count == 0) ? (Apache.NMS.IConnection)this.connections[0] : null); } - public virtual NMS.IConnection GetConnection(System.Type connectionType) + public virtual Apache.NMS.IConnection GetConnection(System.Type connectionType) { throw new NotImplementedException(); //TODO Updae CollectionUtils... @@ -152,7 +152,7 @@ namespace Spring.Messaging.Nms.IConnections return GetSession(sessionType, null); } - public virtual ISession GetSession(System.Type sessionType, NMS.IConnection connection) + public virtual ISession GetSession(System.Type sessionType, Apache.NMS.IConnection connection) { IList sessions = this.sessions; if (connection != null) @@ -199,7 +199,7 @@ namespace Spring.Messaging.Nms.IConnections logger.Debug("Could not close NMS ISession after transaction", ex); } } - foreach (NMS.IConnection connection in connections) + foreach (Apache.NMS.IConnection connection in connections) { try { diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/IMessageCreator.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/IMessageCreator.cs index fe840aee..4b2937ba 100644 --- a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/IMessageCreator.cs +++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/IMessageCreator.cs @@ -18,7 +18,7 @@ #endregion -using NMS; +using Apache.NMS; namespace Spring.Messaging.Nms { diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/IMessageListener.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/IMessageListener.cs index 75ec0acc..9254681d 100644 --- a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/IMessageListener.cs +++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/IMessageListener.cs @@ -18,7 +18,7 @@ #endregion -using NMS; +using Apache.NMS; namespace Spring.Messaging.Nms { diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/IMessagePostProcessor.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/IMessagePostProcessor.cs index 8567a061..cf9e4eda 100644 --- a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/IMessagePostProcessor.cs +++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/IMessagePostProcessor.cs @@ -18,7 +18,7 @@ #endregion -using NMS; +using Apache.NMS; namespace Spring.Messaging.Nms { diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/INmsOperations.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/INmsOperations.cs index 47a75ceb..1d561ebe 100644 --- a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/INmsOperations.cs +++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/INmsOperations.cs @@ -18,7 +18,7 @@ #endregion -using NMS; +using Apache.NMS; namespace Spring.Messaging.Nms { diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/IProducerCallback.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/IProducerCallback.cs index fdc85e02..e0b62942 100644 --- a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/IProducerCallback.cs +++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/IProducerCallback.cs @@ -18,7 +18,7 @@ #endregion -using NMS; +using Apache.NMS; namespace Spring.Messaging.Nms { diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/ISessionCallback.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/ISessionCallback.cs index 022b6aa3..dae030a3 100644 --- a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/ISessionCallback.cs +++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/ISessionCallback.cs @@ -18,7 +18,7 @@ #endregion -using NMS; +using Apache.NMS; namespace Spring.Messaging.Nms { diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Listener/AbstractMessageListenerContainer.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Listener/AbstractMessageListenerContainer.cs index b975b2c4..37a539f1 100644 --- a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Listener/AbstractMessageListenerContainer.cs +++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Listener/AbstractMessageListenerContainer.cs @@ -4,7 +4,7 @@ using Spring.Context; using Spring.Messaging.Nms.Support; using Spring.Messaging.Nms.Support.IDestinations; using Spring.Util; -using NMS; +using Apache.NMS; namespace Spring.Messaging.Nms.Listener { diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Listener/Adapter/MessageListenerAdapter.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Listener/Adapter/MessageListenerAdapter.cs index 5be23271..eb361a07 100644 --- a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Listener/Adapter/MessageListenerAdapter.cs +++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Listener/Adapter/MessageListenerAdapter.cs @@ -6,7 +6,7 @@ using Spring.Messaging.Nms.Support; using Spring.Messaging.Nms.Support.Converter; using Spring.Messaging.Nms.Support.IDestinations; using Spring.Util; -using NMS; +using Apache.NMS; namespace Spring.Messaging.Nms.Listener.Adapter { diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Listener/ISessionAwareMessageListener.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Listener/ISessionAwareMessageListener.cs index 90b105f4..0b1b61c8 100644 --- a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Listener/ISessionAwareMessageListener.cs +++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Listener/ISessionAwareMessageListener.cs @@ -1,4 +1,4 @@ -using NMS; +using Apache.NMS; namespace Spring.Messaging.Nms.Listener { diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Listener/SimpleMessageListenerContainer.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Listener/SimpleMessageListenerContainer.cs index aeed04ff..d3a67a61 100644 --- a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Listener/SimpleMessageListenerContainer.cs +++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Listener/SimpleMessageListenerContainer.cs @@ -1,6 +1,6 @@ using Spring.Collections; using Spring.Messaging.Nms.Support; -using NMS; +using Apache.NMS; namespace Spring.Messaging.Nms.Listener { @@ -58,7 +58,7 @@ namespace Spring.Messaging.Nms.Listener //TODO TaskExectuor abstraction would go here... SimpleMessageListener listener = new SimpleMessageListener(this, session); - consumer.Listener += new NMS.MessageListener(listener.OnMessage); + consumer.Listener += new Apache.NMS.MessageListener(listener.OnMessage); return consumer; } diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/MessageCreatorDelegate.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/MessageCreatorDelegate.cs index 80ee0db2..23090f01 100644 --- a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/MessageCreatorDelegate.cs +++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/MessageCreatorDelegate.cs @@ -18,7 +18,7 @@ #endregion -using NMS; +using Apache.NMS; namespace Spring.Messaging.Nms { diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/NmsGatewaySupport.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/NmsGatewaySupport.cs index 42d4bc33..386e53de 100644 --- a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/NmsGatewaySupport.cs +++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/NmsGatewaySupport.cs @@ -21,7 +21,7 @@ using System; using Common.Logging; using Spring.Objects.Factory; -using NMS; +using Apache.NMS; namespace Spring.Messaging.Nms { diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/NmsTemplate.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/NmsTemplate.cs index 2074225e..122ac453 100644 --- a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/NmsTemplate.cs +++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/NmsTemplate.cs @@ -25,7 +25,7 @@ using Spring.Messaging.Nms.Support.Converter; using Spring.Messaging.Nms.Support.IDestinations; using Spring.Transaction.Support; using Spring.Util; -using NMS; +using Apache.NMS; namespace Spring.Messaging.Nms { diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/Converter/IMessageConverter.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/Converter/IMessageConverter.cs index 2453709b..214119e0 100644 --- a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/Converter/IMessageConverter.cs +++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/Converter/IMessageConverter.cs @@ -18,7 +18,7 @@ #endregion -using NMS; +using Apache.NMS; namespace Spring.Messaging.Nms.Support.Converter { diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/Converter/SimpleMessageConverter.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/Converter/SimpleMessageConverter.cs index 0fcf3c02..11fd51b4 100644 --- a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/Converter/SimpleMessageConverter.cs +++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/Converter/SimpleMessageConverter.cs @@ -21,7 +21,7 @@ using System; using System.Collections; using System.Runtime.Serialization; -using NMS; +using Apache.NMS; namespace Spring.Messaging.Nms.Support.Converter { diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/Destinations/DynamicDestinationResolver.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/Destinations/DynamicDestinationResolver.cs index 7587e40f..19ae8811 100644 --- a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/Destinations/DynamicDestinationResolver.cs +++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/Destinations/DynamicDestinationResolver.cs @@ -19,7 +19,7 @@ #endregion using Spring.Util; -using NMS; +using Apache.NMS; namespace Spring.Messaging.Nms.Support.IDestinations { diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/Destinations/IDestinationResolver.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/Destinations/IDestinationResolver.cs index ea19c104..f818c4af 100644 --- a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/Destinations/IDestinationResolver.cs +++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/Destinations/IDestinationResolver.cs @@ -18,7 +18,7 @@ #endregion -using NMS; +using Apache.NMS; namespace Spring.Messaging.Nms.Support.IDestinations { diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/Destinations/NmsDestinationAccessor.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/Destinations/NmsDestinationAccessor.cs index 37ec23ae..08e75221 100644 --- a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/Destinations/NmsDestinationAccessor.cs +++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/Destinations/NmsDestinationAccessor.cs @@ -19,7 +19,7 @@ #endregion using Spring.Util; -using NMS; +using Apache.NMS; namespace Spring.Messaging.Nms.Support.IDestinations { diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/NmsAccessor.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/NmsAccessor.cs index 9e47e2a4..29b816a8 100644 --- a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/NmsAccessor.cs +++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/NmsAccessor.cs @@ -21,7 +21,7 @@ using System; using Common.Logging; using Spring.Objects.Factory; -using NMS; +using Apache.NMS; namespace Spring.Messaging.Nms.Support { diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/NmsUtils.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/NmsUtils.cs index b22472e8..91232f14 100644 --- a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/NmsUtils.cs +++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/NmsUtils.cs @@ -21,7 +21,7 @@ using System; using Common.Logging; using Spring.Util; -using NMS; +using Apache.NMS; namespace Spring.Messaging.Nms.Support { diff --git a/src/Spring/Spring.Messaging.Nms/Spring.Messaging.Nms.2005.csproj b/src/Spring/Spring.Messaging.Nms/Spring.Messaging.Nms.2005.csproj index ec908a8d..8c56ff7c 100644 --- a/src/Spring/Spring.Messaging.Nms/Spring.Messaging.Nms.2005.csproj +++ b/src/Spring/Spring.Messaging.Nms/Spring.Messaging.Nms.2005.csproj @@ -33,14 +33,14 @@ False ..\..\..\lib\net\2.0\antlr.runtime.dll + + False + ..\..\..\lib\Net\2.0\Apache.NMS.dll + False ..\..\..\lib\net\2.0\Common.Logging.dll - - False - ..\..\..\lib\net\2.0\NMS.dll -