JBoss hornetq SVN: r9018 - trunk/docs/user-manual/en.
by do-not-reply＠jboss.org
Author: jmesnil
Date: 2010-03-31 04:14:12 -0400 (Wed, 31 Mar 2010)
New Revision: 9018
Modified:
trunk/docs/user-manual/en/management.xml
Log:
Management documentation
* put warning about Remote connections to JMX not enabled by default in a <note> for emphasis
Modified: trunk/docs/user-manual/en/management.xml
===================================================================
--- trunk/docs/user-manual/en/management.xml 2010-03-30 23:24:46 UTC (rev 9017)
+++ trunk/docs/user-manual/en/management.xml 2010-03-31 08:14:12 UTC (rev 9018)
@@ -521,12 +521,14 @@
<!-- false to disable JMX management for HornetQ -->
<jmx-management-enabled>false</jmx-management-enabled>
</programlisting>
- <para>If JMX is enabled, HornetQ can be managed locally using <literal>jconsole</literal>.
- Remote connections to JMX are not enabled by default for security reasons. Please refer
+ <para>If JMX is enabled, HornetQ can be managed locally using <literal>jconsole</literal>.</para>
+ <note>
+ <para>Remote connections to JMX are not enabled by default for security reasons. Please refer
to <ulink url="http://java.sun.com/j2se/1.5.0/docs/guide/management/agent.html#remote"
>Java Management guide</ulink> to configure the server for remote management (system
properties must be set in <literal>run.sh</literal> or <literal>run.bat</literal>
scripts).</para>
+ </note>
<para>By default, HornetQ server uses the JMX domain "org.hornetq". To manage several
HornetQ servers from the <emphasis>same</emphasis> MBeanServer, the JMX domain can be
configured for each individual HornetQ server by setting <literal>jmx-domain</literal>
14 years, 1 month
JBoss hornetq SVN: r9017 - trunk/src/main/org/hornetq/ra/inflow.
by do-not-reply＠jboss.org
Author: clebert.suconic(a)jboss.com
Date: 2010-03-30 19:24:46 -0400 (Tue, 30 Mar 2010)
New Revision: 9017
Modified:
trunk/src/main/org/hornetq/ra/inflow/HornetQActivation.java
Log:
fixing races on setup / teardown
Modified: trunk/src/main/org/hornetq/ra/inflow/HornetQActivation.java
===================================================================
--- trunk/src/main/org/hornetq/ra/inflow/HornetQActivation.java 2010-03-30 16:51:10 UTC (rev 9016)
+++ trunk/src/main/org/hornetq/ra/inflow/HornetQActivation.java 2010-03-30 23:24:46 UTC (rev 9017)
@@ -220,7 +220,6 @@
}
-
/**
* Start the activation
*
@@ -255,7 +254,7 @@
/**
* Stop the activation
*/
- public void stop()
+ public void stop() throws ResourceException
{
if (HornetQActivation.trace)
{
@@ -263,7 +262,7 @@
}
deliveryActive.set(false);
- teardown();
+ ra.getWorkManager().scheduleWork(new TearDownActivation());
}
/**
@@ -271,9 +270,9 @@
*
* @throws Exception Thrown if an error occurs
*/
- protected void setup() throws Exception
+ protected synchronized void setup() throws Exception
{
- HornetQActivation.log.debug("Setting up " + spec);
+ HornetQActivation.log.info("Setting up " + spec);
setupCF();
@@ -288,15 +287,15 @@
handlers.add(handler);
}
- HornetQActivation.log.debug("Setup complete " + this);
+ HornetQActivation.log.info("Setup complete " + this);
}
/**
* Teardown the activation
*/
- protected void teardown()
+ protected synchronized void teardown()
{
- HornetQActivation.log.debug("Tearing down " + spec);
+ HornetQActivation.log.info("Tearing down " + spec);
for (HornetQMessageHandler handler : handlers)
{
@@ -307,7 +306,7 @@
factory.close();
factory = null;
}
- HornetQActivation.log.debug("Tearing down complete " + this);
+ HornetQActivation.log.info("Tearing down complete " + this);
}
protected void setupCF() throws Exception
@@ -497,7 +496,7 @@
}
catch (Throwable t)
{
- HornetQActivation.log.error("Unabler to start activation ", t);
+ HornetQActivation.log.error("Unable to start activation ", t);
}
}
@@ -505,4 +504,26 @@
{
}
}
+
+ /**
+ * Handles the setup
+ */
+ private class TearDownActivation implements Work
+ {
+ public void run()
+ {
+ try
+ {
+ teardown();
+ }
+ catch (Throwable t)
+ {
+ HornetQActivation.log.error("Unable to tear down activation ", t);
+ }
+ }
+
+ public void release()
+ {
+ }
+ }
}
14 years, 1 month
JBoss hornetq SVN: r9016 - in trunk/src/config/jboss-as: non-clustered and 1 other directory.
by do-not-reply＠jboss.org
Author: clebert.suconic(a)jboss.com
Date: 2010-03-30 12:51:10 -0400 (Tue, 30 Mar 2010)
New Revision: 9016
Modified:
trunk/src/config/jboss-as/clustered/hornetq-configuration.xml
trunk/src/config/jboss-as/non-clustered/hornetq-configuration.xml
Log:
Fixing config for AS4 & 5
Modified: trunk/src/config/jboss-as/clustered/hornetq-configuration.xml
===================================================================
--- trunk/src/config/jboss-as/clustered/hornetq-configuration.xml 2010-03-30 15:04:15 UTC (rev 9015)
+++ trunk/src/config/jboss-as/clustered/hornetq-configuration.xml 2010-03-30 16:51:10 UTC (rev 9016)
@@ -26,7 +26,7 @@
<connector name="netty-throughput">
<factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class>
<param key="host" value="${jboss.bind.address:localhost}"/>
- <param key="port" value="${hornetq.remoting.netty.port:5455}"/>
+ <param key="port" value="${hornetq.remoting.netty.batch.port:5455}"/>
<param key="batch-delay" value="50"/>
</connector>
@@ -46,7 +46,7 @@
<acceptor name="netty-throughput">
<factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class>
<param key="host" value="${jboss.bind.address:localhost}"/>
- <param key="port" value="${hornetq.remoting.netty.port:5445}"/>
+ <param key="port" value="${hornetq.remoting.netty.batch.port:5445}"/>
<param key="batch-delay" value="50"/>
</acceptor>
Modified: trunk/src/config/jboss-as/non-clustered/hornetq-configuration.xml
===================================================================
--- trunk/src/config/jboss-as/non-clustered/hornetq-configuration.xml 2010-03-30 15:04:15 UTC (rev 9015)
+++ trunk/src/config/jboss-as/non-clustered/hornetq-configuration.xml 2010-03-30 16:51:10 UTC (rev 9016)
@@ -24,7 +24,7 @@
<connector name="netty-throughput">
<factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class>
<param key="host" value="${jboss.bind.address:localhost}"/>
- <param key="port" value="${hornetq.remoting.netty.port:5455}"/>
+ <param key="port" value="${hornetq.remoting.netty.batch.port:5455}"/>
<param key="batch-delay" value="50"/>
</connector>
@@ -37,14 +37,14 @@
<acceptors>
<acceptor name="netty">
<factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class>
- <param key="host" value="${hornetq.remoting.netty.host:localhost}"/>
+ <param key="host" value="${jboss.bind.address:localhost}"/>
<param key="port" value="${hornetq.remoting.netty.port:5445}"/>
</acceptor>
<acceptor name="netty-throughput">
<factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class>
<param key="host" value="${jboss.bind.address:localhost}"/>
- <param key="port" value="${hornetq.remoting.netty.port:5445}"/>
+ <param key="port" value="${hornetq.remoting.netty.batch.port:5445}"/>
<param key="batch-delay" value="50"/>
</acceptor>
14 years, 1 month
JBoss hornetq SVN: r9015 - branches/HnetQ_323_cn/docs/user-manual/zh.
by do-not-reply＠jboss.org
Author: gaohoward
Date: 2010-03-30 11:04:15 -0400 (Tue, 30 Mar 2010)
New Revision: 9015
Modified:
branches/HnetQ_323_cn/docs/user-manual/zh/filter-expressions.xml
branches/HnetQ_323_cn/docs/user-manual/zh/wildcard-routing.xml
branches/HnetQ_323_cn/docs/user-manual/zh/wildcard-syntax.xml
Log:
another 3 chapters
Modified: branches/HnetQ_323_cn/docs/user-manual/zh/filter-expressions.xml
===================================================================
--- branches/HnetQ_323_cn/docs/user-manual/zh/filter-expressions.xml 2010-03-30 09:46:28 UTC (rev 9014)
+++ branches/HnetQ_323_cn/docs/user-manual/zh/filter-expressions.xml 2010-03-30 15:04:15 UTC (rev 9015)
@@ -19,64 +19,53 @@
<!-- ============================================================================= -->
<chapter id="filter-expressions">
- <title>Filter Expressions</title>
- <para>HornetQ provides a powerful filter language based on a subset of the SQL 92
- expression syntax.</para>
- <para>It is the same as the syntax used for JMS selectors, but the predefined identifiers are
- different. For documentation on JMS selector syntax please the JMS javadoc for <ulink
+ <title>过滤器表达式</title>
+ <para>HornetQ提供了一套强大的过滤器（filter）语言。它的语法是基于SQL 92表达式的部分语法。</para>
+ <para>实际上它与JMS选择器（selector）的语法是相同的。只是其中有一些预定义的标识符有所不同。有关
+ JMS选择器的相关知识参见 <ulink
url="http://java.sun.com/javaee/5/docs/api/javax/jms/Message.html"
- >javax.jms.Message</ulink>.</para>
- <para>Filter expressions are used in several places in HornetQ</para>
+ >javax.jms.Message</ulink>。</para>
+ <para>HornetQ在以下以个地方使用了过滤器表达式：</para>
<itemizedlist>
<listitem>
- <para>Predefined Queues. When pre-defining a queue, either in <literal
- >hornetq-configuration.xml</literal> or <literal>hornetq-jms.xml</literal> a filter
- expression can be defined for a queue. Only messages that match the filter
- expression will enter the queue.</para>
+ <para>预定义的队列。当在<literal
+ >hornetq-configuration.xml</literal> 或 <literal>hornetq-jms.xml</literal>定义
+ 队列时，可以使用过滤器。只有与过滤器表达式相匹配的消息才能达到该队列中。</para>
</listitem>
<listitem>
- <para>Core bridges can be defined with an optional filter expression, only matching
- messages will be bridged (see <xref linkend="core-bridges"/>).</para>
+ <para>核心桥可以使用可选的过滤器表达式。只有与表达式相匹配的消息才被桥处理。
+ 参见(<xref linkend="core-bridges"/>)。</para>
</listitem>
<listitem>
- <para>Diverts can be defined with an optional filter expression, only matching messages
- will be diverted (see <xref linkend="diverts" />).</para>
+ <para>转移（Divert）也可以使用可选的过滤器表达式。只有与表达式匹配的消息才被转移。
+ 参见(<xref linkend="diverts" />)。</para>
</listitem>
<listitem>
- <para>Filter are also used programmatically when creating consumers, queues and in
- several places as described in <xref linkend="management"/>.</para>
+ <para>另外过滤器还可以在编程方式创建接收者（consumer）和队列时使用。还有一些应用过滤器的地方在
+ <xref linkend="management"/>中有所描述。</para>
</listitem>
</itemizedlist>
- <para>There are some differences between JMS selector expressions and HornetQ core
- filter expressions. Whereas JMS selector expressions operate on a JMS message, HornetQ
- core filter expressions operate on a core message.</para>
- <para>The following identifiers can be used in a core filter expressions to refer to attributes
- of the core message in an expression:</para>
+ <para>HornetQ的内核过滤器表达式与JMS选择器表达式是有所不同的。JMS选择器应用于JMS消息，而HornetQ的内核过滤
+ 器表达式则用于内核消息。</para>
+ <para>以下标识符可以用在内核消息的过滤器表达式中，用来引用内核消息的属性：</para>
<itemizedlist>
<listitem>
- <para><literal>HQPriority</literal>. To refer to the priority of a message. Message
- priorities are integers with valid values from <literal>0 - 9</literal>. <literal
- >0</literal> is the lowest priority and <literal>9</literal> is the highest.
- E.g. <literal>HQPriority = 3 AND animal = 'aardvark'</literal></para>
+ <para><literal>HQPriority</literal>。代表消息的优先级。消息优先级属性的有效值为0到9间的整数。
+ 0为最低优先级，9为最高优先级。例：<literal>HQPriority = 3 AND animal = 'aardvark'</literal>。</para>
</listitem>
<listitem>
- <para><literal>HQExpiration</literal>. To refer to the expiration time of a message.
- The value is a long integer.</para>
+ <para><literal>HQExpiration</literal>。代表消息的失效时间。其值为一长整形数。</para>
</listitem>
<listitem>
- <para><literal>HQDurable</literal>. To refer to whether a message is durable or not.
- The value is a string with valid values: <literal>DURABLE</literal> or <literal
- >NON_DURABLE</literal>.</para>
+ <para><literal>HQDurable</literal>。代表消息是否是持久消息。它是一个字符型的属性，有效值为 <literal>DURABLE</literal>
+ 或 <literal>NON_DURABLE</literal>。</para>
</listitem>
<listitem>
- <para><literal>HQTimestamp</literal>. The timestamp of when the message was created.
- The value is a long integer.</para>
+ <para><literal>HQTimestamp</literal>。代表消息的创建时间，其值为一长整形数。</para>
</listitem>
<listitem>
- <para><literal>HQSize</literal>. The size of a message in bytes. The value is an
- integer.</para>
+ <para><literal>HQSize</literal>。消息的大小。单位为字节。其值是一个整形数。</para>
</listitem>
</itemizedlist>
- <para>Any other identifiers used in core filter expressions will be assumed to be properties of
- the message.</para>
+ <para>任何其它的标识符在内核过滤器的表达式中都认为是代表着该消息的一个属性。</para>
</chapter>
Modified: branches/HnetQ_323_cn/docs/user-manual/zh/wildcard-routing.xml
===================================================================
--- branches/HnetQ_323_cn/docs/user-manual/zh/wildcard-routing.xml 2010-03-30 09:46:28 UTC (rev 9014)
+++ branches/HnetQ_323_cn/docs/user-manual/zh/wildcard-routing.xml 2010-03-30 15:04:15 UTC (rev 9015)
@@ -19,21 +19,19 @@
<!-- ============================================================================= -->
<chapter id="wildcard-routing">
- <title>Routing Messages With Wild Cards</title>
- <para>HornetQ allows the routing of messages via wildcard addresses.</para>
- <para>If a consumer is created with an address of say <literal>queue.news.#</literal> then it
- will receive any messages sent to addresses that match this, for instance <literal
- >queue.news.europe</literal> or <literal>queue.news.usa</literal> or <literal
- >queue.news.usa.sport</literal>. This allows a consumer to consume messages which are
- sent to a <emphasis>hierarchy</emphasis> of addresses, rather than the consumer having to
- specify a specific address.</para>
+ <title>使用通配符实现消息路由</title>
+ <para>HornetQ支持使用带通配符的地址对消息路由。</para>
+ <para>例如，当创建一个接收者（consumer）时使用了地址<literal>queue.news.#</literal>，那么它就能接收
+ 所有和这个地址通配符相配的每一个地址的消息。这样的地址如 <literal
+ >queue.news.europe</literal> 或 <literal>queue.news.usa</literal> 或 <literal
+ >queue.news.usa.sport</literal>等。这样一个消息接收者可以接收<literal>一组</literal>相关
+ 的地址的消息，而不是只能指定一个具体的地址。</para>
<note>
- <para>In JMS terminology this allows "topic hierarchies" to be created.</para>
+ <para>用JMS的术语来说，这个功能就是允许创建“话题组”（topic hierarchy）。</para>
</note>
- <para>To enable this functionality set the property <literal>wild-card-routing-enabled</literal>
- in the <literal>hornetq-configuration.xml</literal> file to <literal>true</literal>. This is
- <literal>true</literal> by default.</para>
- <para>For more information on the wild card syntax take a look at <xref
- linkend="wildcard-syntax" /> chapter, also see <xref
- linkend="topic-hierarchy-example" />.</para>
+ <para>要使用本功能需要将<literal>wild-card-routing-enabled</literal>属性设置为<literal>true</literal>。
+ 这个属性在 <literal>hornetq-configuration.xml</literal> 文件中。默认值是<literal>true</literal>。</para>
+ <para>关于通配符的语法参见<xref
+ linkend="wildcard-syntax" /> 章及 <xref
+ linkend="topic-hierarchy-example" />。</para>
</chapter>
Modified: branches/HnetQ_323_cn/docs/user-manual/zh/wildcard-syntax.xml
===================================================================
--- branches/HnetQ_323_cn/docs/user-manual/zh/wildcard-syntax.xml 2010-03-30 09:46:28 UTC (rev 9014)
+++ branches/HnetQ_323_cn/docs/user-manual/zh/wildcard-syntax.xml 2010-03-30 15:04:15 UTC (rev 9015)
@@ -19,21 +19,19 @@
<!-- ============================================================================= -->
<chapter id="wildcard-syntax">
- <title>Understanding the HornetQ Wildcard Syntax</title>
- <para>HornetQ uses a specific syntax for representing wildcards in security settings,
- address settings and when creating consumers.</para>
- <para>The syntax is similar to that used by <ulink url="www.amqp.org">AMQP</ulink>.</para>
- <para>A HornetQ wildcard expression contains words delimited by the character '<literal
- >.</literal>' (full stop).</para>
- <para>The special characters '<literal>#</literal>' and '<literal>*</literal>' also have special
- meaning and can take the place of a word.</para>
- <para>The character '<literal>#</literal>' means 'match any sequence of zero or more
- words'.</para>
- <para>The character '<literal>*</literal>' means 'match a single word'.</para>
- <para>So the wildcard 'news.europe.#' would match 'news.europe', 'news.europe.sport',
- 'news.europe.politics', and 'news.europe.politics.regional' but would not match 'news.usa',
- 'news.usa.sport' nor 'entertainment'.</para>
- <para>The wildcard 'news.*' would match 'news.europe', but not 'news.europe.sport'.</para>
- <para>The wildcard 'news.*.sport' would match 'news.europe.sport' and also 'news.usa.sport', but
- not 'news.europe.politics'.</para>
+ <title>了解 HornetQ 通配符的语法</title>
+ <para>HornetQ使用了一种专门的通配符语法来配置安全、地址及接收者（consumer）的创建。</para>
+ <para>这种语法与 <ulink url="www.amqp.org">AMQP</ulink>所用的语法相似。</para>
+ <para>一个HornetQ的通配符表达式是由一些由“<literal
+ >.</literal>”分隔的单词组成。</para>
+ <para>特殊字符“<literal>#</literal>”和“<literal>*</literal>”在表达式中可作为一个单词，它们代表
+ 特殊的意义。</para>
+ <para>字符“<literal>#</literal>”表示“零或多个单词的任意排列”。</para>
+ <para>字符“<literal>*</literal>”表示“一个单词”。</para>
+ <para>因此，通配符表达式“news.europe.#”可以匹配“news.europe”、“news.europe.sport”、
+ “news.europe.politics”以及“news.europe.politics.regional”，但是与“news.usa”、
+ “news.usa.sport” 及 “entertainment”不相匹配。</para>
+ <para>通配符“news.*”与“news.europe”匹配，但不与“news.europe.sport”匹配。</para>
+ <para>通配符“news.*.sport”与“news.europe.sport”及“news.usa.sport”匹配，但与
+ “news.europe.politics”不匹配。</para>
</chapter>
14 years, 1 month
JBoss hornetq SVN: r9014 - trunk/src/main/org/hornetq/jms/server/impl.
by do-not-reply＠jboss.org
Author: jmesnil
Date: 2010-03-30 05:46:28 -0400 (Tue, 30 Mar 2010)
New Revision: 9014
Modified:
trunk/src/main/org/hornetq/jms/server/impl/JMSServerDeployer.java
Log:
fix JMS Topic deployment
* in JMSServerDeployer.deployTopic, create a single topic with all configured bindings
Modified: trunk/src/main/org/hornetq/jms/server/impl/JMSServerDeployer.java
===================================================================
--- trunk/src/main/org/hornetq/jms/server/impl/JMSServerDeployer.java 2010-03-30 09:18:21 UTC (rev 9013)
+++ trunk/src/main/org/hornetq/jms/server/impl/JMSServerDeployer.java 2010-03-30 09:46:28 UTC (rev 9014)
@@ -167,10 +167,7 @@
private void deployTopic(final Node node) throws Exception
{
TopicConfiguration topicConfig = parser.parseTopicConfiguration(node);
- for (String jndi : topicConfig.getBindings())
- {
- jmsServerManager.createTopic(false, topicConfig.getName(), jndi);
- }
+ jmsServerManager.createTopic(false, topicConfig.getName(), topicConfig.getBindings());
}
/**
14 years, 1 month
JBoss hornetq SVN: r9013 - in trunk: src/config/jboss-as/non-clustered and 12 other directories.
by do-not-reply＠jboss.org
Author: timfox
Date: 2010-03-30 05:18:21 -0400 (Tue, 30 Mar 2010)
New Revision: 9013
Modified:
trunk/src/config/jboss-as-6/clustered/hornetq-jms.xml
trunk/src/config/jboss-as-6/non-clustered/hornetq-jms.xml
trunk/src/config/jboss-as/clustered/hornetq-jms.xml
trunk/src/config/jboss-as/non-clustered/hornetq-jms.xml
trunk/src/config/stand-alone/clustered/hornetq-jms.xml
trunk/src/config/stand-alone/non-clustered/hornetq-jms.xml
trunk/src/config/trunk/clustered/hornetq-jms.xml
trunk/src/config/trunk/non-clustered/hornetq-jms.xml
trunk/src/main/org/hornetq/core/client/impl/ClientConsumerImpl.java
trunk/src/main/org/hornetq/core/client/impl/ClientProducerImpl.java
trunk/src/main/org/hornetq/core/message/impl/MessageImpl.java
trunk/src/main/org/hornetq/core/message/impl/MessageInternal.java
trunk/src/main/org/hornetq/core/server/ServerMessage.java
trunk/src/main/org/hornetq/core/server/impl/ServerMessageImpl.java
trunk/src/main/org/hornetq/core/server/impl/ServerSessionImpl.java
trunk/src/main/org/hornetq/jms/client/HornetQMessageProducer.java
trunk/tests/src/org/hornetq/tests/unit/core/postoffice/impl/BindingsImplTest.java
Log:
mainly default address optimisation
Modified: trunk/src/config/jboss-as/clustered/hornetq-jms.xml
===================================================================
--- trunk/src/config/jboss-as/clustered/hornetq-jms.xml 2010-03-30 09:11:31 UTC (rev 9012)
+++ trunk/src/config/jboss-as/clustered/hornetq-jms.xml 2010-03-30 09:18:21 UTC (rev 9013)
@@ -12,6 +12,16 @@
</entries>
</connection-factory>
+ <connection-factory name="NettyThroughputConnectionFactory">
+ <connectors>
+ <connector-ref connector-name="netty-throughput"/>
+ </connectors>
+ <entries>
+ <entry name="/ThroughputConnectionFactory"/>
+ <entry name="/XAThroughputConnectionFactory"/>
+ </entries>
+ /connection-factory>
+
<connection-factory name="InVMConnectionFactory">
<connectors>
<connector-ref connector-name="in-vm"/>
Modified: trunk/src/config/jboss-as/non-clustered/hornetq-jms.xml
===================================================================
--- trunk/src/config/jboss-as/non-clustered/hornetq-jms.xml 2010-03-30 09:11:31 UTC (rev 9012)
+++ trunk/src/config/jboss-as/non-clustered/hornetq-jms.xml 2010-03-30 09:18:21 UTC (rev 9013)
@@ -12,6 +12,16 @@
</entries>
</connection-factory>
+ <connection-factory name="NettyThroughputConnectionFactory">
+ <connectors>
+ <connector-ref connector-name="netty-throughput"/>
+ </connectors>
+ <entries>
+ <entry name="/ThroughputConnectionFactory"/>
+ <entry name="/XAThroughputConnectionFactory"/>
+ </entries>
+ </connection-factory>
+
<connection-factory name="InVMConnectionFactory">
<connectors>
<connector-ref connector-name="in-vm"/>
Modified: trunk/src/config/jboss-as-6/clustered/hornetq-jms.xml
===================================================================
--- trunk/src/config/jboss-as-6/clustered/hornetq-jms.xml 2010-03-30 09:11:31 UTC (rev 9012)
+++ trunk/src/config/jboss-as-6/clustered/hornetq-jms.xml 2010-03-30 09:18:21 UTC (rev 9013)
@@ -12,6 +12,16 @@
</entries>
</connection-factory>
+ <connection-factory name="NettyThroughputConnectionFactory">
+ <connectors>
+ <connector-ref connector-name="netty-throughput"/>
+ </connectors>
+ <entries>
+ <entry name="/ThroughputConnectionFactory"/>
+ <entry name="/XAThroughputConnectionFactory"/>
+ </entries>
+ </connection-factory>
+
<connection-factory name="InVMConnectionFactory">
<connectors>
<connector-ref connector-name="in-vm"/>
Modified: trunk/src/config/jboss-as-6/non-clustered/hornetq-jms.xml
===================================================================
--- trunk/src/config/jboss-as-6/non-clustered/hornetq-jms.xml 2010-03-30 09:11:31 UTC (rev 9012)
+++ trunk/src/config/jboss-as-6/non-clustered/hornetq-jms.xml 2010-03-30 09:18:21 UTC (rev 9013)
@@ -12,6 +12,16 @@
</entries>
</connection-factory>
+ <connection-factory name="NettyThroughputConnectionFactory">
+ <connectors>
+ <connector-ref connector-name="netty-throughput"/>
+ </connectors>
+ <entries>
+ <entry name="/ThroughputConnectionFactory"/>
+ <entry name="/XAThroughputConnectionFactory"/>
+ </entries>
+ </connection-factory>
+
<connection-factory name="InVMConnectionFactory">
<connectors>
<connector-ref connector-name="in-vm"/>
Modified: trunk/src/config/stand-alone/clustered/hornetq-jms.xml
===================================================================
--- trunk/src/config/stand-alone/clustered/hornetq-jms.xml 2010-03-30 09:11:31 UTC (rev 9012)
+++ trunk/src/config/stand-alone/clustered/hornetq-jms.xml 2010-03-30 09:18:21 UTC (rev 9013)
@@ -12,6 +12,16 @@
</entries>
</connection-factory>
+ <connection-factory name="NettyThroughputConnectionFactory">
+ <connectors>
+ <connector-ref connector-name="netty-throughput"/>
+ </connectors>
+ <entries>
+ <entry name="/ThroughputConnectionFactory"/>
+ <entry name="/XAThroughputConnectionFactory"/>
+ </entries>
+ </connection-factory>
+
<queue name="DLQ">
<entry name="/queue/DLQ"/>
</queue>
Modified: trunk/src/config/stand-alone/non-clustered/hornetq-jms.xml
===================================================================
--- trunk/src/config/stand-alone/non-clustered/hornetq-jms.xml 2010-03-30 09:11:31 UTC (rev 9012)
+++ trunk/src/config/stand-alone/non-clustered/hornetq-jms.xml 2010-03-30 09:18:21 UTC (rev 9013)
@@ -12,6 +12,16 @@
</entries>
</connection-factory>
+ <connection-factory name="NettyThroughputConnectionFactory">
+ <connectors>
+ <connector-ref connector-name="netty-throughput"/>
+ </connectors>
+ <entries>
+ <entry name="/ThroughputConnectionFactory"/>
+ <entry name="/XAThroughputConnectionFactory"/>
+ </entries>
+ </connection-factory>
+
<queue name="DLQ">
<entry name="/queue/DLQ"/>
</queue>
Modified: trunk/src/config/trunk/clustered/hornetq-jms.xml
===================================================================
--- trunk/src/config/trunk/clustered/hornetq-jms.xml 2010-03-30 09:11:31 UTC (rev 9012)
+++ trunk/src/config/trunk/clustered/hornetq-jms.xml 2010-03-30 09:18:21 UTC (rev 9013)
@@ -12,6 +12,16 @@
</entries>
</connection-factory>
+ <connection-factory name="NettyThroughputConnectionFactory">
+ <connectors>
+ <connector-ref connector-name="netty-throughput"/>
+ </connectors>
+ <entries>
+ <entry name="/ThroughputConnectionFactory"/>
+ <entry name="/XAThroughputConnectionFactory"/>
+ </entries>
+ </connection-factory>
+
<queue name="DLQ">
<entry name="/queue/DLQ"/>
</queue>
Modified: trunk/src/config/trunk/non-clustered/hornetq-jms.xml
===================================================================
--- trunk/src/config/trunk/non-clustered/hornetq-jms.xml 2010-03-30 09:11:31 UTC (rev 9012)
+++ trunk/src/config/trunk/non-clustered/hornetq-jms.xml 2010-03-30 09:18:21 UTC (rev 9013)
@@ -12,6 +12,18 @@
</entries>
</connection-factory>
+ <!--
+ <connection-factory name="NettyThroughputConnectionFactory">
+ <connectors>
+ <connector-ref connector-name="netty-throughput"/>
+ </connectors>
+ <entries>
+ <entry name="/ThroughputConnectionFactory"/>
+ <entry name="/XAThroughputConnectionFactory"/>
+ </entries>
+ </connection-factory>
+ -->
+
<queue name="DLQ">
<entry name="/queue/DLQ"/>
</queue>
Modified: trunk/src/main/org/hornetq/core/client/impl/ClientConsumerImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/client/impl/ClientConsumerImpl.java 2010-03-30 09:11:31 UTC (rev 9012)
+++ trunk/src/main/org/hornetq/core/client/impl/ClientConsumerImpl.java 2010-03-30 09:18:21 UTC (rev 9013)
@@ -465,6 +465,11 @@
}
ClientMessageInternal messageToHandle = message;
+
+ if (messageToHandle.getAddress() == null)
+ {
+ messageToHandle.setAddressTransient(queueInfo.getAddress());
+ }
messageToHandle.onReceipt(this);
Modified: trunk/src/main/org/hornetq/core/client/impl/ClientProducerImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/client/impl/ClientProducerImpl.java 2010-03-30 09:11:31 UTC (rev 9012)
+++ trunk/src/main/org/hornetq/core/client/impl/ClientProducerImpl.java 2010-03-30 09:18:21 UTC (rev 9013)
@@ -214,22 +214,43 @@
MessageInternal msgI = (MessageInternal)msg;
ClientProducerCredits theCredits;
+
+ boolean isLarge;
+ if (msgI.getBodyInputStream() != null || msgI.isLargeMessage())
+ {
+ isLarge = true;
+ }
+ else
+ {
+ isLarge = false;
+ }
+
if (address != null)
{
- //session.setAddress(msg, address);
+ if (!isLarge)
+ {
+ session.setAddress(msg, address);
+ }
+ else
+ {
+ msg.setAddress(address);
+ }
- msg.setAddress(address);
-
// Anonymous
theCredits = session.getCredits(address, true);
}
else
{
- //session.setAddress(msg, this.address);
+ if (!isLarge)
+ {
+ session.setAddress(msg, this.address);
+ }
+ else
+ {
+ msg.setAddress(this.address);
+ }
- msg.setAddress(this.address);
-
theCredits = credits;
}
@@ -249,17 +270,8 @@
session.workDone();
- boolean isLarge;
+
- if (msgI.getBodyInputStream() != null || msgI.isLargeMessage())
- {
- isLarge = true;
- }
- else
- {
- isLarge = false;
- }
-
if (isLarge)
{
largeMessageSend(sendBlocking, msgI, theCredits);
Modified: trunk/src/main/org/hornetq/core/message/impl/MessageImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/message/impl/MessageImpl.java 2010-03-30 09:11:31 UTC (rev 9012)
+++ trunk/src/main/org/hornetq/core/message/impl/MessageImpl.java 2010-03-30 09:18:21 UTC (rev 9013)
@@ -444,7 +444,13 @@
return buffer;
}
}
+
+ public void setAddressTransient(final SimpleString address)
+ {
+ this.address = address;
+ }
+
// Properties
// ---------------------------------------------------------------------------------------
Modified: trunk/src/main/org/hornetq/core/message/impl/MessageInternal.java
===================================================================
--- trunk/src/main/org/hornetq/core/message/impl/MessageInternal.java 2010-03-30 09:11:31 UTC (rev 9012)
+++ trunk/src/main/org/hornetq/core/message/impl/MessageInternal.java 2010-03-30 09:18:21 UTC (rev 9013)
@@ -18,6 +18,7 @@
import org.hornetq.api.core.HornetQBuffer;
import org.hornetq.api.core.HornetQException;
import org.hornetq.api.core.Message;
+import org.hornetq.api.core.SimpleString;
import org.hornetq.core.message.BodyEncoder;
/**
@@ -56,4 +57,6 @@
BodyEncoder getBodyEncoder() throws HornetQException;
InputStream getBodyInputStream();
+
+ void setAddressTransient(SimpleString address);
}
Modified: trunk/src/main/org/hornetq/core/server/ServerMessage.java
===================================================================
--- trunk/src/main/org/hornetq/core/server/ServerMessage.java 2010-03-30 09:11:31 UTC (rev 9012)
+++ trunk/src/main/org/hornetq/core/server/ServerMessage.java 2010-03-30 09:18:21 UTC (rev 9013)
@@ -13,6 +13,7 @@
package org.hornetq.core.server;
+import org.hornetq.api.core.SimpleString;
import org.hornetq.core.journal.EncodingSupport;
import org.hornetq.core.message.impl.MessageInternal;
import org.hornetq.core.paging.PagingStore;
Modified: trunk/src/main/org/hornetq/core/server/impl/ServerMessageImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/server/impl/ServerMessageImpl.java 2010-03-30 09:11:31 UTC (rev 9012)
+++ trunk/src/main/org/hornetq/core/server/impl/ServerMessageImpl.java 2010-03-30 09:18:21 UTC (rev 9013)
@@ -316,5 +316,5 @@
buffer.setLong(buffer.getInt(MessageImpl.BUFFER_HEADER_SPACE) + DataConstants.SIZE_INT, messageID);
}
-
+
}
Modified: trunk/src/main/org/hornetq/core/server/impl/ServerSessionImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/server/impl/ServerSessionImpl.java 2010-03-30 09:11:31 UTC (rev 9012)
+++ trunk/src/main/org/hornetq/core/server/impl/ServerSessionImpl.java 2010-03-30 09:18:21 UTC (rev 9013)
@@ -131,6 +131,8 @@
private final RoutingContext routingContext = new RoutingContextImpl(null);
private final SessionCallback callback;
+
+ private volatile SimpleString defaultAddress;
// Constructors ---------------------------------------------------------------------------------
@@ -905,8 +907,6 @@
currentLargeMessage = msg;
}
- private volatile SimpleString defaultAddress;
-
public void send(final ServerMessage message) throws Exception
{
long id = storageManager.generateUniqueID();
@@ -916,7 +916,17 @@
if (message.getAddress() == null)
{
- message.setAddress(defaultAddress);
+ if (message.isDurable())
+ {
+ //We need to force a re-encode when the message gets persisted or when it gets reloaded
+ //it will have no address
+ message.setAddress(defaultAddress);
+ }
+ else
+ {
+ //We don't want to force a re-encode when the message gets sent to the consumer
+ message.setAddressTransient(defaultAddress);
+ }
}
if (message.getAddress().equals(managementAddress))
Modified: trunk/src/main/org/hornetq/jms/client/HornetQMessageProducer.java
===================================================================
--- trunk/src/main/org/hornetq/jms/client/HornetQMessageProducer.java 2010-03-30 09:11:31 UTC (rev 9012)
+++ trunk/src/main/org/hornetq/jms/client/HornetQMessageProducer.java 2010-03-30 09:18:21 UTC (rev 9013)
@@ -413,6 +413,36 @@
msg.resetMessageID(null);
}
+
+// if (!disableMessageID)
+// {
+// // Generate an id
+//
+// UUID uid = UUIDGenerator.getInstance().generateUUID();
+//
+// byte[] bytes = uid.asBytes();
+//
+// long id1 = bytes[0] << 56 | bytes[1] << 48 |
+// bytes[2] << 40 |
+// bytes[3] << 32 |
+// bytes[4] << 24 |
+// bytes[5] << 16 |
+// bytes[6] << 8 |
+// bytes[7];
+//
+// long id2 = bytes[8] << 56 | bytes[9] << 48 |
+// bytes[10] << 40 |
+// bytes[11] << 32 |
+// bytes[12] << 24 |
+// bytes[13] << 16 |
+// bytes[14] << 8 |
+// bytes[15];
+//
+// //We store it as two longs in the message, as it's a more compact format
+// msg.getCoreMessage().setClientMessageID(id1, id2);
+//
+// msg.resetMessageID(null);
+// }
if (foreign)
{
Modified: trunk/tests/src/org/hornetq/tests/unit/core/postoffice/impl/BindingsImplTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/unit/core/postoffice/impl/BindingsImplTest.java 2010-03-30 09:11:31 UTC (rev 9012)
+++ trunk/tests/src/org/hornetq/tests/unit/core/postoffice/impl/BindingsImplTest.java 2010-03-30 09:18:21 UTC (rev 9013)
@@ -880,6 +880,12 @@
}
+ public void setAddressTransient(SimpleString address)
+ {
+ // TODO Auto-generated method stub
+
+ }
+
}
class FakeFilter implements Filter
14 years, 1 month
JBoss hornetq SVN: r9012 - projects/jopr-plugin/trunk/src/main/java/org/jboss/as/integration/hornetq/jopr.
by do-not-reply＠jboss.org
Author: ataylor
Date: 2010-03-30 05:11:31 -0400 (Tue, 30 Mar 2010)
New Revision: 9012
Modified:
projects/jopr-plugin/trunk/src/main/java/org/jboss/as/integration/hornetq/jopr/JMSQueueComponent.java
projects/jopr-plugin/trunk/src/main/java/org/jboss/as/integration/hornetq/jopr/JMSResourceComponent.java
projects/jopr-plugin/trunk/src/main/java/org/jboss/as/integration/hornetq/jopr/JMSTopicComponent.java
Log:
plugin fixes
Modified: projects/jopr-plugin/trunk/src/main/java/org/jboss/as/integration/hornetq/jopr/JMSQueueComponent.java
===================================================================
--- projects/jopr-plugin/trunk/src/main/java/org/jboss/as/integration/hornetq/jopr/JMSQueueComponent.java 2010-03-30 08:21:34 UTC (rev 9011)
+++ projects/jopr-plugin/trunk/src/main/java/org/jboss/as/integration/hornetq/jopr/JMSQueueComponent.java 2010-03-30 09:11:31 UTC (rev 9012)
@@ -181,7 +181,7 @@
private void createRoles(ConfigurationUpdateReport configurationUpdateReport, String name, StringBuffer sendRoles, StringBuffer consumeRoles)
{
- PropertyList propertyList = (PropertyList) configurationUpdateReport.getConfiguration().get("securityConfig");
+ PropertyList propertyList = (PropertyList) configurationUpdateReport.getConfiguration().get("roles");
if(propertyList == null)
{
return;
Modified: projects/jopr-plugin/trunk/src/main/java/org/jboss/as/integration/hornetq/jopr/JMSResourceComponent.java
===================================================================
--- projects/jopr-plugin/trunk/src/main/java/org/jboss/as/integration/hornetq/jopr/JMSResourceComponent.java 2010-03-30 08:21:34 UTC (rev 9011)
+++ projects/jopr-plugin/trunk/src/main/java/org/jboss/as/integration/hornetq/jopr/JMSResourceComponent.java 2010-03-30 09:11:31 UTC (rev 9012)
@@ -127,13 +127,13 @@
}
else if(mv instanceof CollectionValueSupport)
{
- PropertyList property = new PropertyList("securityConfig");
+ PropertyList property = new PropertyList("roles");
CollectionValueSupport valueSupport = (CollectionValueSupport) mv;
MetaValue[] msgs = valueSupport.getElements();
for (MetaValue mv2 : msgs)
{
CompositeValueSupport msg = (CompositeValueSupport) mv2;
- org.rhq.core.domain.configuration.PropertyMap p1 = new org.rhq.core.domain.configuration.PropertyMap("element");
+ org.rhq.core.domain.configuration.PropertyMap p1 = new org.rhq.core.domain.configuration.PropertyMap("role");
property.add(p1);
ImmutableCompositeMetaType metaType = (ImmutableCompositeMetaType) msg.getMetaType();
Set<String> keys = metaType.keySet();
Modified: projects/jopr-plugin/trunk/src/main/java/org/jboss/as/integration/hornetq/jopr/JMSTopicComponent.java
===================================================================
--- projects/jopr-plugin/trunk/src/main/java/org/jboss/as/integration/hornetq/jopr/JMSTopicComponent.java 2010-03-30 08:21:34 UTC (rev 9011)
+++ projects/jopr-plugin/trunk/src/main/java/org/jboss/as/integration/hornetq/jopr/JMSTopicComponent.java 2010-03-30 09:11:31 UTC (rev 9012)
@@ -167,7 +167,7 @@
private void createRoles(ConfigurationUpdateReport configurationUpdateReport, String name, StringBuffer sendRoles, StringBuffer consumeRoles, StringBuffer createNonDurableRoles, StringBuffer deleteNonDurableRoles, StringBuffer createDurableRoles, StringBuffer deleteDurableRoles)
{
- PropertyList propertyList = (PropertyList) configurationUpdateReport.getConfiguration().get("securityConfig");
+ PropertyList propertyList = (PropertyList) configurationUpdateReport.getConfiguration().get("roles");
List<Property> roles = propertyList.getList();
for (Property role : roles)
{
14 years, 1 month
JBoss hornetq SVN: r9011 - in trunk: tests/src/org/hornetq/tests/integration/management and 1 other directory.
by do-not-reply＠jboss.org
Author: jmesnil
Date: 2010-03-30 04:21:34 -0400 (Tue, 30 Mar 2010)
New Revision: 9011
Modified:
trunk/src/main/org/hornetq/api/core/management/HornetQServerControl.java
trunk/tests/src/org/hornetq/tests/integration/management/HornetQServerControlUsingCoreTest.java
Log:
fix HornetQServetControlUsingCoreTest
Modified: trunk/src/main/org/hornetq/api/core/management/HornetQServerControl.java
===================================================================
--- trunk/src/main/org/hornetq/api/core/management/HornetQServerControl.java 2010-03-30 08:04:18 UTC (rev 9010)
+++ trunk/src/main/org/hornetq/api/core/management/HornetQServerControl.java 2010-03-30 08:21:34 UTC (rev 9011)
@@ -519,7 +519,7 @@
@Parameter(desc="do we send to the DLA when there is no where to route the message", name="sendToDLAOnNoRoute") boolean sendToDLAOnNoRoute,
@Parameter(desc="the ploicy to use when the address is full", name="addressFullMessagePolicy") String addressFullMessagePolicy) throws Exception;
- AddressSettings getAddressSettings(String address);
+ AddressSettings getAddressSettings(String address) throws Exception;
void removeAddressSettings(String addressMatch) throws Exception;
Modified: trunk/tests/src/org/hornetq/tests/integration/management/HornetQServerControlUsingCoreTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/management/HornetQServerControlUsingCoreTest.java 2010-03-30 08:04:18 UTC (rev 9010)
+++ trunk/tests/src/org/hornetq/tests/integration/management/HornetQServerControlUsingCoreTest.java 2010-03-30 08:21:34 UTC (rev 9011)
@@ -13,6 +13,7 @@
package org.hornetq.tests.integration.management;
+import org.hornetq.api.core.SimpleString;
import org.hornetq.api.core.TransportConfiguration;
import org.hornetq.api.core.client.ClientSession;
import org.hornetq.api.core.client.ClientSessionFactory;
@@ -23,7 +24,9 @@
import org.hornetq.core.config.Configuration;
import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory;
import org.hornetq.core.security.Role;
+import org.hornetq.core.settings.impl.AddressFullMessagePolicy;
import org.hornetq.core.settings.impl.AddressSettings;
+import org.hornetq.utils.json.JSONObject;
import java.util.Set;
@@ -499,19 +502,42 @@
return (String)proxy.invokeOperation("getRolesAsJSON", addressMatch);
}
- public void addAddressSettings(@Parameter(desc = "an address match", name = "addressMatch") String addressMatch, @Parameter(desc = "the dead letter address setting", name = "DLA") String DLA, @Parameter(desc = "the expiry address setting", name = "expiryAddress") String expiryAddress, @Parameter(desc = "are any queues created for this address a last value queue", name = "lastValueQueue") boolean lastValueQueue, @Parameter(desc = "the delivery attempts", name = "deliveryAttempts") int deliveryAttempts, @Parameter(desc = "the max size in bytes", name = "maxSizeBytes") long maxSizeBytes, @Parameter(desc = "the page size in bytes", name = "pageSizeBytes") int pageSizeBytes, @Parameter(desc = "the redelivery delay", name = "redeliveryDelay") long redeliveryDelay, @Parameter(desc = "the redistribution delay", name = "redistributionDelay") long redistributionDelay, @Parameter(desc = "do we send to the DLA when there is no where to route the message", name = "sendToDLAOnNo!
Route") boolean sendToDLAOnNoRoute, @Parameter(desc = "the ploicy to use when the address is full", name = "addressFullMessagePolicy") String addressFullMessagePolicy) throws Exception
+ public void addAddressSettings(@Parameter(desc = "an address match", name = "addressMatch") String addressMatch,
+ @Parameter(desc = "the dead letter address setting", name = "DLA") String DLA,
+ @Parameter(desc = "the expiry address setting", name = "expiryAddress") String expiryAddress,
+ @Parameter(desc = "are any queues created for this address a last value queue", name = "lastValueQueue") boolean lastValueQueue,
+ @Parameter(desc = "the delivery attempts", name = "deliveryAttempts") int deliveryAttempts,
+ @Parameter(desc = "the max size in bytes", name = "maxSizeBytes") long maxSizeBytes,
+ @Parameter(desc = "the page size in bytes", name = "pageSizeBytes") int pageSizeBytes,
+ @Parameter(desc = "the redelivery delay", name = "redeliveryDelay") long redeliveryDelay,
+ @Parameter(desc = "the redistribution delay", name = "redistributionDelay") long redistributionDelay,
+ @Parameter(desc = "do we send to the DLA when there is no where to route the message", name = "sendToDLAOnNoRoute") boolean sendToDLAOnNoRoute,
+ @Parameter(desc = "the ploicy to use when the address is full", name = "addressFullMessagePolicy") String addressFullMessagePolicy) throws Exception
{
- //To change body of implemented methods use File | Settings | File Templates.
+ proxy.invokeOperation("addAddressSettings", addressMatch, DLA, expiryAddress, lastValueQueue, deliveryAttempts, maxSizeBytes, pageSizeBytes, redeliveryDelay, redistributionDelay, sendToDLAOnNoRoute, addressFullMessagePolicy);
}
- public AddressSettings getAddressSettings(String address)
+ public AddressSettings getAddressSettings(String address) throws Exception
{
- return null; //To change body of implemented methods use File | Settings | File Templates.
+ String res = (String)proxy.invokeOperation("getAddressSettingsAsJSON", address);
+ JSONObject object = new JSONObject(res);
+ AddressSettings settings = new AddressSettings();
+ settings.setDeadLetterAddress(SimpleString.toSimpleString(object.getString("DLA")));
+ settings.setExpiryAddress(SimpleString.toSimpleString(object.getString("expiryAddress")));
+ settings.setLastValueQueue(object.getBoolean("lastValueQueue"));
+ settings.setMaxDeliveryAttempts(object.getInt("maxDeliveryAttempts"));
+ settings.setMaxSizeBytes(object.getLong("maxSizeBytes"));
+ settings.setPageSizeBytes(object.getInt("pageSizeBytes"));
+ settings.setRedeliveryDelay(object.getLong("redeliveryDelay"));
+ settings.setRedistributionDelay(object.getLong("redistributionDelay"));
+ settings.setSendToDLAOnNoRoute(object.getBoolean("sendToDLAOnNoRoute"));
+ settings.setAddressFullMessagePolicy(AddressFullMessagePolicy.valueOf(object.getString("addressFullMessagePolicy")));
+ return settings;
}
- public void removeAddressSettings(String addressMatch)
+ public void removeAddressSettings(String addressMatch) throws Exception
{
- //To change body of implemented methods use File | Settings | File Templates.
+ proxy.invokeOperation("removeAddressSettings", addressMatch);
}
public String getAddressSettingsAsJSON(@Parameter(desc = "an address match", name = "addressMatch") String addressMatch) throws Exception
14 years, 1 month
JBoss hornetq SVN: r9010 - trunk/src/main/org/hornetq/integration/transports/netty.
by do-not-reply＠jboss.org
Author: ataylor
Date: 2010-03-30 04:04:18 -0400 (Tue, 30 Mar 2010)
New Revision: 9010
Modified:
trunk/src/main/org/hornetq/integration/transports/netty/NettyAcceptor.java
Log:
added host and port debug
Modified: trunk/src/main/org/hornetq/integration/transports/netty/NettyAcceptor.java
===================================================================
--- trunk/src/main/org/hornetq/integration/transports/netty/NettyAcceptor.java 2010-03-30 05:58:49 UTC (rev 9009)
+++ trunk/src/main/org/hornetq/integration/transports/netty/NettyAcceptor.java 2010-03-30 08:04:18 UTC (rev 9010)
@@ -412,7 +412,7 @@
batchFlusherFuture = scheduledThreadPool.scheduleWithFixedDelay(flusher, batchDelay, batchDelay, TimeUnit.MILLISECONDS);
}
- NettyAcceptor.log.info("Started Netty Acceptor version " + Version.ID);
+ NettyAcceptor.log.info("Started Netty Acceptor version " + Version.ID + " " + host + ":" + port);
}
private void startServerChannels()
14 years, 1 month
JBoss hornetq SVN: r9009 - trunk/tests/src/org/hornetq/tests/integration/management.
by do-not-reply＠jboss.org
Author: clebert.suconic(a)jboss.com
Date: 2010-03-30 01:58:49 -0400 (Tue, 30 Mar 2010)
New Revision: 9009
Modified:
trunk/tests/src/org/hornetq/tests/integration/management/HornetQServerControlTest.java
trunk/tests/src/org/hornetq/tests/integration/management/HornetQServerControlUsingCoreTest.java
Log:
tweaks
Modified: trunk/tests/src/org/hornetq/tests/integration/management/HornetQServerControlTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/management/HornetQServerControlTest.java 2010-03-30 05:53:14 UTC (rev 9008)
+++ trunk/tests/src/org/hornetq/tests/integration/management/HornetQServerControlTest.java 2010-03-30 05:58:49 UTC (rev 9009)
@@ -393,6 +393,12 @@
Assert.assertEquals(newSample, serverControl.getMessageCounterSamplePeriod());
}
+ protected void restartServer() throws Exception
+ {
+ server.stop();
+ server.start();
+ }
+
public void testSecuritySettings() throws Exception
{
HornetQServerControl serverControl = createManagementControl();
@@ -404,8 +410,7 @@
// Restart the server. Those settings should be persisted
- server.stop();
- server.start();
+ restartServer();
serverControl = createManagementControl();
@@ -473,8 +478,7 @@
sendToDLAOnNoRoute,
addressFullMessagePolicy);
- server.stop();
- server.start();
+ //restartServer();
serverControl = createManagementControl();
AddressSettings settings = serverControl.getAddressSettings(exactAddress);
Modified: trunk/tests/src/org/hornetq/tests/integration/management/HornetQServerControlUsingCoreTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/management/HornetQServerControlUsingCoreTest.java 2010-03-30 05:53:14 UTC (rev 9008)
+++ trunk/tests/src/org/hornetq/tests/integration/management/HornetQServerControlUsingCoreTest.java 2010-03-30 05:58:49 UTC (rev 9009)
@@ -79,7 +79,19 @@
super.tearDown();
}
+
+ protected void restartServer() throws Exception
+ {
+ session.close();
+
+ super.restartServer();
+
+ ClientSessionFactory sf = HornetQClient.createClientSessionFactory(new TransportConfiguration(InVMConnectorFactory.class.getName()));
+ session = sf.createSession(false, true, true);
+ session.start();
+ }
+
@Override
protected HornetQServerControl createManagementControl() throws Exception
{
14 years, 1 month