You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by da...@apache.org on 2013/10/10 13:59:55 UTC
[1/2] git commit: AMQ-4795: Enable amqp transport out of the box in
activemq-karaf
Updated Branches:
refs/heads/trunk 05bc25cb8 -> 0e5ff6b48
AMQ-4795: Enable amqp transport out of the box in activemq-karaf
Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/0e5ff6b4
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/0e5ff6b4
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/0e5ff6b4
Branch: refs/heads/trunk
Commit: 0e5ff6b48556afd649ebb204bef4605d70d92810
Parents: 8bfd36a
Author: Claus Ibsen <cl...@gmail.com>
Authored: Thu Oct 10 13:59:40 2013 +0200
Committer: Claus Ibsen <cl...@gmail.com>
Committed: Thu Oct 10 13:59:49 2013 +0200
----------------------------------------------------------------------
activemq-karaf/src/main/resources/activemq.xml | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq/blob/0e5ff6b4/activemq-karaf/src/main/resources/activemq.xml
----------------------------------------------------------------------
diff --git a/activemq-karaf/src/main/resources/activemq.xml b/activemq-karaf/src/main/resources/activemq.xml
index d774ea1..93cd335 100644
--- a/activemq-karaf/src/main/resources/activemq.xml
+++ b/activemq-karaf/src/main/resources/activemq.xml
@@ -71,7 +71,9 @@
</systemUsage>
<transportConnectors>
- <transportConnector name="openwire" uri="tcp://0.0.0.0:61616?maximumConnections=1000"/>
+ <!-- DOS protection, limit concurrent connections to 1000 and frame size to 100MB -->
+ <transportConnector name="openwire" uri="tcp://0.0.0.0:61616?maximumConnections=1000&wireFormat.maxFrameSize=104857600"/>
+ <transportConnector name="amqp" uri="amqp://0.0.0.0:5672?maximumConnections=1000&wireFormat.maxFrameSize=104857600"/>
</transportConnectors>
</broker>
[2/2] git commit: Polished
Posted by da...@apache.org.
Polished
Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/8bfd36a1
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/8bfd36a1
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/8bfd36a1
Branch: refs/heads/trunk
Commit: 8bfd36a1fd58897b465ddecdfdbc56d55340cba3
Parents: 05bc25c
Author: Claus Ibsen <cl...@gmail.com>
Authored: Thu Oct 10 12:44:20 2013 +0200
Committer: Claus Ibsen <cl...@gmail.com>
Committed: Thu Oct 10 13:59:49 2013 +0200
----------------------------------------------------------------------
activemq-web-console/src/main/webapp/index.jsp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq/blob/8bfd36a1/activemq-web-console/src/main/webapp/index.jsp
----------------------------------------------------------------------
diff --git a/activemq-web-console/src/main/webapp/index.jsp b/activemq-web-console/src/main/webapp/index.jsp
index 900e028..1a858b5 100644
--- a/activemq-web-console/src/main/webapp/index.jsp
+++ b/activemq-web-console/src/main/webapp/index.jsp
@@ -23,11 +23,11 @@
<h2>Welcome!</h2>
<p>
-Welcome to the ActiveMQ Console of <b>${requestContext.brokerQuery.brokerName}</b> (${requestContext.brokerQuery.brokerAdmin.brokerId})
+Welcome to the Apache ActiveMQ Console of <b>${requestContext.brokerQuery.brokerName}</b> (${requestContext.brokerQuery.brokerAdmin.brokerId})
</p>
<p>
-You can find more information about ActiveMQ on the <a href="http://activemq.apache.org/">Apache ActiveMQ Site</a>
+You can find more information about Apache ActiveMQ on the <a href="http://activemq.apache.org/">Apache ActiveMQ Site</a>
</p>
<h2>Broker</h2>