JBoss hornetq SVN: r9275 - trunk/docs/user-manual/en.
by do-not-reply＠jboss.org
Author: gaohoward
Date: 2010-05-27 22:46:51 -0400 (Thu, 27 May 2010)
New Revision: 9275
Modified:
trunk/docs/user-manual/en/management.xml
Log:
scale console1.png to fit the page width
Modified: trunk/docs/user-manual/en/management.xml
===================================================================
--- trunk/docs/user-manual/en/management.xml 2010-05-27 21:02:02 UTC (rev 9274)
+++ trunk/docs/user-manual/en/management.xml 2010-05-28 02:46:51 UTC (rev 9275)
@@ -927,7 +927,7 @@
on the queue in the admin console. The following section explains these in more detail</para>
<para>After highlighting the configuration you will see the following screen</para>
<para>
- <graphic fileref="images/console1.png" align="center"/>
+ <graphic fileref="images/console1.png" scalefit="1" width="500" align="center"/>
</para>
<para>The name and JNDI name cant be changed, if you want to change these recreate the queue with the appropriate
settings. The rest of the configuration options, apart from security roles, relate to address settings for a particular
14 years, 7 months
JBoss hornetq SVN: r9274 - trunk.
by do-not-reply＠jboss.org
Author: clebert.suconic(a)jboss.com
Date: 2010-05-27 17:02:02 -0400 (Thu, 27 May 2010)
New Revision: 9274
Modified:
trunk/build-maven.xml
Log:
tweak only
Modified: trunk/build-maven.xml
===================================================================
--- trunk/build-maven.xml 2010-05-27 13:35:33 UTC (rev 9273)
+++ trunk/build-maven.xml 2010-05-27 21:02:02 UTC (rev 9274)
@@ -147,6 +147,8 @@
<!-- install the jar -->
<exec executable="mvn">
<arg value="install:install-file"/>
+ <!-- uncomment the following line to deploy to the JBoss 5 repository -->
+ <!-- arg value="-Dmaven.repo.local=/work/eap-location/maven-repository"/ -->
<arg value="-DgroupId=org.hornetq"/>
<arg value="-DartifactId=${artifact.id}"/>
<arg value="-Dversion=${hornetq.version}"/>
@@ -157,6 +159,8 @@
<exec executable="mvn">
<arg value="install:install-file"/>
<arg value="-DgroupId=org.hornetq"/>
+ <!-- uncomment the following line to deploy to the JBoss 5 repository -->
+ <!-- arg value="-Dmaven.repo.local=/work/eap-location/maven-repository"/ -->
<arg value="-DartifactId=${artifact.id}"/>
<arg value="-Dversion=${hornetq.version}"/>
<arg value="-Dpackaging=jar"/>
14 years, 7 months
JBoss hornetq SVN: r9273 - trunk/tests/src/org/hornetq/tests/integration/cluster/bridge.
by do-not-reply＠jboss.org
Author: jmesnil
Date: 2010-05-27 09:35:33 -0400 (Thu, 27 May 2010)
New Revision: 9273
Added:
trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeWithPagingTest.java
Log:
https://jira.jboss.org/browse/HORNETQ-382: Core Bridge loses messages when paging
* add (disabled) test which highlights the issue
Added: trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeWithPagingTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeWithPagingTest.java (rev 0)
+++ trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeWithPagingTest.java 2010-05-27 13:35:33 UTC (rev 9273)
@@ -0,0 +1,243 @@
+/*
+ * Copyright 2010 Red Hat, Inc.
+ * Red Hat licenses this file to you 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.
+ */
+
+package org.hornetq.tests.integration.cluster.bridge;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import junit.framework.Assert;
+
+import org.hornetq.api.core.HornetQException;
+import org.hornetq.api.core.Pair;
+import org.hornetq.api.core.SimpleString;
+import org.hornetq.api.core.TransportConfiguration;
+import org.hornetq.api.core.client.ClientConsumer;
+import org.hornetq.api.core.client.ClientMessage;
+import org.hornetq.api.core.client.ClientProducer;
+import org.hornetq.api.core.client.ClientSession;
+import org.hornetq.api.core.client.ClientSessionFactory;
+import org.hornetq.api.core.client.HornetQClient;
+import org.hornetq.core.config.BridgeConfiguration;
+import org.hornetq.core.config.CoreQueueConfiguration;
+import org.hornetq.core.config.impl.ConfigurationImpl;
+import org.hornetq.core.logging.Logger;
+import org.hornetq.core.remoting.impl.invm.InVMConnector;
+import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory;
+import org.hornetq.core.remoting.impl.netty.NettyConnectorFactory;
+import org.hornetq.core.server.HornetQServer;
+import org.hornetq.core.server.cluster.Bridge;
+import org.hornetq.core.server.cluster.impl.BridgeImpl;
+import org.hornetq.core.settings.impl.AddressFullMessagePolicy;
+import org.hornetq.core.settings.impl.AddressSettings;
+import org.hornetq.spi.core.protocol.RemotingConnection;
+
+/**
+ * A BridgeWithPagingTest
+ *
+ * @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a>
+ */
+public class BridgeWithPagingTest extends BridgeTestBase
+{
+ private static final Logger log = Logger.getLogger(BridgeWithPagingTest.class);
+
+ protected boolean isNetty()
+ {
+ return false;
+ }
+
+ private String getConnector()
+ {
+ if (isNetty())
+ {
+ return NettyConnectorFactory.class.getName();
+ }
+ else
+ {
+ return InVMConnectorFactory.class.getName();
+ }
+ }
+
+ public void testFoo() throws Exception
+ {
+
+ }
+
+ // https://jira.jboss.org/browse/HORNETQ-382
+ public void _testReconnectWithPaging() throws Exception
+ {
+ final byte[] content = new byte[2048];
+ for (int i=0; i < content.length; ++i) {
+ content[i] = (byte) i;
+ }
+
+ Map<String, Object> server0Params = new HashMap<String, Object>();
+ HornetQServer server0 = createHornetQServer(0, isNetty(), server0Params);
+
+ Map<String, Object> server1Params = new HashMap<String, Object>();
+ HornetQServer server1 = createHornetQServer(1, isNetty(), server1Params);
+
+ TransportConfiguration server0tc = new TransportConfiguration(getConnector(), server0Params, "server0tc");
+
+ Map<String, TransportConfiguration> connectors = new HashMap<String, TransportConfiguration>();
+
+ TransportConfiguration server1tc = new TransportConfiguration(getConnector(), server1Params, "server1tc");
+
+ connectors.put(server1tc.getName(), server1tc);
+
+ server0.getConfiguration().setConnectorConfigurations(connectors);
+ server1.getConfiguration().setConnectorConfigurations(connectors);
+
+ final String bridgeName = "bridge1";
+ final String testAddress = "testAddress";
+ final String queueName0 = "queue0";
+ final String forwardAddress = "forwardAddress";
+
+ final long retryInterval = 50;
+ final double retryIntervalMultiplier = 1d;
+ final int reconnectAttempts = -1;
+ final int confirmationWindowSize = 1024;
+
+ Pair<String, String> connectorPair = new Pair<String, String>(server1tc.getName(), null);
+
+ BridgeConfiguration bridgeConfiguration = new BridgeConfiguration(bridgeName,
+ queueName0,
+ forwardAddress,
+ null,
+ null,
+ retryInterval,
+ retryIntervalMultiplier,
+ reconnectAttempts,
+ true,
+ false,
+ confirmationWindowSize,
+ HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD,
+ connectorPair,
+ ConfigurationImpl.DEFAULT_CLUSTER_USER,
+ ConfigurationImpl.DEFAULT_CLUSTER_PASSWORD);
+
+ List<BridgeConfiguration> bridgeConfigs = new ArrayList<BridgeConfiguration>();
+ bridgeConfigs.add(bridgeConfiguration);
+ server0.getConfiguration().setBridgeConfigurations(bridgeConfigs);
+
+ CoreQueueConfiguration queueConfig0 = new CoreQueueConfiguration(testAddress, queueName0, null, true);
+ List<CoreQueueConfiguration> queueConfigs0 = new ArrayList<CoreQueueConfiguration>();
+ queueConfigs0.add(queueConfig0);
+ server0.getConfiguration().setQueueConfigurations(queueConfigs0);
+
+ AddressSettings addressSettings = new AddressSettings();
+ addressSettings.setRedeliveryDelay(0);
+ addressSettings.setMaxSizeBytes(10485760);
+ addressSettings.setPageSizeBytes(1048576);
+ addressSettings.setAddressFullMessagePolicy(AddressFullMessagePolicy.PAGE);
+
+ server0.getConfiguration().getAddressesSettings().put("#", addressSettings);
+
+ CoreQueueConfiguration queueConfig1 = new CoreQueueConfiguration(forwardAddress, queueName0, null, true);
+ List<CoreQueueConfiguration> queueConfigs1 = new ArrayList<CoreQueueConfiguration>();
+ queueConfigs1.add(queueConfig1);
+ server1.getConfiguration().setQueueConfigurations(queueConfigs1);
+
+ server1.getConfiguration().getAddressesSettings().put("#", addressSettings);
+
+ server1.start();
+ server0.start();
+
+ ClientSessionFactory csf0 = HornetQClient.createClientSessionFactory(server0tc);
+ ClientSession session0 = csf0.createSession(false, true, true);
+
+ ClientSessionFactory csf1 = HornetQClient.createClientSessionFactory(server1tc);
+ ClientSession session1 = csf1.createSession(false, true, true);
+
+ ClientProducer prod0 = session0.createProducer(testAddress);
+
+ ClientConsumer cons1 = session1.createConsumer(queueName0);
+
+ session1.start();
+
+ // Now we will simulate a failure of the bridge connection between server0 and server1
+ Bridge bridge = server0.getClusterManager().getBridges().get(bridgeName);
+ final RemotingConnection forwardingConnection = getForwardingConnection(bridge);
+ InVMConnector.failOnCreateConnection = true;
+ InVMConnector.numberOfFailures = Integer.MAX_VALUE;
+
+ Thread t = new Thread()
+ {
+ @Override
+ public void run()
+ {
+ System.out.println("failing...");
+ forwardingConnection.fail(new HornetQException(HornetQException.NOT_CONNECTED));
+ System.out.println("reconnected!!!");
+ }
+ };
+ t.start();
+
+ final int numMessages = 5000;
+
+ SimpleString propKey = new SimpleString("propkey");
+
+ for (int i = 0; i < numMessages; i++)
+ {
+ ClientMessage message = session0.createMessage(false);
+ message.putIntProperty(propKey, i);
+ message.getBodyBuffer().writeBytes(content);
+ prod0.send(message);
+ System.out.println(">>>> " + i);
+ }
+
+ InVMConnector.failOnCreateConnection = false;
+
+ Thread.sleep(200);
+
+ for (int i = 0; i < numMessages; i++)
+ {
+ System.out.println("<<< " + i);
+ ClientMessage r1 = cons1.receive(1500);
+ Assert.assertNotNull(r1);
+ Assert.assertEquals(i, r1.getObjectProperty(propKey));
+ }
+
+ session0.close();
+ session1.close();
+
+ server0.stop();
+ server1.stop();
+
+ Assert.assertEquals(0, server0.getRemotingService().getConnections().size());
+ Assert.assertEquals(0, server1.getRemotingService().getConnections().size());
+ }
+
+ private RemotingConnection getForwardingConnection(final Bridge bridge) throws Exception
+ {
+ long start = System.currentTimeMillis();
+
+ do
+ {
+ RemotingConnection forwardingConnection = ((BridgeImpl)bridge).getForwardingConnection();
+
+ if (forwardingConnection != null)
+ {
+ return forwardingConnection;
+ }
+
+ Thread.sleep(10);
+ }
+ while (System.currentTimeMillis() - start < 50000);
+
+ throw new IllegalStateException("Failed to get forwarding connection");
+ }
+
+}
14 years, 7 months
JBoss hornetq SVN: r9272 - in trunk: src/main/org/hornetq/core/server/impl and 1 other directories.
by do-not-reply＠jboss.org
Author: ataylor
Date: 2010-05-27 08:43:14 -0400 (Thu, 27 May 2010)
New Revision: 9272
Modified:
trunk/src/main/org/hornetq/core/client/impl/ClientConsumerImpl.java
trunk/src/main/org/hornetq/core/server/impl/ServerConsumerImpl.java
trunk/tests/src/org/hornetq/tests/integration/client/ConsumerWindowSizeTest.java
Log:
https://jira.jboss.org/browse/HORNETQ-385 - reset window size for slow consumers when forcing redelivery
Modified: trunk/src/main/org/hornetq/core/client/impl/ClientConsumerImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/client/impl/ClientConsumerImpl.java 2010-05-27 07:46:08 UTC (rev 9271)
+++ trunk/src/main/org/hornetq/core/client/impl/ClientConsumerImpl.java 2010-05-27 12:43:14 UTC (rev 9272)
@@ -264,7 +264,11 @@
if (seq >= forceDeliveryCount.longValue())
{
// forced delivery messages are discarded, nothing has been delivered by the queue
- return null;
+ if (forcingDelivery)
+ {
+ resetIfSlowConsumer();
+ return null;
+ }
}
else
{
@@ -307,6 +311,7 @@
}
else
{
+ resetIfSlowConsumer();
return null;
}
}
@@ -703,6 +708,15 @@
}
}
+ private void resetIfSlowConsumer()
+ {
+ if(clientWindowSize == 0)
+ {
+ slowConsumerInitialCreditSent = false;
+ sendCredits(0);
+ }
+ }
+
private void requeueExecutors()
{
for (int i = 0; i < buffer.size(); i++)
Modified: trunk/src/main/org/hornetq/core/server/impl/ServerConsumerImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/server/impl/ServerConsumerImpl.java 2010-05-27 07:46:08 UTC (rev 9271)
+++ trunk/src/main/org/hornetq/core/server/impl/ServerConsumerImpl.java 2010-05-27 12:43:14 UTC (rev 9272)
@@ -460,6 +460,11 @@
// No flow control
availableCredits = null;
}
+ else if(credits == 0)
+ {
+ //reset, used on slow consumers
+ availableCredits.set(0);
+ }
else
{
int previous = availableCredits.getAndAdd(credits);
Modified: trunk/tests/src/org/hornetq/tests/integration/client/ConsumerWindowSizeTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/client/ConsumerWindowSizeTest.java 2010-05-27 07:46:08 UTC (rev 9271)
+++ trunk/tests/src/org/hornetq/tests/integration/client/ConsumerWindowSizeTest.java 2010-05-27 12:43:14 UTC (rev 9272)
@@ -73,7 +73,7 @@
// https://jira.jboss.org/jira/browse/HORNETQ-385
- public void disabled_testReceiveImmediateWithZeroWindow() throws Exception
+ public void testReceiveImmediateWithZeroWindow() throws Exception
{
HornetQServer server = createServer(false, isNetty());
try
@@ -110,7 +110,7 @@
ClientMessage sent = senderSession.createMessage(true);
sent.putStringProperty("hello", "world");
-
+ System.out.println("sending message");
producer.send(sent);
senderSession.commit();
@@ -137,7 +137,7 @@
}
// https://jira.jboss.org/jira/browse/HORNETQ-385
- public void disabled_testReceiveImmediateWithZeroWindow2() throws Exception
+ public void testReceiveImmediateWithZeroWindow2() throws Exception
{
HornetQServer server = createServer(true);
@@ -175,7 +175,7 @@
prod.send(msg);
sessionProd.commit();
- message = consumer.receive(1000);
+ message = consumer.receive(10000);
assertNotNull(message);
System.out.println(message.getStringProperty("hello"));
message.acknowledge();
@@ -191,7 +191,7 @@
}
// https://jira.jboss.org/jira/browse/HORNETQ-385
- public void disabled_testReceiveImmediateWithZeroWindow3() throws Exception
+ public void testReceiveImmediateWithZeroWindow3() throws Exception
{
HornetQServer server = createServer(false, isNetty());
try
@@ -254,7 +254,7 @@
}
- public void disabled_testReceiveImmediateWithZeroWindow4() throws Exception
+ public void testReceiveImmediateWithZeroWindow4() throws Exception
{
HornetQServer server = createServer(false, isNetty());
try
14 years, 7 months
JBoss hornetq SVN: r9271 - trunk/src/main/org/hornetq/core/protocol/stomp.
by do-not-reply＠jboss.org
Author: jmesnil
Date: 2010-05-27 03:46:08 -0400 (Thu, 27 May 2010)
New Revision: 9271
Modified:
trunk/src/main/org/hornetq/core/protocol/stomp/StompUtils.java
Log:
https://jira.jboss.org/browse/HORNETQ-395: Stomp expiration header is not supported
* use correct Stomp Expiration header to set HornetQ's core message expiration time
Modified: trunk/src/main/org/hornetq/core/protocol/stomp/StompUtils.java
===================================================================
--- trunk/src/main/org/hornetq/core/protocol/stomp/StompUtils.java 2010-05-27 02:49:34 UTC (rev 9270)
+++ trunk/src/main/org/hornetq/core/protocol/stomp/StompUtils.java 2010-05-27 07:46:08 UTC (rev 9271)
@@ -67,7 +67,7 @@
{
msg.putStringProperty(ClientMessageImpl.REPLYTO_HEADER_NAME, SimpleString.toSimpleString((String)replyTo));
}
- String expiration = (String)headers.remove(Stomp.Headers.Send.REPLY_TO);
+ String expiration = (String)headers.remove(Stomp.Headers.Send.EXPIRATION_TIME);
if (expiration != null)
{
msg.setExpiration(Long.parseLong(expiration));
14 years, 7 months
JBoss hornetq SVN: r9270 - in trunk/lib/docbook-support: support/fop-conf and 1 other directory.
by do-not-reply＠jboss.org
Author: gaohoward
Date: 2010-05-26 22:49:34 -0400 (Wed, 26 May 2010)
New Revision: 9270
Modified:
trunk/lib/docbook-support/styles/zh/fopdf.xsl
trunk/lib/docbook-support/support/fop-conf/fop.xconf
Log:
fix build problem caused by font path in fop config
Modified: trunk/lib/docbook-support/styles/zh/fopdf.xsl
===================================================================
--- trunk/lib/docbook-support/styles/zh/fopdf.xsl 2010-05-26 15:22:34 UTC (rev 9269)
+++ trunk/lib/docbook-support/styles/zh/fopdf.xsl 2010-05-27 02:49:34 UTC (rev 9270)
@@ -27,10 +27,11 @@
don't want that -->
<xsl:param name="xref.with.number.and.title" select="0"/>
+<!--
<xsl:param name="body.font.family">FangSong</xsl:param>
<xsl:param name="title.font.family">FangSong</xsl:param>
<xsl:param name="monospace.font.family">FangSong</xsl:param>
-
+-->
<xsl:template match="processing-instruction('lb')">
<fo:block>
<xsl:text> </xsl:text>
Modified: trunk/lib/docbook-support/support/fop-conf/fop.xconf
===================================================================
--- trunk/lib/docbook-support/support/fop-conf/fop.xconf 2010-05-26 15:22:34 UTC (rev 9269)
+++ trunk/lib/docbook-support/support/fop-conf/fop.xconf 2010-05-27 02:49:34 UTC (rev 9270)
@@ -94,6 +94,7 @@
<font-triplet name="ArialMT" style="normal" weight="bold"/>
</font>
-->
+ <!--
<font metrics-url="file:///home/howard/tmp/fop/fop-0.95/ttchdzb96.xml" kerning="yes"
embed-url="file:///usr/share/fonts/truetype/wqy/wqy-zenhei.ttc">
<font-triplet name="WenQuanYi Zen Hei" style="normal" weight="normal"/>
@@ -105,7 +106,7 @@
<font-triplet name="FangSong" style="italic" weight="normal"/>
<font-triplet name="FangSong" style="oblique" weight="bold"/>
</font>
-
+ -->
<!-- automatically detect operating system installed fonts -->
<!-- <auto-detect/> -->
14 years, 7 months
JBoss hornetq SVN: r9269 - in trunk/docs: user-manual and 1 other directory.
by do-not-reply＠jboss.org
Author: gaohoward
Date: 2010-05-26 11:22:34 -0400 (Wed, 26 May 2010)
New Revision: 9269
Modified:
trunk/docs/quickstart-guide/build.xml
trunk/docs/user-manual/build.xml
Log:
HornetQ-323
exclude chinese pdf doc from auto build.
Modified: trunk/docs/quickstart-guide/build.xml
===================================================================
--- trunk/docs/quickstart-guide/build.xml 2010-05-26 14:39:44 UTC (rev 9268)
+++ trunk/docs/quickstart-guide/build.xml 2010-05-26 15:22:34 UTC (rev 9269)
@@ -7,12 +7,17 @@
<target name="all" depends="clean">
<mkdir dir="en/images" />
<antcall target="lang.all"><param name="lang" value="en"/></antcall>
- <antcall target="lang.all"><param name="lang" value="zh"/></antcall>
+
+ <!-- by default we don't build Chinese pdf documents because we
+ don't provide any Chinese fonts in the repo. -->
+ <antcall target="lang.dochtml"><param name="lang" value="zh"/></antcall>
+ <antcall target="lang.dochtmlsingle"><param name="lang" value="zh"/></antcall>
</target>
<target name="html.doc" description="creates the html docs only and opens a browser">
<mkdir dir="en/images" />
<antcall target="lang.dochtml"><param name="lang" value="en"/></antcall>
+ <antcall target="lang.dochtml"><param name="lang" value="zh"/></antcall>
</target>
</project>
Modified: trunk/docs/user-manual/build.xml
===================================================================
--- trunk/docs/user-manual/build.xml 2010-05-26 14:39:44 UTC (rev 9268)
+++ trunk/docs/user-manual/build.xml 2010-05-26 15:22:34 UTC (rev 9269)
@@ -7,12 +7,17 @@
<target name="all" depends="clean">
<mkdir dir="en/images" />
<antcall target="lang.all"><param name="lang" value="en"/></antcall>
- <antcall target="lang.all"><param name="lang" value="zh"/></antcall>
+
+ <!-- by default we don't build Chinese pdf documents because we
+ don't provide any Chinese fonts in the repo. -->
+ <antcall target="lang.dochtml"><param name="lang" value="zh"/></antcall>
+ <antcall target="lang.dochtmlsingle"><param name="lang" value="zh"/></antcall>
</target>
<target name="html.doc" description="creates the html docs only and opens a browser">
<mkdir dir="en/images" />
<antcall target="lang.dochtml"><param name="lang" value="en"/></antcall>
+ <antcall target="lang.dochtml"><param name="lang" value="zh"/></antcall>
</target>
</project>
14 years, 7 months
JBoss hornetq SVN: r9268 - trunk/src/main/org/hornetq/core/persistence/impl/journal.
by do-not-reply＠jboss.org
Author: clebert.suconic(a)jboss.com
Date: 2010-05-26 10:39:44 -0400 (Wed, 26 May 2010)
New Revision: 9268
Modified:
trunk/src/main/org/hornetq/core/persistence/impl/journal/JournalStorageManager.java
Log:
https://jira.jboss.org/browse/HORNETQ-394 - changing a critical error to a warning on update counts
Modified: trunk/src/main/org/hornetq/core/persistence/impl/journal/JournalStorageManager.java
===================================================================
--- trunk/src/main/org/hornetq/core/persistence/impl/journal/JournalStorageManager.java 2010-05-26 14:36:21 UTC (rev 9267)
+++ trunk/src/main/org/hornetq/core/persistence/impl/journal/JournalStorageManager.java 2010-05-26 14:39:44 UTC (rev 9268)
@@ -879,10 +879,12 @@
if (rec == null)
{
- throw new IllegalStateException("Cannot find message " + messageID);
+ log.warn("Cannot find message " + messageID + " to update delivery count");
}
-
- rec.deliveryCount = encoding.count;
+ else
+ {
+ rec.deliveryCount = encoding.count;
+ }
}
break;
14 years, 7 months
JBoss hornetq SVN: r9267 - trunk/src/main/org/hornetq/core/persistence/impl/journal.
by do-not-reply＠jboss.org
Author: clebert.suconic(a)jboss.com
Date: 2010-05-26 10:36:21 -0400 (Wed, 26 May 2010)
New Revision: 9267
Modified:
trunk/src/main/org/hornetq/core/persistence/impl/journal/JournalStorageManager.java
Log:
https://jira.jboss.org/browse/HORNETQ-394 - changing a critical error to a warning on update counts
Modified: trunk/src/main/org/hornetq/core/persistence/impl/journal/JournalStorageManager.java
===================================================================
--- trunk/src/main/org/hornetq/core/persistence/impl/journal/JournalStorageManager.java 2010-05-26 11:50:26 UTC (rev 9266)
+++ trunk/src/main/org/hornetq/core/persistence/impl/journal/JournalStorageManager.java 2010-05-26 14:36:21 UTC (rev 9267)
@@ -871,18 +871,20 @@
if (queueMessages == null)
{
- throw new IllegalStateException("Cannot find queue messages " + encoding.queueID);
+ log.warn("Cannot find queue " + encoding.queueID + " to update delivery count");
}
-
- AddMessageRecord rec = queueMessages.get(messageID);
-
- if (rec == null)
+ else
{
- throw new IllegalStateException("Cannot find message " + messageID);
+ AddMessageRecord rec = queueMessages.get(messageID);
+
+ if (rec == null)
+ {
+ throw new IllegalStateException("Cannot find message " + messageID);
+ }
+
+ rec.deliveryCount = encoding.count;
}
- rec.deliveryCount = encoding.count;
-
break;
}
case PAGE_TRANSACTION:
14 years, 7 months
JBoss hornetq SVN: r9266 - trunk/docs/user-manual/en.
by do-not-reply＠jboss.org
Author: gaohoward
Date: 2010-05-26 07:50:26 -0400 (Wed, 26 May 2010)
New Revision: 9266
Modified:
trunk/docs/user-manual/en/appserver-integration.xml
trunk/docs/user-manual/en/clusters.xml
trunk/docs/user-manual/en/configuration-index.xml
trunk/docs/user-manual/en/configuring-transports.xml
trunk/docs/user-manual/en/diverts.xml
trunk/docs/user-manual/en/examples.xml
trunk/docs/user-manual/en/ha.xml
trunk/docs/user-manual/en/interoperability.xml
trunk/docs/user-manual/en/large-messages.xml
trunk/docs/user-manual/en/management.xml
trunk/docs/user-manual/en/message-grouping.xml
trunk/docs/user-manual/en/messaging-concepts.xml
trunk/docs/user-manual/en/persistence.xml
trunk/docs/user-manual/en/pre-acknowledge.xml
trunk/docs/user-manual/en/security.xml
trunk/docs/user-manual/en/thread-pooling.xml
trunk/docs/user-manual/en/using-server.xml
Log:
typo
Modified: trunk/docs/user-manual/en/appserver-integration.xml
===================================================================
--- trunk/docs/user-manual/en/appserver-integration.xml 2010-05-26 08:17:33 UTC (rev 9265)
+++ trunk/docs/user-manual/en/appserver-integration.xml 2010-05-26 11:50:26 UTC (rev 9266)
@@ -219,7 +219,7 @@
that the sending of the message will be done as part of the JTA transaction being used
by the component.</para>
<para>This means that if the sending of the message fails the overall transaction would
- rollback and the message be redelivered. Heres an example of this from within an
+ rollback and the message be re-sent. Heres an example of this from within an
MDB:</para>
<programlisting>@MessageDriven(name = "MDBMessageSendTxExample",
activationConfig =
@@ -459,7 +459,7 @@
<entry>
<link linkend="configuration.discovery-group.refresh-timeout">DiscoveryRefreshTimeout</link></entry>
<entry>Long</entry>
- <entry>The timeout, in milli seconds, to refresh.</entry>
+ <entry>The timeout, in milliseconds, to refresh.</entry>
</row>
<row>
<entry>
@@ -816,7 +816,7 @@
<config-property-value>host=127.0.0.1;port=5446</config-property-value>
</config-property>
</programlisting>
- <para>This configures the resource adapter to connect to a server running on localhosr listening on port 5446</para>
+ <para>This configures the resource adapter to connect to a server running on localhost listening on port 5446</para>
<para>You will also need to configure any outbound connections to also connect to this server. This can be done
by either configuring the jms-ds.xml file found under <literal>deploy/hornetq.sar</literal> or creating a
new configuration file and making sure the filename ends in -ds.xml</para>
@@ -873,7 +873,7 @@
(depending on the transaction outcome) when the server is restarted.</para>
<section>
<title>XA Recovery Configuration</title>
- <para>To enable HornetQs XA Recovery, the Recovery Manager must be configured to connect
+ <para>To enable HornetQ's XA Recovery, the Recovery Manager must be configured to connect
to HornetQ to recover its resources. The following property must be added to the
<literal>jta</literal> section of <literal>conf/jbossts-properties.xml</literal>
of JBoss AS profiles:</para>
Modified: trunk/docs/user-manual/en/clusters.xml
===================================================================
--- trunk/docs/user-manual/en/clusters.xml 2010-05-26 08:17:33 UTC (rev 9265)
+++ trunk/docs/user-manual/en/clusters.xml 2010-05-26 11:50:26 UTC (rev 9266)
@@ -254,8 +254,8 @@
Connection jmsConnection2 = jmsConnectionFactory.createConnection();</programlisting></para>
<para>The <literal>refresh-timeout</literal> can be set directly on the connection
- factory by using the setter method <literal>setDiscoveryRefreshTimeout() if you
- want to change the default value.</literal></para>
+ factory by using the setter method <literal>setDiscoveryRefreshTimeout()</literal> if you
+ want to change the default value.</para>
<para>There is also a further parameter settable on the connection factory using the
setter method <literal>setDiscoveryInitialWaitTimeout()</literal>. If the connection
factory is used immediately after creation then it may not have had enough time
@@ -279,8 +279,8 @@
</programlisting></para>
<para>The <literal>refresh-timeout</literal> can be set directly on the session
- factory by using the setter method <literal>setDiscoveryRefreshTimeout() if you
- want to change the default value.</literal></para>
+ factory by using the setter method <literal>setDiscoveryRefreshTimeout()</literal> if you
+ want to change the default value.</para>
<para>There is also a further parameter settable on the session factory using the
setter method <literal>setDiscoveryInitialWaitTimeout()</literal>. If the session factory
is used immediately after creation then it may not have had enough time to
@@ -354,7 +354,7 @@
servers. By having multiple cluster connections on different addresses a
single HornetQ Server can effectively take part in multiple clusters
simultaneously.</para>
- <para>By careful not to have multiple cluster connections with overlapping
+ <para>Be careful not to have multiple cluster connections with overlapping
values of <literal>address</literal>, e.g. "europe" and "europe.news" since
this could result in the same messages being distributed between more than
one cluster connection, possibly resulting in duplicate deliveries. </para>
Modified: trunk/docs/user-manual/en/configuration-index.xml
===================================================================
--- trunk/docs/user-manual/en/configuration-index.xml 2010-05-26 08:17:33 UTC (rev 9265)
+++ trunk/docs/user-manual/en/configuration-index.xml 2010-05-26 11:50:26 UTC (rev 9266)
@@ -903,7 +903,7 @@
<entry><link linkend="undelivered-messages.configuring"
>address-settings.dead-letter-address</link></entry>
<entry>String</entry>
- <entry>the address to send dead messages too</entry>
+ <entry>the address to send dead messages to</entry>
<entry/>
</row>
<row>
@@ -918,7 +918,7 @@
<entry><link linkend="message-expiry.configuring"
>address-settings.expiry-address</link></entry>
<entry>String</entry>
- <entry>the address to send expired messages too</entry>
+ <entry>the address to send expired messages to</entry>
<entry/>
</row>
<row>
@@ -1003,7 +1003,7 @@
<entry><link linkend="clusters.static.servers">connection-factory.connectors</link>
</entry>
<entry>String</entry>
- <entry>A list of connectors used bu the connection factory</entry>
+ <entry>A list of connectors used by the connection factory</entry>
<entry />
</row>
<row>
Modified: trunk/docs/user-manual/en/configuring-transports.xml
===================================================================
--- trunk/docs/user-manual/en/configuring-transports.xml 2010-05-26 08:17:33 UTC (rev 9265)
+++ trunk/docs/user-manual/en/configuring-transports.xml 2010-05-26 11:50:26 UTC (rev 9266)
@@ -195,7 +195,7 @@
<itemizedlist>
<listitem>
<para><literal>use-nio</literal>. If this is <literal>true</literal> then Java
- non blocking NIO will be used. If set to <literal>false</literal> than old
+ non blocking NIO will be used. If set to <literal>false</literal> then old
blocking Java IO will be used.</para>
<para>If you require the server to handle many concurrent connections, we highly
recommend that you use non blocking Java NIO. Java NIO does not maintain a
@@ -274,7 +274,7 @@
switch required. If you want the lowest latency and the possible expense of
some reduction in throughput then you can make sure <literal
>direct-deliver</literal> to true. The default value for this parameter
- is <literal>true</literal>. If you are willingh to take some small extra hit
+ is <literal>true</literal>. If you are willing to take some small extra hit
on latency but want the highest throughput set this parameter to <literal
>false</literal>.</para>
</listitem>
@@ -438,7 +438,7 @@
<itemizedlist>
<listitem>
<para>endpoint - This is the name of the netty acceptor that the servlet will
- forward its packets too. You can see it matches the name of the <literal
+ forward its packets to. You can see it matches the name of the <literal
>host</literal> param.</para>
</listitem>
</itemizedlist>
Modified: trunk/docs/user-manual/en/diverts.xml
===================================================================
--- trunk/docs/user-manual/en/diverts.xml 2010-05-26 08:17:33 UTC (rev 9265)
+++ trunk/docs/user-manual/en/diverts.xml 2010-05-26 11:50:26 UTC (rev 9266)
@@ -24,7 +24,7 @@
some simple server configuration.</para>
<para>Diverts allow you to transparently divert messages routed to one address to some other
address, without making any changes to any client application logic.</para>
- <para>Diverts can be <emphasis>exclusive</emphasis>, meaning that that the message is diverted
+ <para>Diverts can be <emphasis>exclusive</emphasis>, meaning that the message is diverted
to the new address, and does not go to the old address at all, or they can be
<emphasis>non-exclusive</emphasis> which means the message continues to go the old
address, and a <emphasis>copy</emphasis> of it is also sent to the new address.
@@ -92,7 +92,7 @@
the new address. The original message continues to the old address</para>
<para>You can therefore think of non-exclusive diverts as <emphasis>splitting</emphasis> a
message flow.</para>
- <para>Non exclusive diverts can be configured in the same was as exclusive diverts with an
+ <para>Non exclusive diverts can be configured in the same way as exclusive diverts with an
optional filter and transformer, here's an example non-exclusive divert, again from the
divert example:</para>
<programlisting>
Modified: trunk/docs/user-manual/en/examples.xml
===================================================================
--- trunk/docs/user-manual/en/examples.xml 2010-05-26 08:17:33 UTC (rev 9265)
+++ trunk/docs/user-manual/en/examples.xml 2010-05-26 11:50:26 UTC (rev 9266)
@@ -458,7 +458,7 @@
</section>
<section>
<title>Topic Selector 2</title>
- <para>The <literal>topic-selector-example1</literal> example shows you how to
+ <para>The <literal>topic-selector-example2</literal> example shows you how to
selectively consume messages using message selectors with topic consumers.</para>
</section>
<section id="examples.transaction-failover">
@@ -513,7 +513,7 @@
<section>
<title>Java EE Examples</title>
<para>Most of the Java EE examples can be run the following way. simply cd into the
- appropriate example directory an type <literal>ant deploy</literal>. This will create a
+ appropriate example directory and type <literal>ant deploy</literal>. This will create a
new JBoss AS profile and start the server. When the server is started from a different
window type <literal>ant run</literal> to run the example. Some examples require further
steps, please refer to the examples documentation for further instructions.</para>
Modified: trunk/docs/user-manual/en/ha.xml
===================================================================
--- trunk/docs/user-manual/en/ha.xml 2010-05-26 08:17:33 UTC (rev 9265)
+++ trunk/docs/user-manual/en/ha.xml 2010-05-26 11:50:26 UTC (rev 9266)
@@ -122,7 +122,7 @@
other purposes, it's necessary to copy the <literal>data</literal> directory
from the live server to the backup server. This means the backup server will
have an identical persistent store to the backup server.</para>
- <para>One a live server has failed over onto a backup server, the old live
+ <para>Once a live server has failed over onto a backup server, the old live
server becomes invalid and cannot just be restarted. To resynchonize the
pair as a working live backup pair again, both servers need to be stopped,
the data copied from the live node to the backup node and restarted
@@ -273,7 +273,7 @@
linkend="examples.non-transaction-failover"/>.</para>
<section id="ha.automatic.failover.noteonreplication">
<title>A Note on Server Replication</title>
- <para>HornetQ does not replicate full server state betwen live and backup servers.
+ <para>HornetQ does not replicate full server state between live and backup servers.
When the new session is automatically recreated on the backup it won't have any
knowledge of messages already sent or acknowledged in that session. Any
in-flight sends or acknowledgements at the time of failover might also be
@@ -294,7 +294,7 @@
<para>Other techniques for multi-threaded active replication exist such as
replicating lock states or replicating thread scheduling but this is very hard
to achieve at a Java level.</para>
- <para>Consequently it xas decided it was not worth massively reducing performance
+ <para>Consequently it has decided it was not worth massively reducing performance
and concurrency for the sake of 100% transparent failover. Even without 100%
transparent failover, it is simple to guarantee <emphasis role="italic">once and
only once</emphasis> delivery, even in the case of failure, by using a
Modified: trunk/docs/user-manual/en/interoperability.xml
===================================================================
--- trunk/docs/user-manual/en/interoperability.xml 2010-05-26 08:17:33 UTC (rev 9265)
+++ trunk/docs/user-manual/en/interoperability.xml 2010-05-26 11:50:26 UTC (rev 9266)
@@ -119,7 +119,7 @@
</programlisting>
<para>With this configuration, HornetQ will accept Stomp connections over Web Sockets on
the port <literal>61614</literal> with the URL path <literal>/stomp</literal>.
- Web browser can then connect to <literal>ws://<server>:61614/stomp</literal> usin a Web Socket to send and receive Stomp
+ Web browser can then connect to <literal>ws://<server>:61614/stomp</literal> using a Web Socket to send and receive Stomp
messages.</para>
<para>A companion JavaScript library to ease client-side development is available from
<ulink url="http://github.com/jmesnil/stomp-websocket">GitHub</ulink> (please see
Modified: trunk/docs/user-manual/en/large-messages.xml
===================================================================
--- trunk/docs/user-manual/en/large-messages.xml 2010-05-26 08:17:33 UTC (rev 9265)
+++ trunk/docs/user-manual/en/large-messages.xml 2010-05-26 11:50:26 UTC (rev 9266)
@@ -57,7 +57,7 @@
</section>
<section>
<title>Setting the limits</title>
- <para>Any message large than a certain size is considered a large message. Large messages
+ <para>Any message larger than a certain size is considered a large message. Large messages
will be split up and sent in fragments. This is determined by the parameter <literal
>min-large-message-size</literal></para>
<para>The default value is 100KiB.</para>
@@ -249,7 +249,7 @@
</section>
<section id="large-messages.cache.client">
<title>Cache Large Messages on client</title>
- <para>LargeMessages are transferred by streaming from server to client. The message is
+ <para>Large messages are transferred by streaming from server to client. The message is
broken into smaller packets and as the message is read more packets will be received.
Because of that the body of the large message can be read only once, and by consequence
a received message can be sent to another producer only once. The JMS Bridge for
Modified: trunk/docs/user-manual/en/management.xml
===================================================================
--- trunk/docs/user-manual/en/management.xml 2010-05-26 08:17:33 UTC (rev 9265)
+++ trunk/docs/user-manual/en/management.xml 2010-05-26 11:50:26 UTC (rev 9266)
@@ -111,7 +111,7 @@
>listPreparedTransactions()</literal> method lists the transactions which
are in the prepared states (the transactions are represented as opaque Base64
Strings.) To commit or rollback a given prepared transaction, the <literal
- >commitPreparedTransaction</literal>() or <literal
+ >commitPreparedTransaction()</literal> or <literal
>rollbackPreparedTransaction()</literal> method can be used to resolve
heuristic transactions. Heuristically completed transactions can be listed
using the <literal>listHeuristicCommittedTransactions()</literal> and <literal
@@ -143,7 +143,7 @@
<listitem>
<para>Modifying roles and permissions for an address</para>
<para>You can add or remove roles associated to a queue using the <literal
- >addRole()</literal> or. <literal>removeRole()</literal> methods. You can
+ >addRole()</literal> or <literal>removeRole()</literal> methods. You can
list all the roles associated to the queue with the <literal
>getRoles()</literal> method</para>
</listitem>
@@ -164,7 +164,7 @@
<para>Expiring, sending to a dead letter address and moving messages</para>
<para>Messages can be expired from a queue by using the <literal
>expireMessages()</literal> method. If an expiry address is defined,
- messages will be be sent to it, otherwise they are discarded. The queue's
+ messages will be sent to it, otherwise they are discarded. The queue's
expiry address can be set with the <literal>setExpiryAddress()</literal>
method.</para>
<para>Messages can also be sent to a dead letter address with the <literal
@@ -325,7 +325,7 @@
>destroyConnectionFactory()</literal> methods. These connection factories
are bound to JNDI so that JMS clients can look them up. If a graphical console
is used to create the connection factories, the transport parameters are
- specified in the text fied input as a comma-separated list of key=value (e.g.
+ specified in the text field input as a comma-separated list of key=value (e.g.
<literal>key1=10, key2="value", key3=false</literal>). If there are multiple
transports defined, you need to enclose the key/value pairs between curly
braces. For example <literal>{key=10}, {key=20}</literal>. In that case, the
@@ -376,7 +376,7 @@
<para>The <literal>ConnectionFactoryControl</literal> exposes JMS
ConnectionFactory configuration through its attributes (e.g. <literal
>getConsumerWindowSize()</literal> to retrieve the consumer window size for
- flow control, <literal>isBlockOnNonDurableSend()</literal> to know wether the
+ flow control, <literal>isBlockOnNonDurableSend()</literal> to know whether the
producers created from the connection factory will block or not when sending
non-durable messages, etc.)</para>
</listitem>
@@ -395,7 +395,7 @@
<para>Expiring, sending to a dead letter address and moving messages</para>
<para>Messages can be expired from a queue by using the <literal
>expireMessages()</literal> method. If an expiry address is defined,
- messages will be be sent to it, otherwise they are discarded. The queue's
+ messages will be sent to it, otherwise they are discarded. The queue's
expiry address can be set with the <literal>setExpiryAddress()</literal>
method.</para>
<para>Messages can also be sent to a dead letter address with the <literal
@@ -444,8 +444,8 @@
<listitem>
<para>Retrieving the queue attributes</para>
<para>The <literal>JMSQueueControl</literal> exposes JMS queue settings through
- its attributes (e.g. <literal>isTemporary()</literal> to know wether the queue
- is temporary or not, <literal>isDurable()</literal> to know wether the queue is
+ its attributes (e.g. <literal>isTemporary()</literal> to know whether the queue
+ is temporary or not, <literal>isDurable()</literal> to know whether the queue is
durable or not, etc.)</para>
</listitem>
<listitem>
@@ -761,7 +761,7 @@
notifications emitted by the server.</para>
<section id="management.notifications.core.configuration">
<title>Configuring The Core Management Notification Address</title>
- <para>the management notification address to receive management notifications is
+ <para>The management notification address to receive management notifications is
configured in <literal>hornetq-configuration.xml</literal>:</para>
<programlisting>
<management-notification-address>hornetq.notifications</management-notification-address>
@@ -953,7 +953,7 @@
</section>
<section>
<title>JMS Connection Factories</title>
- <para>The format for creating connection factories is the same as for JMS Queues and topics apart frm the configuration
+ <para>The format for creating connection factories is the same as for JMS Queues and topics apart from the configuration
being different. For as list of all the connection factory settings see the configuration index </para>
</section>
</section>
Modified: trunk/docs/user-manual/en/message-grouping.xml
===================================================================
--- trunk/docs/user-manual/en/message-grouping.xml 2010-05-26 08:17:33 UTC (rev 9265)
+++ trunk/docs/user-manual/en/message-grouping.xml 2010-05-26 11:50:26 UTC (rev 9266)
@@ -43,7 +43,7 @@
<section>
<title>Using Core API</title>
<para>The property name used to identify the message group is <literal
- >"_HQ_GROUP_ID""</literal> (or the constant <literal
+ >"_HQ_GROUP_ID"</literal> (or the constant <literal
>MessageImpl.HDR_GROUP_ID</literal>). Alternatively, you can set <literal
>autogroup</literal> to true on the <literal>SessionFactory</literal> which will pick a
random unique id. </para>
@@ -137,7 +137,7 @@
<para>The decision as to where a message should be routed to is initially proposed by the node
that receives the message. The node will pick a suitable route as per the normal clustered
routing conditions, i.e. round robin available queues, use a local queue first and choose a
- queue that has a consumer. If the proposal is excepted by the grouping handlers the node
+ queue that has a consumer. If the proposal is accepted by the grouping handlers the node
will route messages to this queue from that point on, if rejected an alternative route will
be offered and the node will again route to that queue indefinitely. All other nodes will
also route to the queue chosen at proposal time. Once the message arrives at the queue then
Modified: trunk/docs/user-manual/en/messaging-concepts.xml
===================================================================
--- trunk/docs/user-manual/en/messaging-concepts.xml 2010-05-26 08:17:33 UTC (rev 9265)
+++ trunk/docs/user-manual/en/messaging-concepts.xml 2010-05-26 11:50:26 UTC (rev 9266)
@@ -224,7 +224,7 @@
of one or more of the servers. The degree of support for HA varies between various
messaging systems.</para>
<para>HornetQ provides automatic failover where your sessions are automatically reconnected
- to the backup server on event of live serve failure.</para>
+ to the backup server on event of live server failure.</para>
<para>For more information on HA, please see <xref linkend="ha"/>.</para>
</section>
<section>
Modified: trunk/docs/user-manual/en/persistence.xml
===================================================================
--- trunk/docs/user-manual/en/persistence.xml 2010-05-26 08:17:33 UTC (rev 9265)
+++ trunk/docs/user-manual/en/persistence.xml 2010-05-26 11:50:26 UTC (rev 9266)
@@ -88,7 +88,7 @@
<para>This journal instance stores all JMS related data, This is basically any JMS Queues, Topics and Connection
Factories and any JNDI bindings for these resources.</para>
<para>Any JMS Resources created via the management API will be persisted to this journal. Any resources
- configured via configuration files will not. The JMS Journal will only becreated if JMS is being used.</para>
+ configured via configuration files will not. The JMS Journal will only be created if JMS is being used.</para>
</listitem>
<listitem>
<para>Message journal.</para>
Modified: trunk/docs/user-manual/en/pre-acknowledge.xml
===================================================================
--- trunk/docs/user-manual/en/pre-acknowledge.xml 2010-05-26 08:17:33 UTC (rev 9265)
+++ trunk/docs/user-manual/en/pre-acknowledge.xml 2010-05-26 11:50:26 UTC (rev 9266)
@@ -77,6 +77,6 @@
<section>
<title>Example</title>
<para>See <xref linkend="examples.pre-acknowledge"/> for an example which shows how to use
- pre-acknowledgement mode with with JMS.</para>
+ pre-acknowledgement mode with JMS.</para>
</section>
</chapter>
Modified: trunk/docs/user-manual/en/security.xml
===================================================================
--- trunk/docs/user-manual/en/security.xml 2010-05-26 08:17:33 UTC (rev 9265)
+++ trunk/docs/user-manual/en/security.xml 2010-05-26 11:50:26 UTC (rev 9266)
@@ -90,8 +90,6 @@
applies to any address that starts with the string "globalqueues.europe.":</para>
<para>Only users who have the <literal>admin</literal> role can create or delete durable
queues bound to an address that starts with the string "globalqueues.europe."</para>
- <para>Only users who have the <literal>admin</literal> role can create or delete durable
- queues bound to an address that starts with the string "globalqueues.europe."</para>
<para>Any users with the roles <literal>admin</literal>, <literal>guest</literal>, or
<literal>europe-users</literal> can create or delete temporary queues bound to an
address that starts with the string "globalqueues.europe."</para>
@@ -267,7 +265,7 @@
or EJB sets security credentials on the current security context and these are used throughout the call.
If you would like these credentials to be used by HornetQ when sending or consuming messages then
set <literal>allowClientLogin</literal> to true. This will bypass HornetQ authentication and propgate the
- provided Security Context. If you woul like HornetQ to authenticate using the propogated security then set the
+ provided Security Context. If you would like HornetQ to authenticate using the propogated security then set the
<literal>authoriseOnClientLogin</literal> to true also.</para>
<para>There is more info on using the JBoss client login module <ulink
url="http://community.jboss.org/wiki/ClientLoginModule">here</ulink> </para>
Modified: trunk/docs/user-manual/en/thread-pooling.xml
===================================================================
--- trunk/docs/user-manual/en/thread-pooling.xml 2010-05-26 08:17:33 UTC (rev 9265)
+++ trunk/docs/user-manual/en/thread-pooling.xml 2010-05-26 11:50:26 UTC (rev 9266)
@@ -62,7 +62,7 @@
>hornetq-configuration.xml</literal> with the <literal
>thread-pool-max-size</literal> parameter.</para>
<para>If a value of <literal>-1</literal> is used this signifies that the thread pool
- has no upper bound and new threads will be created on demand if there are enough
+ has no upper bound and new threads will be created on demand if there are not enough
threads available to satisfy a request. If activity later subsides then threads are
timed-out and closed.</para>
<para>If a value of <literal>n</literal> where <literal>n</literal>is a positive integer
@@ -93,7 +93,7 @@
HornetQ-AIO-poller-pool. HornetQ uses one thread per opened file on the journal
(there is usually one).</para>
<para>There is also a single thread used to invoke writes on libaio. We do that to avoid
- context switching on libaio what would cause performance issues. You will find this
+ context switching on libaio that would cause performance issues. You will find this
thread on a thread dump with the prefix HornetQ-AIO-writer-pool.</para>
</section>
</section>
Modified: trunk/docs/user-manual/en/using-server.xml
===================================================================
--- trunk/docs/user-manual/en/using-server.xml 2010-05-26 08:17:33 UTC (rev 9265)
+++ trunk/docs/user-manual/en/using-server.xml 2010-05-26 11:50:26 UTC (rev 9266)
@@ -38,7 +38,7 @@
parameters and start the JBoss Microcontainer. The Microcontainer is a light weight
container used to deploy the HornetQ POJO's</para>
<para>To stop the server you'll also find a unix/linux script <literal>stop.sh</literal> and
- a windows batch file <literal>run.bat</literal></para>
+ a windows batch file <literal>stop.bat</literal></para>
<para>To run on Unix/Linux type <literal>./stop.sh</literal></para>
<para>To run on Windows type <literal>stop.bat</literal></para>
<para>Please note that HornetQ requires a Java 6 or later runtime to run.</para>
14 years, 7 months