Author: chirino
Date: Thu Mar 31 14:23:38 2011
New Revision: 1087311
URL: http://svn.apache.org/viewvc?rev=1087311&view=rev
Log:
Bind to IPv4 by default since it seems that windows machines don't have an IPv6
stack enabled by default.
Modified:
activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/Connector.scala
activemq/activemq-apollo/trunk/apollo-cli/src/main/resources/org/apache/activemq/apollo/cli/commands/etc/apollo-ssl.xml
activemq/activemq-apollo/trunk/apollo-cli/src/main/resources/org/apache/activemq/apollo/cli/commands/etc/apollo.xml
activemq/activemq-apollo/trunk/apollo-cli/src/test/resources/example-broker/etc/apollo.xml
activemq/activemq-apollo/trunk/apollo-dto/src/test/java/org/apache/activemq/apollo/dto/XmlCodecTest.java
activemq/activemq-apollo/trunk/apollo-dto/src/test/resources/org/apache/activemq/apollo/dto/XmlCodecTest.xml
activemq/activemq-apollo/trunk/apollo-stomp/src/test/resources/apollo-stomp-bdb.xml
activemq/activemq-apollo/trunk/apollo-stomp/src/test/resources/apollo-stomp-secure.xml
activemq/activemq-apollo/trunk/apollo-stomp/src/test/resources/apollo-stomp-ssl-secure.xml
activemq/activemq-apollo/trunk/apollo-stomp/src/test/resources/apollo-stomp-ssl.xml
activemq/activemq-apollo/trunk/apollo-stomp/src/test/resources/apollo-stomp.xml
activemq/activemq-apollo/trunk/apollo-website/src/documentation/user-manual.md
Modified:
activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/Connector.scala
URL:
http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/Connector.scala?rev=1087311&r1=1087310&r2=1087311&view=diff
==============================================================================
---
activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/Connector.scala
(original)
+++
activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/Connector.scala
Thu Mar 31 14:23:38 2011
@@ -41,7 +41,7 @@ object Connector extends Log {
def defaultConfig() = {
val rc = new ConnectorDTO
rc.id = "default"
- rc.bind = "tcp://[::]:61613"
+ rc.bind = "tcp://0.0.0.0:61613"
rc.protocol = "multi"
rc.connection_limit = 1000
rc
Modified:
activemq/activemq-apollo/trunk/apollo-cli/src/main/resources/org/apache/activemq/apollo/cli/commands/etc/apollo-ssl.xml
URL:
http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-cli/src/main/resources/org/apache/activemq/apollo/cli/commands/etc/apollo-ssl.xml?rev=1087311&r1=1087310&r2=1087311&view=diff
==============================================================================
---
activemq/activemq-apollo/trunk/apollo-cli/src/main/resources/org/apache/activemq/apollo/cli/commands/etc/apollo-ssl.xml
(original)
+++
activemq/activemq-apollo/trunk/apollo-cli/src/main/resources/org/apache/activemq/apollo/cli/commands/etc/apollo-ssl.xml
Thu Mar 31 14:23:38 2011
@@ -57,8 +57,8 @@
<web_admin bind="http://127.0.0.1:61680"/>
- <connector id="tcp" bind="tcp://[::]:61613" connection_limit="2000"/>
- <connector id="tls" bind="tls://[::]:61614" connection_limit="2000"/>
+ <connector id="tcp" bind="tcp://0.0.0.0:61613" connection_limit="2000"/>
+ <connector id="tls" bind="tls://0.0.0.0:61614" connection_limit="2000"/>
<key_storage file="${apollo.base}/etc/keystore" password="password"
key_password="password"/>
Modified:
activemq/activemq-apollo/trunk/apollo-cli/src/main/resources/org/apache/activemq/apollo/cli/commands/etc/apollo.xml
URL:
http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-cli/src/main/resources/org/apache/activemq/apollo/cli/commands/etc/apollo.xml?rev=1087311&r1=1087310&r2=1087311&view=diff
==============================================================================
---
activemq/activemq-apollo/trunk/apollo-cli/src/main/resources/org/apache/activemq/apollo/cli/commands/etc/apollo.xml
(original)
+++
activemq/activemq-apollo/trunk/apollo-cli/src/main/resources/org/apache/activemq/apollo/cli/commands/etc/apollo.xml
Thu Mar 31 14:23:38 2011
@@ -57,6 +57,6 @@
<web_admin bind="http://127.0.0.1:61680"/>
- <connector id="tcp" bind="tcp://[::]:61613" connection_limit="2000"/>
+ <connector id="tcp" bind="tcp://0.0.0.0:61613" connection_limit="2000"/>
</broker>
Modified:
activemq/activemq-apollo/trunk/apollo-cli/src/test/resources/example-broker/etc/apollo.xml
URL:
http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-cli/src/test/resources/example-broker/etc/apollo.xml?rev=1087311&r1=1087310&r2=1087311&view=diff
==============================================================================
---
activemq/activemq-apollo/trunk/apollo-cli/src/test/resources/example-broker/etc/apollo.xml
(original)
+++
activemq/activemq-apollo/trunk/apollo-cli/src/test/resources/example-broker/etc/apollo.xml
Thu Mar 31 14:23:38 2011
@@ -21,5 +21,5 @@
<host_name>localhost</host_name>
<bdb_store directory="${apollo.base}/data" flush_delay="100"/>
</virtual_host>
- <connector protocol="multi" bind="tcp://[::]:61613" id="default"/>
+ <connector protocol="multi" bind="tcp://0.0.0.0:61613" id="default"/>
</broker>
Modified:
activemq/activemq-apollo/trunk/apollo-dto/src/test/java/org/apache/activemq/apollo/dto/XmlCodecTest.java
URL:
http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-dto/src/test/java/org/apache/activemq/apollo/dto/XmlCodecTest.java?rev=1087311&r1=1087310&r2=1087311&view=diff
==============================================================================
---
activemq/activemq-apollo/trunk/apollo-dto/src/test/java/org/apache/activemq/apollo/dto/XmlCodecTest.java
(original)
+++
activemq/activemq-apollo/trunk/apollo-dto/src/test/java/org/apache/activemq/apollo/dto/XmlCodecTest.java
Thu Mar 31 14:23:38 2011
@@ -81,7 +81,7 @@ public class XmlCodecTest {
ConnectorDTO connector = new ConnectorDTO();
connector.id = "port-61616";
- connector.bind = "tcp://[::]:61616";
+ connector.bind = "tcp://0.0.0.0:61616";
broker.connectors.add(connector);
XmlCodec.encode(broker, System.out, true);
Modified:
activemq/activemq-apollo/trunk/apollo-dto/src/test/resources/org/apache/activemq/apollo/dto/XmlCodecTest.xml
URL:
http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-dto/src/test/resources/org/apache/activemq/apollo/dto/XmlCodecTest.xml?rev=1087311&r1=1087310&r2=1087311&view=diff
==============================================================================
---
activemq/activemq-apollo/trunk/apollo-dto/src/test/resources/org/apache/activemq/apollo/dto/XmlCodecTest.xml
(original)
+++
activemq/activemq-apollo/trunk/apollo-dto/src/test/resources/org/apache/activemq/apollo/dto/XmlCodecTest.xml
Thu Mar 31 14:23:38 2011
@@ -33,7 +33,7 @@
<durable_subscription name="durable_subscription1"/>
</virtual_host>
- <connector bind="tcp://[::]:61616" enabled="true" id="port-61616">
+ <connector bind="tcp://0.0.0.0:61616" enabled="true" id="port-61616">
<stomp add_user_header="JMSXUserID">
<add_user_header>GroupId</add_user_header>
<add_user_header kind="UserPrincipal">UserId</add_user_header>
Modified:
activemq/activemq-apollo/trunk/apollo-stomp/src/test/resources/apollo-stomp-bdb.xml
URL:
http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-stomp/src/test/resources/apollo-stomp-bdb.xml?rev=1087311&r1=1087310&r2=1087311&view=diff
==============================================================================
---
activemq/activemq-apollo/trunk/apollo-stomp/src/test/resources/apollo-stomp-bdb.xml
(original)
+++
activemq/activemq-apollo/trunk/apollo-stomp/src/test/resources/apollo-stomp-bdb.xml
Thu Mar 31 14:23:38 2011
@@ -27,6 +27,6 @@
</virtual_host>
<web_admin bind="http://127.0.0.1:61680"/>
- <connector id="tcp" protocol="stomp" bind="tcp://[::]:0"/>
+ <connector id="tcp" protocol="stomp" bind="tcp://0.0.0.0:0"/>
</broker>
\ No newline at end of file
Modified:
activemq/activemq-apollo/trunk/apollo-stomp/src/test/resources/apollo-stomp-secure.xml
URL:
http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-stomp/src/test/resources/apollo-stomp-secure.xml?rev=1087311&r1=1087310&r2=1087311&view=diff
==============================================================================
---
activemq/activemq-apollo/trunk/apollo-stomp/src/test/resources/apollo-stomp-secure.xml
(original)
+++
activemq/activemq-apollo/trunk/apollo-stomp/src/test/resources/apollo-stomp-secure.xml
Thu Mar 31 14:23:38 2011
@@ -57,7 +57,7 @@
</queue>
</virtual_host>
- <connector id="tcp" protocol="stomp" bind="tcp://[::]:0">
+ <connector id="tcp" protocol="stomp" bind="tcp://0.0.0.0:0">
<stomp add_user_header="JMSXUserID"/>
</connector>
Modified:
activemq/activemq-apollo/trunk/apollo-stomp/src/test/resources/apollo-stomp-ssl-secure.xml
URL:
http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-stomp/src/test/resources/apollo-stomp-ssl-secure.xml?rev=1087311&r1=1087310&r2=1087311&view=diff
==============================================================================
---
activemq/activemq-apollo/trunk/apollo-stomp/src/test/resources/apollo-stomp-ssl-secure.xml
(original)
+++
activemq/activemq-apollo/trunk/apollo-stomp/src/test/resources/apollo-stomp-ssl-secure.xml
Thu Mar 31 14:23:38 2011
@@ -30,6 +30,6 @@
</virtual_host>
<key_storage file="${basedir}/src/test/resources/apollo.ks"
password="password" key_password="password"/>
- <connector id="ssl" protocol="stomp" bind="ssl://[::]:0" />
+ <connector id="ssl" protocol="stomp" bind="ssl://0.0.0.0:0" />
</broker>
\ No newline at end of file
Modified:
activemq/activemq-apollo/trunk/apollo-stomp/src/test/resources/apollo-stomp-ssl.xml
URL:
http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-stomp/src/test/resources/apollo-stomp-ssl.xml?rev=1087311&r1=1087310&r2=1087311&view=diff
==============================================================================
---
activemq/activemq-apollo/trunk/apollo-stomp/src/test/resources/apollo-stomp-ssl.xml
(original)
+++
activemq/activemq-apollo/trunk/apollo-stomp/src/test/resources/apollo-stomp-ssl.xml
Thu Mar 31 14:23:38 2011
@@ -23,6 +23,6 @@
</virtual_host>
<key_storage file="${basedir}/src/test/resources/apollo.ks"
password="password" key_password="password"/>
- <connector id="ssl" protocol="stomp" bind="ssl://[::]:0" />
+ <connector id="ssl" protocol="stomp" bind="ssl://0.0.0.0:0" />
</broker>
\ No newline at end of file
Modified:
activemq/activemq-apollo/trunk/apollo-stomp/src/test/resources/apollo-stomp.xml
URL:
http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-stomp/src/test/resources/apollo-stomp.xml?rev=1087311&r1=1087310&r2=1087311&view=diff
==============================================================================
---
activemq/activemq-apollo/trunk/apollo-stomp/src/test/resources/apollo-stomp.xml
(original)
+++
activemq/activemq-apollo/trunk/apollo-stomp/src/test/resources/apollo-stomp.xml
Thu Mar 31 14:23:38 2011
@@ -25,6 +25,6 @@
</virtual_host>
- <connector id="tcp" protocol="stomp" bind="tcp://[::]:0"/>
+ <connector id="tcp" protocol="stomp" bind="tcp://0.0.0.0:0"/>
</broker>
\ No newline at end of file
Modified:
activemq/activemq-apollo/trunk/apollo-website/src/documentation/user-manual.md
URL:
http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-website/src/documentation/user-manual.md?rev=1087311&r1=1087310&r2=1087311&view=diff
==============================================================================
---
activemq/activemq-apollo/trunk/apollo-website/src/documentation/user-manual.md
(original)
+++
activemq/activemq-apollo/trunk/apollo-website/src/documentation/user-manual.md
Thu Mar 31 14:23:38 2011
@@ -82,7 +82,7 @@ single connector.
<host_name>localhost</host_name>
</virtual_host>
- <connector id="tcp" bind="tcp://[::]:61613"/>
+ <connector id="tcp" bind="tcp://0.0.0.0:61613"/>
</broker>
{pygmentize}
@@ -118,7 +118,7 @@ header of messages to the id of user tha
use the following configuration:
{pygmentize:: xml}
-<connector id="tcp" bind="tcp://[::]:61613">
+<connector id="tcp" bind="tcp://0.0.0.0:61613">
<stomp add_user_header="user_id"/>
</connector>
{pygmentize}
@@ -391,7 +391,7 @@ Example:
file="${apollo.base}/etc/keystore"
password="password"
key_password="password"/>
- <connector id="tls" bind="tls://[::]:61614"/>
+ <connector id="tls" bind="tls://0.0.0.0:61614"/>
...
{pygmentize}
@@ -438,7 +438,7 @@ to `false`.
<host_name>cheeze.com</host_name>
</virtual_host>
- <connector id="tcp" bind="tcp://[::]:61613"/>
+ <connector id="tcp" bind="tcp://0.0.0.0:61613"/>
</broker>
{pygmentize}
