Author: jgomes
Date: Thu Jun 25 00:57:18 2009
New Revision: 788231
URL: http://svn.apache.org/viewvc?rev=788231&view=rev
Log:
Merge fix for AMQNET-165.
Fixes [AMQNET-165]. (See https://issues.apache.org/activemq/browse/AMQNET-165)
Modified:
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/ (props changed)
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/deploy/ (props changed)
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/nant-common.xml (props
changed)
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/ConnectionFactory.cs
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/vs2008-activemq-test.csproj
(props changed)
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/vs2008-activemq.csproj
(props changed)
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/vs2008-activemq.sln
(props changed)
Propchange: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jun 25 00:57:18 2009
@@ -1 +1,2 @@
/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/tags/1.0.0:692591,693525
+/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/tags/1.1.0:788230
Propchange: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/deploy/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jun 25 00:57:18 2009
@@ -0,0 +1 @@
+/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/tags/1.1.0/deploy:788230
Propchange: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/nant-common.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jun 25 00:57:18 2009
@@ -0,0 +1 @@
+/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/tags/1.1.0/nant-common.xml:788230
Modified:
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/ConnectionFactory.cs
URL:
http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/ConnectionFactory.cs?rev=788231&r1=788230&r2=788231&view=diff
==============================================================================
---
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/ConnectionFactory.cs
(original)
+++
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/ConnectionFactory.cs
Thu Jun 25 00:57:18 2009
@@ -27,7 +27,7 @@
/// </summary>
public class ConnectionFactory : IConnectionFactory
{
- public const string DEFAULT_BROKER_URL =
"tcp://localhost:61616";
+ public const string DEFAULT_BROKER_URL =
"failover:tcp://localhost:61616";
public const string ENV_BROKER_URL = "ACTIVEMQ_BROKER_URL";
private static event ExceptionListener onException;
Propchange:
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/vs2008-activemq-test.csproj
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jun 25 00:57:18 2009
@@ -0,0 +1 @@
+/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/tags/1.1.0/vs2008-activemq-test.csproj:788230
Propchange:
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/vs2008-activemq.csproj
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jun 25 00:57:18 2009
@@ -0,0 +1 @@
+/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/tags/1.1.0/vs2008-activemq.csproj:788230
Propchange:
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/vs2008-activemq.sln
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jun 25 00:57:18 2009
@@ -0,0 +1 @@
+/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/tags/1.1.0/vs2008-activemq.sln:788230
