JBoss hornetq SVN: r10249 - in branches/Branch_2_2_EAP: src/main/org/hornetq/ra and 2 other directories.
by do-not-reply＠jboss.org
Author: ataylor
Date: 2011-02-24 07:23:57 -0500 (Thu, 24 Feb 2011)
New Revision: 10249
Modified:
branches/Branch_2_2_EAP/src/main/org/hornetq/api/core/client/HornetQClient.java
branches/Branch_2_2_EAP/src/main/org/hornetq/ra/ConnectionFactoryProperties.java
branches/Branch_2_2_EAP/src/main/org/hornetq/ra/HornetQResourceAdapter.java
branches/Branch_2_2_EAP/src/main/org/hornetq/ra/inflow/HornetQActivation.java
branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/ra/ResourceAdapterTest.java
Log:
https://issues.jboss.org/browse/JBPAPP-5987 - added test and fix for default and over ridden discovery params
Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/api/core/client/HornetQClient.java
===================================================================
--- branches/Branch_2_2_EAP/src/main/org/hornetq/api/core/client/HornetQClient.java 2011-02-24 10:28:07 UTC (rev 10248)
+++ branches/Branch_2_2_EAP/src/main/org/hornetq/api/core/client/HornetQClient.java 2011-02-24 12:23:57 UTC (rev 10249)
@@ -68,6 +68,10 @@
public static final long DEFAULT_DISCOVERY_INITIAL_WAIT_TIMEOUT = 10000;
+ public static final long DEFAULT_DISCOVERY_REFRESH_TIMEOUT = 10000;
+
+ public static final int DEFAULT_DISCOVERY_PORT = 9876;
+
public static final long DEFAULT_RETRY_INTERVAL = 2000;
public static final double DEFAULT_RETRY_INTERVAL_MULTIPLIER = 1d;
Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/ra/ConnectionFactoryProperties.java
===================================================================
--- branches/Branch_2_2_EAP/src/main/org/hornetq/ra/ConnectionFactoryProperties.java 2011-02-24 10:28:07 UTC (rev 10248)
+++ branches/Branch_2_2_EAP/src/main/org/hornetq/ra/ConnectionFactoryProperties.java 2011-02-24 12:23:57 UTC (rev 10249)
@@ -51,11 +51,11 @@
private String discoveryAddress;
- private Integer discoveryPort = 9876;
+ private Integer discoveryPort;
- private Long discoveryRefreshTimeout = new Long(10000);
+ private Long discoveryRefreshTimeout;
- private Long discoveryInitialWaitTimeout = new Long(10000);
+ private Long discoveryInitialWaitTimeout;
private String clientID;
Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/ra/HornetQResourceAdapter.java
===================================================================
--- branches/Branch_2_2_EAP/src/main/org/hornetq/ra/HornetQResourceAdapter.java 2011-02-24 10:28:07 UTC (rev 10248)
+++ branches/Branch_2_2_EAP/src/main/org/hornetq/ra/HornetQResourceAdapter.java 2011-02-24 12:23:57 UTC (rev 10249)
@@ -1321,6 +1321,10 @@
defaultHornetQConnectionFactory = createHornetQConnectionFactory(raProperties);
}
+ public Map<ActivationSpec, HornetQActivation> getActivations()
+ {
+ return activations;
+ }
public HornetQConnectionFactory getDefaultHornetQConnectionFactory() throws ResourceException
{
if (!configured.getAndSet(true))
@@ -1377,14 +1381,28 @@
Integer discoveryPort = overrideProperties.getDiscoveryPort() != null ? overrideProperties.getDiscoveryPort()
: getDiscoveryPort();
+ if(discoveryPort == null)
+ {
+ discoveryPort = HornetQClient.DEFAULT_DISCOVERY_PORT;
+ }
+
DiscoveryGroupConfiguration groupConfiguration = new DiscoveryGroupConfiguration(discoveryAddress, discoveryPort);
- long refreshTimeout = overrideProperties.getDiscoveryRefreshTimeout() != null ? overrideProperties.getDiscoveryRefreshTimeout()
+ Long refreshTimeout = overrideProperties.getDiscoveryRefreshTimeout() != null ? overrideProperties.getDiscoveryRefreshTimeout()
: raProperties.getDiscoveryRefreshTimeout();
+ if (refreshTimeout == null)
+ {
+ refreshTimeout = HornetQClient.DEFAULT_DISCOVERY_REFRESH_TIMEOUT;
+ }
- long initialTimeout = overrideProperties.getDiscoveryInitialWaitTimeout() != null ? overrideProperties.getDiscoveryInitialWaitTimeout()
+ Long initialTimeout = overrideProperties.getDiscoveryInitialWaitTimeout() != null ? overrideProperties.getDiscoveryInitialWaitTimeout()
: raProperties.getDiscoveryInitialWaitTimeout();
+ if(initialTimeout == null)
+ {
+ initialTimeout = HornetQClient.DEFAULT_DISCOVERY_INITIAL_WAIT_TIMEOUT;
+ }
+
groupConfiguration.setDiscoveryInitialWaitTimeout(initialTimeout);
groupConfiguration.setRefreshTimeout(refreshTimeout);
Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/ra/inflow/HornetQActivation.java
===================================================================
--- branches/Branch_2_2_EAP/src/main/org/hornetq/ra/inflow/HornetQActivation.java 2011-02-24 10:28:07 UTC (rev 10248)
+++ branches/Branch_2_2_EAP/src/main/org/hornetq/ra/inflow/HornetQActivation.java 2011-02-24 12:23:57 UTC (rev 10249)
@@ -560,7 +560,12 @@
inFailure.set(false);
}
}
-
+
+ public HornetQConnectionFactory getConnectionFactory()
+ {
+ return this.factory;
+ }
+
/**
* Handles the setup
*/
Modified: branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/ra/ResourceAdapterTest.java
===================================================================
--- branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/ra/ResourceAdapterTest.java 2011-02-24 10:28:07 UTC (rev 10248)
+++ branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/ra/ResourceAdapterTest.java 2011-02-24 12:23:57 UTC (rev 10249)
@@ -14,6 +14,7 @@
import org.hornetq.jms.client.HornetQConnectionFactory;
import org.hornetq.ra.HornetQResourceAdapter;
+import org.hornetq.ra.inflow.HornetQActivation;
import org.hornetq.ra.inflow.HornetQActivationSpec;
import javax.resource.ResourceException;
@@ -257,6 +258,65 @@
assertFalse(spec.isHasBeenUpdated());
assertTrue(endpoint.released);
}
+
+ public void testResourceAdapterSetupNoOverrideDiscovery() throws Exception
+ {
+ HornetQResourceAdapter qResourceAdapter = new HornetQResourceAdapter();
+ qResourceAdapter.setDiscoveryAddress("231.6.6.6");
+ qResourceAdapter.setDiscoveryPort(1234);
+ qResourceAdapter.setDiscoveryRefreshTimeout(1l);
+ qResourceAdapter.setDiscoveryInitialWaitTimeout(1l);
+ HornetQRATestBase.MyBootstrapContext ctx = new HornetQRATestBase.MyBootstrapContext();
+ qResourceAdapter.start(ctx);
+ HornetQActivationSpec spec = new HornetQActivationSpec();
+ spec.setResourceAdapter(qResourceAdapter);
+ spec.setUseJNDI(false);
+ spec.setDestinationType("javax.jms.Queue");
+ spec.setDestination(MDBQUEUE);
+ spec.setSetupAttempts(0);
+ //just to force using override params
+ spec.setBlockOnAcknowledge(true);
+ CountDownLatch latch = new CountDownLatch(1);
+ DummyMessageEndpoint endpoint = new DummyMessageEndpoint(latch);
+ DummyMessageEndpointFactory endpointFactory = new DummyMessageEndpointFactory(endpoint, false);
+ qResourceAdapter.endpointActivation(endpointFactory, spec);
+ HornetQActivation activation = qResourceAdapter.getActivations().get(spec);
+ HornetQConnectionFactory fac = activation.getConnectionFactory();
+ assertEquals(fac.getServerLocator().getDiscoveryGroupConfiguration().getGroupAddress(), "231.6.6.6");
+ assertEquals(fac.getServerLocator().getDiscoveryGroupConfiguration().getGroupPort(), 1234);
+ assertEquals(fac.getServerLocator().getDiscoveryGroupConfiguration().getRefreshTimeout(), 1l);
+ assertEquals(fac.getServerLocator().getDiscoveryGroupConfiguration().getDiscoveryInitialWaitTimeout(), 1l);
+ qResourceAdapter.stop();
+ }
+
+ public void testResourceAdapterSetupOverrideDiscovery() throws Exception
+ {
+ HornetQResourceAdapter qResourceAdapter = new HornetQResourceAdapter();
+ qResourceAdapter.setDiscoveryAddress("231.7.7.7");
+ HornetQRATestBase.MyBootstrapContext ctx = new HornetQRATestBase.MyBootstrapContext();
+ qResourceAdapter.start(ctx);
+ HornetQActivationSpec spec = new HornetQActivationSpec();
+ spec.setResourceAdapter(qResourceAdapter);
+ spec.setUseJNDI(false);
+ spec.setDestinationType("javax.jms.Queue");
+ spec.setDestination(MDBQUEUE);
+ spec.setSetupAttempts(0);
+ spec.setDiscoveryAddress("231.6.6.6");
+ spec.setDiscoveryPort(1234);
+ spec.setDiscoveryRefreshTimeout(1l);
+ spec.setDiscoveryInitialWaitTimeout(1l);
+ CountDownLatch latch = new CountDownLatch(1);
+ DummyMessageEndpoint endpoint = new DummyMessageEndpoint(latch);
+ DummyMessageEndpointFactory endpointFactory = new DummyMessageEndpointFactory(endpoint, false);
+ qResourceAdapter.endpointActivation(endpointFactory, spec);
+ HornetQActivation activation = qResourceAdapter.getActivations().get(spec);
+ HornetQConnectionFactory fac = activation.getConnectionFactory();
+ assertEquals(fac.getServerLocator().getDiscoveryGroupConfiguration().getGroupAddress(), "231.6.6.6");
+ assertEquals(fac.getServerLocator().getDiscoveryGroupConfiguration().getGroupPort(), 1234);
+ assertEquals(fac.getServerLocator().getDiscoveryGroupConfiguration().getRefreshTimeout(), 1l);
+ assertEquals(fac.getServerLocator().getDiscoveryGroupConfiguration().getDiscoveryInitialWaitTimeout(), 1l);
+ qResourceAdapter.stop();
+ }
@Override
public boolean isSecure()
13 years, 10 months
- 1
- 0
JBoss hornetq SVN: r10248 - in branches/Branch_2_2_EAP: tests/src/org/hornetq/tests/integration/ra and 1 other directory.
by do-not-reply＠jboss.org
Author: ataylor
Date: 2011-02-24 05:28:07 -0500 (Thu, 24 Feb 2011)
New Revision: 10248
Modified:
branches/Branch_2_2_EAP/src/main/org/hornetq/ra/ConnectionFactoryProperties.java
branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/ra/ResourceAdapterTest.java
Log:
https://issues.jboss.org/browse/JBPAPP-5987 - removed hasbeenupdated=true from getters
Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/ra/ConnectionFactoryProperties.java
===================================================================
--- branches/Branch_2_2_EAP/src/main/org/hornetq/ra/ConnectionFactoryProperties.java 2011-02-24 09:32:14 UTC (rev 10247)
+++ branches/Branch_2_2_EAP/src/main/org/hornetq/ra/ConnectionFactoryProperties.java 2011-02-24 10:28:07 UTC (rev 10248)
@@ -162,7 +162,6 @@
{
ConnectionFactoryProperties.log.trace("getDiscoveryAddress()");
}
- hasBeenUpdated = true;
return discoveryAddress;
}
@@ -182,7 +181,6 @@
{
ConnectionFactoryProperties.log.trace("getDiscoveryPort()");
}
- hasBeenUpdated = true;
return discoveryPort;
}
@@ -202,7 +200,6 @@
{
ConnectionFactoryProperties.log.trace("getDiscoveryRefreshTimeout()");
}
- hasBeenUpdated = true;
return discoveryRefreshTimeout;
}
@@ -222,7 +219,6 @@
{
ConnectionFactoryProperties.log.trace("getDiscoveryInitialWaitTimeout()");
}
- hasBeenUpdated = true;
return discoveryInitialWaitTimeout;
}
@@ -242,7 +238,6 @@
{
ConnectionFactoryProperties.log.trace("getClientID()");
}
- hasBeenUpdated = true;
return clientID;
}
@@ -268,7 +263,6 @@
{
ConnectionFactoryProperties.log.trace("getDupsOKBatchSize()");
}
- hasBeenUpdated = true;
return dupsOKBatchSize;
}
@@ -288,7 +282,6 @@
{
ConnectionFactoryProperties.log.trace("getTransactionBatchSize()");
}
- hasBeenUpdated = true;
return transactionBatchSize;
}
@@ -308,7 +301,6 @@
{
ConnectionFactoryProperties.log.trace("getClientFailureCheckPeriod()");
}
- hasBeenUpdated = true;
return clientFailureCheckPeriod;
}
@@ -328,7 +320,6 @@
{
ConnectionFactoryProperties.log.trace("getConnectionTTL()");
}
- hasBeenUpdated = true;
return connectionTTL;
}
@@ -348,7 +339,6 @@
{
ConnectionFactoryProperties.log.trace("getCallTimeout()");
}
- hasBeenUpdated = true;
return callTimeout;
}
@@ -368,7 +358,6 @@
{
ConnectionFactoryProperties.log.trace("getConsumerWindowSize()");
}
- hasBeenUpdated = true;
return consumerWindowSize;
}
@@ -388,7 +377,6 @@
{
ConnectionFactoryProperties.log.trace("getConsumerMaxRate()");
}
- hasBeenUpdated = true;
return consumerMaxRate;
}
@@ -408,7 +396,6 @@
{
ConnectionFactoryProperties.log.trace("getConfirmationWindowSize()");
}
- hasBeenUpdated = true;
return confirmationWindowSize;
}
@@ -428,7 +415,6 @@
{
ConnectionFactoryProperties.log.trace("getProducerMaxRate()");
}
- hasBeenUpdated = true;
return producerMaxRate;
}
@@ -448,7 +434,6 @@
{
ConnectionFactoryProperties.log.trace("getMinLargeMessageSize()");
}
- hasBeenUpdated = true;
return minLargeMessageSize;
}
@@ -468,7 +453,6 @@
{
ConnectionFactoryProperties.log.trace("isBlockOnAcknowledge()");
}
- hasBeenUpdated = true;
return blockOnAcknowledge;
}
@@ -488,7 +472,6 @@
{
ConnectionFactoryProperties.log.trace("isBlockOnNonDurableSend()");
}
- hasBeenUpdated = true;
return blockOnNonDurableSend;
}
@@ -508,7 +491,6 @@
{
ConnectionFactoryProperties.log.trace("isBlockOnDurableSend()");
}
- hasBeenUpdated = true;
return blockOnDurableSend;
}
@@ -528,7 +510,6 @@
{
ConnectionFactoryProperties.log.trace("isAutoGroup()");
}
- hasBeenUpdated = true;
return autoGroup;
}
@@ -548,7 +529,6 @@
{
ConnectionFactoryProperties.log.trace("isPreAcknowledge()");
}
- hasBeenUpdated = true;
return preAcknowledge;
}
@@ -568,7 +548,6 @@
{
ConnectionFactoryProperties.log.trace("getRetryInterval()");
}
- hasBeenUpdated = true;
return retryInterval;
}
@@ -588,7 +567,6 @@
{
ConnectionFactoryProperties.log.trace("getRetryIntervalMultiplier()");
}
- hasBeenUpdated = true;
return retryIntervalMultiplier;
}
@@ -608,7 +586,6 @@
{
ConnectionFactoryProperties.log.trace("getReconnectAttempts()");
}
- hasBeenUpdated = true;
return reconnectAttempts;
}
@@ -628,7 +605,6 @@
{
ConnectionFactoryProperties.log.trace("isUseGlobalPools()");
}
- hasBeenUpdated = true;
return useGlobalPools;
}
@@ -648,7 +624,6 @@
{
ConnectionFactoryProperties.log.trace("getScheduledThreadPoolMaxSize()");
}
- hasBeenUpdated = true;
return scheduledThreadPoolMaxSize;
}
@@ -668,7 +643,6 @@
{
ConnectionFactoryProperties.log.trace("getThreadPoolMaxSize()");
}
- hasBeenUpdated = true;
return threadPoolMaxSize;
}
Modified: branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/ra/ResourceAdapterTest.java
===================================================================
--- branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/ra/ResourceAdapterTest.java 2011-02-24 09:32:14 UTC (rev 10247)
+++ branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/ra/ResourceAdapterTest.java 2011-02-24 10:28:07 UTC (rev 10248)
@@ -235,6 +235,28 @@
qResourceAdapter.stop();
assertTrue(endpoint.released);
}
+
+ public void testResourceAdapterSetupOverrideNoCFParams() throws Exception
+ {
+ HornetQResourceAdapter qResourceAdapter = new HornetQResourceAdapter();
+ qResourceAdapter.setConnectorClassName(INVM_CONNECTOR_FACTORY);
+ qResourceAdapter.setConnectionParameters("server-id=0");
+ HornetQRATestBase.MyBootstrapContext ctx = new HornetQRATestBase.MyBootstrapContext();
+ qResourceAdapter.start(ctx);
+ HornetQActivationSpec spec = new HornetQActivationSpec();
+ spec.setResourceAdapter(qResourceAdapter);
+ spec.setUseJNDI(false);
+ spec.setDestinationType("javax.jms.Queue");
+ spec.setDestination(MDBQUEUE);
+
+ CountDownLatch latch = new CountDownLatch(1);
+ DummyMessageEndpoint endpoint = new DummyMessageEndpoint(latch);
+ DummyMessageEndpointFactory endpointFactory = new DummyMessageEndpointFactory(endpoint, false);
+ qResourceAdapter.endpointActivation(endpointFactory, spec);
+ qResourceAdapter.stop();
+ assertFalse(spec.isHasBeenUpdated());
+ assertTrue(endpoint.released);
+ }
@Override
public boolean isSecure()
13 years, 10 months
- 1
- 0
JBoss hornetq SVN: r10247 - branches/Branch_2_2_EAP/src/main/org/hornetq/ra.
by do-not-reply＠jboss.org
Author: ataylor
Date: 2011-02-24 04:32:14 -0500 (Thu, 24 Feb 2011)
New Revision: 10247
Modified:
branches/Branch_2_2_EAP/src/main/org/hornetq/ra/HornetQResourceAdapter.java
Log:
make sure default factory is closed
Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/ra/HornetQResourceAdapter.java
===================================================================
--- branches/Branch_2_2_EAP/src/main/org/hornetq/ra/HornetQResourceAdapter.java 2011-02-23 06:11:48 UTC (rev 10246)
+++ branches/Branch_2_2_EAP/src/main/org/hornetq/ra/HornetQResourceAdapter.java 2011-02-24 09:32:14 UTC (rev 10247)
@@ -228,6 +228,8 @@
activations.clear();
+ defaultHornetQConnectionFactory.close();
+
HornetQResourceAdapter.log.info("HornetQ resource adapter stopped");
}
13 years, 10 months
- 1
- 0
JBoss hornetq SVN: r10246 - tags.
by do-not-reply＠jboss.org
Author: clebert.suconic(a)jboss.com
Date: 2011-02-23 01:11:48 -0500 (Wed, 23 Feb 2011)
New Revision: 10246
Added:
tags/HornetQ_2_2_EAP_GA/
Log:
Tagging EAP release
13 years, 10 months
- 1
- 0
JBoss hornetq SVN: r10245 - in branches/Branch_2_2_EAP: hornetq-rest and 1 other directory.
by do-not-reply＠jboss.org
Author: clebert.suconic(a)jboss.com
Date: 2011-02-23 00:59:17 -0500 (Wed, 23 Feb 2011)
New Revision: 10245
Modified:
branches/Branch_2_2_EAP/build-maven.xml
branches/Branch_2_2_EAP/hornetq-rest/pom.xml
Log:
increase release
Modified: branches/Branch_2_2_EAP/build-maven.xml
===================================================================
--- branches/Branch_2_2_EAP/build-maven.xml 2011-02-23 05:56:49 UTC (rev 10244)
+++ branches/Branch_2_2_EAP/build-maven.xml 2011-02-23 05:59:17 UTC (rev 10245)
@@ -13,7 +13,7 @@
-->
<project default="upload" name="HornetQ">
- <property name="hornetq.version" value="2.2.0.EAP-QA-10231"/>
+ <property name="hornetq.version" value="2.2.0.GA"/>
<property name="build.dir" value="build"/>
<property name="jars.dir" value="${build.dir}/jars"/>
Modified: branches/Branch_2_2_EAP/hornetq-rest/pom.xml
===================================================================
--- branches/Branch_2_2_EAP/hornetq-rest/pom.xml 2011-02-23 05:56:49 UTC (rev 10244)
+++ branches/Branch_2_2_EAP/hornetq-rest/pom.xml 2011-02-23 05:59:17 UTC (rev 10245)
@@ -10,7 +10,7 @@
<properties>
<resteasy.version>2.0.1.GA</resteasy.version>
- <hornetq.version>2.2.0.EAP-QA-10231</hornetq.version>
+ <hornetq.version>2.2.0.GA</hornetq.version>
</properties>
<licenses>
13 years, 10 months
- 1
- 0
JBoss hornetq SVN: r10244 - branches/Branch_2_2_EAP/src/config/common.
by do-not-reply＠jboss.org
Author: clebert.suconic(a)jboss.com
Date: 2011-02-23 00:56:49 -0500 (Wed, 23 Feb 2011)
New Revision: 10244
Modified:
branches/Branch_2_2_EAP/src/config/common/hornetq-version.properties
Log:
HornetQ release change
Modified: branches/Branch_2_2_EAP/src/config/common/hornetq-version.properties
===================================================================
--- branches/Branch_2_2_EAP/src/config/common/hornetq-version.properties 2011-02-23 01:30:42 UTC (rev 10243)
+++ branches/Branch_2_2_EAP/src/config/common/hornetq-version.properties 2011-02-23 05:56:49 UTC (rev 10244)
@@ -1,9 +1,9 @@
-hornetq.version.versionName=QA_10231
+hornetq.version.versionName=Bzzzzz
hornetq.version.majorVersion=2
hornetq.version.minorVersion=2
hornetq.version.microVersion=0
-hornetq.version.incrementingVersion=120
-hornetq.version.versionSuffix=CR1
-hornetq.version.versionTag=CR1
+hornetq.version.incrementingVersion=121
+hornetq.version.versionSuffix=GA
+hornetq.version.versionTag=GA
hornetq.netty.version=(a)NETTY.VERSION@
-hornetq.version.compatibleVersionList=100-1000
+hornetq.version.compatibleVersionList=121
13 years, 10 months
- 1
- 0
JBoss hornetq SVN: r10243 - in branches/Branch_2_2_EAP: src/main/org/hornetq/core/paging/cursor/impl and 2 other directories.
by do-not-reply＠jboss.org
Author: clebert.suconic(a)jboss.com
Date: 2011-02-22 20:30:42 -0500 (Tue, 22 Feb 2011)
New Revision: 10243
Modified:
branches/Branch_2_2_EAP/src/main/org/hornetq/core/paging/PagingStore.java
branches/Branch_2_2_EAP/src/main/org/hornetq/core/paging/cursor/impl/PageCursorProviderImpl.java
branches/Branch_2_2_EAP/src/main/org/hornetq/core/paging/cursor/impl/PageSubscriptionImpl.java
branches/Branch_2_2_EAP/src/main/org/hornetq/core/paging/impl/PagingStoreImpl.java
branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/client/PagingTest.java
Log:
JBPAPP-5973 - fixing empty files after paging
Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/core/paging/PagingStore.java
===================================================================
--- branches/Branch_2_2_EAP/src/main/org/hornetq/core/paging/PagingStore.java 2011-02-23 00:58:50 UTC (rev 10242)
+++ branches/Branch_2_2_EAP/src/main/org/hornetq/core/paging/PagingStore.java 2011-02-23 01:30:42 UTC (rev 10243)
@@ -72,6 +72,8 @@
Page createPage(final int page) throws Exception;
+ boolean checkPage(final int page) throws Exception;
+
PagingManager getPagingManager();
PageCursorProvider getCursorProvier();
Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/core/paging/cursor/impl/PageCursorProviderImpl.java
===================================================================
--- branches/Branch_2_2_EAP/src/main/org/hornetq/core/paging/cursor/impl/PageCursorProviderImpl.java 2011-02-23 00:58:50 UTC (rev 10242)
+++ branches/Branch_2_2_EAP/src/main/org/hornetq/core/paging/cursor/impl/PageCursorProviderImpl.java 2011-02-23 01:30:42 UTC (rev 10243)
@@ -438,6 +438,11 @@
cache = softCache.get(pageId);
if (cache == null)
{
+ if (!pagingStore.checkPage((int)pageId))
+ {
+ return null;
+ }
+
cache = createPageCache(pageId);
needToRead = true;
// anyone reading from this cache will have to wait reading to finish first
@@ -464,9 +469,7 @@
{
pdgMessage.initMessage(storageManager);
}
-
cache.setMessages(pgdMessages.toArray(new PagedMessage[pgdMessages.size()]));
-
}
finally
{
Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/core/paging/cursor/impl/PageSubscriptionImpl.java
===================================================================
--- branches/Branch_2_2_EAP/src/main/org/hornetq/core/paging/cursor/impl/PageSubscriptionImpl.java 2011-02-23 00:58:50 UTC (rev 10242)
+++ branches/Branch_2_2_EAP/src/main/org/hornetq/core/paging/cursor/impl/PageSubscriptionImpl.java 2011-02-23 01:30:42 UTC (rev 10243)
@@ -319,13 +319,8 @@
PageCache cache = cursorProvider.getPageCache(pos);
- if (cache == null)
+ if (cache == null || (!cache.isLive() && retPos.getMessageNr() >= cache.getNumberOfMessages()))
{
- return null;
- }
-
- if (!cache.isLive() && retPos.getMessageNr() >= cache.getNumberOfMessages())
- {
retPos = pos.nextPage();
cache = cursorProvider.getPageCache(retPos);
Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/core/paging/impl/PagingStoreImpl.java
===================================================================
--- branches/Branch_2_2_EAP/src/main/org/hornetq/core/paging/impl/PagingStoreImpl.java 2011-02-23 00:58:50 UTC (rev 10242)
+++ branches/Branch_2_2_EAP/src/main/org/hornetq/core/paging/impl/PagingStoreImpl.java 2011-02-23 01:30:42 UTC (rev 10243)
@@ -13,6 +13,7 @@
package org.hornetq.core.paging.impl;
+import java.io.File;
import java.text.DecimalFormat;
import java.util.Collections;
import java.util.HashSet;
@@ -560,6 +561,13 @@
{
return currentPage;
}
+
+ public boolean checkPage(final int pageNumber)
+ {
+ String fileName = createFileName(pageNumber);
+ SequentialFile file = fileFactory.createSequentialFile(fileName, 1);
+ return file.exists();
+ }
public Page createPage(final int pageNumber) throws Exception
{
Modified: branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/client/PagingTest.java
===================================================================
--- branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/client/PagingTest.java 2011-02-23 00:58:50 UTC (rev 10242)
+++ branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/client/PagingTest.java 2011-02-23 01:30:42 UTC (rev 10243)
@@ -29,6 +29,7 @@
import junit.framework.AssertionFailedError;
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.api.core.client.ClientConsumer;
@@ -454,7 +455,6 @@
try
{
server.stop();
- // System.exit(-1);
}
catch (Throwable ignored)
{
@@ -2787,7 +2787,154 @@
}
}
}
+
+
+ public void testPageAndDepageRapidly() throws Exception
+ {
+ boolean persistentMessages = true;
+ clearData();
+
+ Configuration config = createDefaultConfig();
+
+ config.setJournalSyncNonTransactional(false);
+ config.setJournalFileSize(10 * 1024 * 1024);
+
+ HornetQServer server = createServer(true,
+ config,
+ 512 * 1024,
+ 1024 * 1024,
+ new HashMap<String, AddressSettings>());
+
+ server.start();
+
+ final int messageSize = 51527;
+
+ final int numberOfMessages = 200;
+
+ try
+ {
+ ServerLocator locator = createInVMNonHALocator();
+
+ locator.setBlockOnNonDurableSend(true);
+ locator.setBlockOnDurableSend(true);
+ locator.setBlockOnAcknowledge(true);
+
+ final ClientSessionFactory sf = locator.createSessionFactory();
+
+ ClientSession session = sf.createSession(true, true);
+
+ session.createQueue(PagingTest.ADDRESS, PagingTest.ADDRESS, null, true);
+
+ ClientProducer producer = session.createProducer(PagingTest.ADDRESS);
+
+ final AtomicInteger errors = new AtomicInteger(0);
+
+ Thread consumeThread = new Thread()
+ {
+ public void run()
+ {
+ ClientSession sessionConsumer = null;
+ try
+ {
+ sessionConsumer = sf.createSession(false, false);
+ sessionConsumer.start();
+
+ ClientConsumer cons = sessionConsumer.createConsumer(ADDRESS);
+
+ for (int i = 0; i < numberOfMessages; i++)
+ {
+ ClientMessage msg = cons.receive(PagingTest.RECEIVE_TIMEOUT);
+ System.out.println("Message " + i + " consumed");
+ assertNotNull(msg);
+ msg.acknowledge();
+
+ if (i % 20 == 0)
+ {
+ System.out.println("Commit consumer");
+ sessionConsumer.commit();
+ }
+ }
+ sessionConsumer.commit();
+ }
+ catch (Throwable e)
+ {
+ e.printStackTrace();
+ errors.incrementAndGet();
+ }
+ finally
+ {
+ try
+ {
+ sessionConsumer.close();
+ }
+ catch (HornetQException e)
+ {
+ e.printStackTrace();
+ errors.incrementAndGet();
+ }
+ }
+
+ }
+ };
+
+ consumeThread.start();
+
+ ClientMessage message = null;
+
+ byte[] body = new byte[messageSize];
+
+ for (int i = 0; i < numberOfMessages; i++)
+ {
+ message = session.createMessage(persistentMessages);
+
+ System.out.println("Message " + i + " sent");
+
+ HornetQBuffer bodyLocal = message.getBodyBuffer();
+
+ bodyLocal.writeBytes(body);
+
+ message.putIntProperty(new SimpleString("id"), i);
+
+ producer.send(message);
+
+ Thread.sleep(50);
+ }
+
+
+ consumeThread.join();
+
+ long timeout = System.currentTimeMillis() + 5000;
+
+ while (System.currentTimeMillis() < timeout && (server.getPagingManager().getPageStore(ADDRESS).isPaging() || server.getPagingManager().getPageStore(ADDRESS).getNumberOfPages() != 1))
+ {
+ Thread.sleep(1);
+ }
+
+ // It's async, so need to wait a bit for it happening
+ assertFalse(server.getPagingManager().getPageStore(ADDRESS).isPaging());
+
+ assertEquals(1, server.getPagingManager().getPageStore(ADDRESS).getNumberOfPages());
+
+ sf.close();
+
+ locator.close();
+ }
+ finally
+ {
+ try
+ {
+ server.stop();
+ }
+ catch (Throwable ignored)
+ {
+ }
+ }
+
+ }
+
+
+
// Package protected ---------------------------------------------
// Protected -----------------------------------------------------
13 years, 10 months
- 1
- 0
JBoss hornetq SVN: r10242 - branches/Branch_2_2_EAP/docs/user-manual.
by do-not-reply＠jboss.org
Author: clebert.suconic(a)jboss.com
Date: 2011-02-22 19:58:50 -0500 (Tue, 22 Feb 2011)
New Revision: 10242
Modified:
branches/Branch_2_2_EAP/docs/user-manual/
Log:
svn:ignore
Property changes on: branches/Branch_2_2_EAP/docs/user-manual
___________________________________________________________________
Modified: svn:ignore
- build
+ build
target
13 years, 10 months
- 1
- 0
JBoss hornetq SVN: r10241 - in branches/Branch_2_2_EAP/src/main/org/hornetq: core/paging/cursor/impl and 5 other directories.
by do-not-reply＠jboss.org
Author: clebert.suconic(a)jboss.com
Date: 2011-02-22 16:40:25 -0500 (Tue, 22 Feb 2011)
New Revision: 10241
Modified:
branches/Branch_2_2_EAP/src/main/org/hornetq/core/client/impl/ServerLocatorImpl.java
branches/Branch_2_2_EAP/src/main/org/hornetq/core/client/impl/Topology.java
branches/Branch_2_2_EAP/src/main/org/hornetq/core/paging/cursor/impl/PageSubscriptionImpl.java
branches/Branch_2_2_EAP/src/main/org/hornetq/core/postoffice/impl/DuplicateIDCacheImpl.java
branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/cluster/impl/ClusterConnectionImpl.java
branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java
branches/Branch_2_2_EAP/src/main/org/hornetq/jms/management/impl/JMSServerControlImpl.java
branches/Branch_2_2_EAP/src/main/org/hornetq/utils/SoftValueHashMap.java
Log:
Removing System.outs
Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/core/client/impl/ServerLocatorImpl.java
===================================================================
--- branches/Branch_2_2_EAP/src/main/org/hornetq/core/client/impl/ServerLocatorImpl.java 2011-02-22 16:45:53 UTC (rev 10240)
+++ branches/Branch_2_2_EAP/src/main/org/hornetq/core/client/impl/ServerLocatorImpl.java 2011-02-22 21:40:25 UTC (rev 10241)
@@ -1285,7 +1285,7 @@
topologyListeners.add(listener);
if(topology.members() > 0)
{
- System.out.println("ServerLocatorImpl.addClusterTopologyListener");
+ log.debug("ServerLocatorImpl.addClusterTopologyListener");
}
}
Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/core/client/impl/Topology.java
===================================================================
--- branches/Branch_2_2_EAP/src/main/org/hornetq/core/client/impl/Topology.java 2011-02-22 16:45:53 UTC (rev 10240)
+++ branches/Branch_2_2_EAP/src/main/org/hornetq/core/client/impl/Topology.java 2011-02-22 21:40:25 UTC (rev 10241)
@@ -20,6 +20,7 @@
import org.hornetq.api.core.TransportConfiguration;
import org.hornetq.api.core.client.ClusterTopologyListener;
+import org.hornetq.core.logging.Logger;
/**
* @author <a href="mailto:andy.taylor@jboss.org">Andy Taylor</a>
@@ -27,10 +28,16 @@
*/
public class Topology implements Serializable
{
+
/**
*
*/
private static final long serialVersionUID = -9037171688692471371L;
+
+
+
+ private static final Logger log = Logger.getLogger(Topology.class);
+
/*
* topology describes the other cluster nodes that this server knows about:
*
@@ -49,7 +56,7 @@
{
if(member.getConnector().toString().contains("server-id=4"))
{
- System.out.println("member.getConnector() = " + member.getConnector());
+ log.debug("member.getConnector() = " + member.getConnector());
}
}
if(currentMember == null)
Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/core/paging/cursor/impl/PageSubscriptionImpl.java
===================================================================
--- branches/Branch_2_2_EAP/src/main/org/hornetq/core/paging/cursor/impl/PageSubscriptionImpl.java 2011-02-22 16:45:53 UTC (rev 10240)
+++ branches/Branch_2_2_EAP/src/main/org/hornetq/core/paging/cursor/impl/PageSubscriptionImpl.java 2011-02-22 21:40:25 UTC (rev 10241)
@@ -390,14 +390,20 @@
for (PagePosition pos : entry.getValue().acks)
{
- System.out.println("Analizing " + pos);
+ if (isTrace)
+ {
+ trace("Analizing " + pos);
+ }
if (retValue == null || retValue.getMessageNr() > pos.getMessageNr())
{
retValue = pos;
}
}
- System.out.println("Returning initial position " + retValue);
+ if (isTrace)
+ {
+ trace("Returning initial position " + retValue);
+ }
return retValue;
}
Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/core/postoffice/impl/DuplicateIDCacheImpl.java
===================================================================
--- branches/Branch_2_2_EAP/src/main/org/hornetq/core/postoffice/impl/DuplicateIDCacheImpl.java 2011-02-22 16:45:53 UTC (rev 10240)
+++ branches/Branch_2_2_EAP/src/main/org/hornetq/core/postoffice/impl/DuplicateIDCacheImpl.java 2011-02-22 21:40:25 UTC (rev 10241)
@@ -145,10 +145,6 @@
storageManager.deleteDuplicateID(id.b);
id.b = null;
}
- else
- {
- System.out.println("Can't delete duplicateID");
- }
}
}
Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/cluster/impl/ClusterConnectionImpl.java
===================================================================
--- branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/cluster/impl/ClusterConnectionImpl.java 2011-02-22 16:45:53 UTC (rev 10240)
+++ branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/cluster/impl/ClusterConnectionImpl.java 2011-02-22 21:40:25 UTC (rev 10241)
@@ -458,7 +458,7 @@
{
if(!topologyMember.getConnector().a.equals(connector) && !topologyMember.getConnector().a.equals(connectorPair.a))
{
- System.out.println("ClusterConnectionImpl.nodeUP");
+ log.debug("ClusterConnectionImpl.nodeUP");
}
}
}
Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java
===================================================================
--- branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java 2011-02-22 16:45:53 UTC (rev 10240)
+++ branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java 2011-02-22 21:40:25 UTC (rev 10241)
@@ -609,10 +609,6 @@
public void stop(boolean failoverOnServerShutdown) throws Exception
{
- System.out.println("*** stop called on server");
-
- System.out.flush();
-
synchronized (this)
{
if (!started)
@@ -635,11 +631,6 @@
}
- // we stop the remoting service outside a lock
- if(remotingService == null)
- {
- System.out.println("HornetQServerImpl.stop");
- }
remotingService.stop();
synchronized (this)
Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/jms/management/impl/JMSServerControlImpl.java
===================================================================
--- branches/Branch_2_2_EAP/src/main/org/hornetq/jms/management/impl/JMSServerControlImpl.java 2011-02-22 16:45:53 UTC (rev 10240)
+++ branches/Branch_2_2_EAP/src/main/org/hornetq/jms/management/impl/JMSServerControlImpl.java 2011-02-22 21:40:25 UTC (rev 10241)
@@ -38,6 +38,7 @@
import org.hornetq.api.jms.management.JMSServerControl;
import org.hornetq.api.jms.management.TopicControl;
import org.hornetq.core.filter.Filter;
+import org.hornetq.core.logging.Logger;
import org.hornetq.core.management.impl.AbstractControl;
import org.hornetq.core.management.impl.MBeanInfoHelper;
import org.hornetq.core.server.ServerConsumer;
@@ -63,6 +64,8 @@
// Constants -----------------------------------------------------
+ private static final Logger log = Logger.getLogger(JMSServerControlImpl.class);
+
// Attributes ----------------------------------------------------
private final JMSServerManager server;
@@ -124,7 +127,7 @@
}
else
{
- System.out.println("JMSServerControlImpl.determineJMSDestination()" + coreAddress);
+ log.debug("JMSServerControlImpl.determineJMSDestination()" + coreAddress);
// not related to JMS
return null;
}
Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/utils/SoftValueHashMap.java
===================================================================
--- branches/Branch_2_2_EAP/src/main/org/hornetq/utils/SoftValueHashMap.java 2011-02-22 16:45:53 UTC (rev 10240)
+++ branches/Branch_2_2_EAP/src/main/org/hornetq/utils/SoftValueHashMap.java 2011-02-22 21:40:25 UTC (rev 10241)
@@ -353,7 +353,6 @@
AggregatedSoftReference ref = null;
while ((ref = (AggregatedSoftReference)this.refQueue.poll()) != null)
{
- System.out.println("Removing " + ref.key);
mapDelegate.remove(ref.key);
}
}
13 years, 10 months
- 1
- 0
JBoss hornetq SVN: r10240 - in branches/Branch_2_2_EAP: docs/eap-manual and 10 other directories.
by do-not-reply＠jboss.org
Author: ataylor
Date: 2011-02-22 11:45:53 -0500 (Tue, 22 Feb 2011)
New Revision: 10240
Added:
branches/Branch_2_2_EAP/docs/eap-manual/en/Author_Group.xml
branches/Branch_2_2_EAP/docs/eap-manual/en/Book_Info.xml
branches/Branch_2_2_EAP/docs/eap-manual/en/HornetQ_EAP_Manual.ent
branches/Branch_2_2_EAP/docs/eap-manual/en/HornetQ_EAP_Manual.xml
branches/Branch_2_2_EAP/docs/eap-manual/pom.xml
branches/Branch_2_2_EAP/docs/quickstart-guide/en/Author_Group.xml
branches/Branch_2_2_EAP/docs/quickstart-guide/en/Book_Info.xml
branches/Branch_2_2_EAP/docs/quickstart-guide/en/HornetQ_QuickStart_Guide.ent
branches/Branch_2_2_EAP/docs/quickstart-guide/en/HornetQ_QuickStart_Guide.xml
branches/Branch_2_2_EAP/docs/quickstart-guide/pom.xml
branches/Branch_2_2_EAP/docs/user-manual/en/Author_Group.xml
branches/Branch_2_2_EAP/docs/user-manual/en/Book_Info.xml
branches/Branch_2_2_EAP/docs/user-manual/en/HornetQ_User_Manual.ent
branches/Branch_2_2_EAP/docs/user-manual/en/HornetQ_User_Manual.xml
branches/Branch_2_2_EAP/docs/user-manual/pom.xml
Removed:
branches/Branch_2_2_EAP/docs/eap-manual/en/master.xml
branches/Branch_2_2_EAP/docs/quickstart-guide/en/master.xml
branches/Branch_2_2_EAP/docs/user-manual/en/master.xml
branches/Branch_2_2_EAP/lib/
Modified:
branches/Branch_2_2_EAP/build-hornetq.xml
branches/Branch_2_2_EAP/docs/eap-manual/
branches/Branch_2_2_EAP/docs/eap-manual/build.xml
branches/Branch_2_2_EAP/docs/quickstart-guide/build.xml
branches/Branch_2_2_EAP/docs/quickstart-guide/en/about.xml
branches/Branch_2_2_EAP/docs/quickstart-guide/en/download.xml
branches/Branch_2_2_EAP/docs/quickstart-guide/en/examples.xml
branches/Branch_2_2_EAP/docs/quickstart-guide/en/installation.xml
branches/Branch_2_2_EAP/docs/quickstart-guide/en/introduction.xml
branches/Branch_2_2_EAP/docs/quickstart-guide/en/notice.xml
branches/Branch_2_2_EAP/docs/quickstart-guide/en/running.xml
branches/Branch_2_2_EAP/docs/user-manual/build.xml
branches/Branch_2_2_EAP/docs/user-manual/en/appserver-integration.xml
branches/Branch_2_2_EAP/docs/user-manual/en/architecture.xml
branches/Branch_2_2_EAP/docs/user-manual/en/client-classpath.xml
branches/Branch_2_2_EAP/docs/user-manual/en/client-reconnection.xml
branches/Branch_2_2_EAP/docs/user-manual/en/clusters.xml
branches/Branch_2_2_EAP/docs/user-manual/en/configuration-index.xml
branches/Branch_2_2_EAP/docs/user-manual/en/configuring-transports.xml
branches/Branch_2_2_EAP/docs/user-manual/en/connection-ttl.xml
branches/Branch_2_2_EAP/docs/user-manual/en/core-bridges.xml
branches/Branch_2_2_EAP/docs/user-manual/en/diverts.xml
branches/Branch_2_2_EAP/docs/user-manual/en/duplicate-detection.xml
branches/Branch_2_2_EAP/docs/user-manual/en/embedding-hornetq.xml
branches/Branch_2_2_EAP/docs/user-manual/en/examples.xml
branches/Branch_2_2_EAP/docs/user-manual/en/filter-expressions.xml
branches/Branch_2_2_EAP/docs/user-manual/en/flow-control.xml
branches/Branch_2_2_EAP/docs/user-manual/en/ha.xml
branches/Branch_2_2_EAP/docs/user-manual/en/intercepting-operations.xml
branches/Branch_2_2_EAP/docs/user-manual/en/interoperability.xml
branches/Branch_2_2_EAP/docs/user-manual/en/jms-bridge.xml
branches/Branch_2_2_EAP/docs/user-manual/en/jms-core-mapping.xml
branches/Branch_2_2_EAP/docs/user-manual/en/large-messages.xml
branches/Branch_2_2_EAP/docs/user-manual/en/last-value-queues.xml
branches/Branch_2_2_EAP/docs/user-manual/en/libaio.xml
branches/Branch_2_2_EAP/docs/user-manual/en/logging.xml
branches/Branch_2_2_EAP/docs/user-manual/en/management.xml
branches/Branch_2_2_EAP/docs/user-manual/en/message-expiry.xml
branches/Branch_2_2_EAP/docs/user-manual/en/message-grouping.xml
branches/Branch_2_2_EAP/docs/user-manual/en/messaging-concepts.xml
branches/Branch_2_2_EAP/docs/user-manual/en/notice.xml
branches/Branch_2_2_EAP/docs/user-manual/en/paging.xml
branches/Branch_2_2_EAP/docs/user-manual/en/perf-tuning.xml
branches/Branch_2_2_EAP/docs/user-manual/en/persistence.xml
branches/Branch_2_2_EAP/docs/user-manual/en/pre-acknowledge.xml
branches/Branch_2_2_EAP/docs/user-manual/en/preface.xml
branches/Branch_2_2_EAP/docs/user-manual/en/project-info.xml
branches/Branch_2_2_EAP/docs/user-manual/en/queue-attributes.xml
branches/Branch_2_2_EAP/docs/user-manual/en/scheduled-messages.xml
branches/Branch_2_2_EAP/docs/user-manual/en/security.xml
branches/Branch_2_2_EAP/docs/user-manual/en/send-guarantees.xml
branches/Branch_2_2_EAP/docs/user-manual/en/spring-integration.xml
branches/Branch_2_2_EAP/docs/user-manual/en/thread-pooling.xml
branches/Branch_2_2_EAP/docs/user-manual/en/transaction-config.xml
branches/Branch_2_2_EAP/docs/user-manual/en/undelivered-messages.xml
branches/Branch_2_2_EAP/docs/user-manual/en/using-core.xml
branches/Branch_2_2_EAP/docs/user-manual/en/using-jms.xml
branches/Branch_2_2_EAP/docs/user-manual/en/using-server.xml
branches/Branch_2_2_EAP/docs/user-manual/en/wildcard-routing.xml
branches/Branch_2_2_EAP/docs/user-manual/en/wildcard-syntax.xml
branches/Branch_2_2_EAP/examples/common/build.xml
branches/Branch_2_2_EAP/examples/javaee/common/build.xml
branches/Branch_2_2_EAP/examples/javaee/mdb-cmt-tx-required/src/org/hornetq/javaee/example/MDB_CMT_TxRequiredClientExample.java
branches/Branch_2_2_EAP/examples/javaee/mdb-cmt-tx-required/src/org/hornetq/javaee/example/server/MDB_CMT_TxRequiredExample.java
branches/Branch_2_2_EAP/examples/jms/clustered-static-oneway/src/org/hornetq/jms/example/ClusterStaticOnewayExample.java
Log:
https://issues.jboss.org/browse/HORNETQ-648 - updated to jdocbook
Modified: branches/Branch_2_2_EAP/build-hornetq.xml
===================================================================
--- branches/Branch_2_2_EAP/build-hornetq.xml 2011-02-22 06:31:16 UTC (rev 10239)
+++ branches/Branch_2_2_EAP/build-hornetq.xml 2011-02-22 16:45:53 UTC (rev 10240)
@@ -123,9 +123,9 @@
<property name="logs.dir" value="logs"/>
<property name="licenses.dir" value="licenses"/>
<property name="doc.examples.dir" value="examples"/>
- <property name="user-manual.build.dir" value="${doc.dir}/user-manual/build"/>
+ <property name="user-manual.build.dir" value="${doc.dir}/user-manual/target/docbook/publish"/>
<property name="rest-manual.build.dir" value="hornetq-rest/docbook/target/docbook/publish/en-US"/>
- <property name="quickstart-guide.build.dir" value="${doc.dir}/quickstart-guide/build"/>
+ <property name="quickstart-guide.build.dir" value="${doc.dir}/quickstart-guide/target/docbook/publish"/>
<property name="build.api.dir" value="${build.dir}/api"/>
<property name="native.bin.dir" value="native/bin"/>
<property name="examples.dir" value="examples"/>
@@ -1240,9 +1240,6 @@
<fileset dir="${com.sun.xml.stream.lib}">
<include name="*.jar"/>
</fileset>
- <fileset dir="${org.slf4j.lib}">
- <include name="*.jar"/>
- </fileset>
<fileset dir="${org.scannotation.lib}">
<include name="*.jar"/>
</fileset>
Property changes on: branches/Branch_2_2_EAP/docs/eap-manual
___________________________________________________________________
Deleted: svn:ignore
- build
Modified: branches/Branch_2_2_EAP/docs/eap-manual/build.xml
===================================================================
--- branches/Branch_2_2_EAP/docs/eap-manual/build.xml 2011-02-22 06:31:16 UTC (rev 10239)
+++ branches/Branch_2_2_EAP/docs/eap-manual/build.xml 2011-02-22 16:45:53 UTC (rev 10240)
@@ -10,21 +10,28 @@
~ implied. See the License for the specific language governing
~ permissions and limitations under the License.
-->
+<project name="HornetQ EAP Manual" default="all" basedir=".">
+ <target name="maven-init">
+ <property name="maven.home" location="${basedir}/../../tools/maven"/>
+ <echo message="Maven Home set to ${maven.home}"/>
+ </target>
-<project name="HornetQ User Manual" default="all" basedir=".">
+ <target name="clean" depends="maven-init">
+ <condition property="mvn.cmd" value="mvn.bat" else="mvn">
+ <os family="windows"/>
+ </condition>
+ <exec executable="${mvn.cmd}">
+ <arg line="clean"/>
+ </exec>
+ </target>
- <property name="build.dir" value="build"/>
- <property name="pdf.name" value="HornetQ_EAPManual.pdf"/>
- <import file="${basedir}/../../lib/docbook-support/support.xml"/>
+ <target name="all" depends="maven-init">
+ <condition property="mvn.cmd" value="mvn.bat" else="mvn">
+ <os family="windows"/>
+ </condition>
+ <exec executable="${mvn.cmd}">
+ <arg line="install"/>
+ </exec>
+ </target>
- <target name="all" depends="clean">
- <mkdir dir="en/images" />
- <antcall target="lang.all"><param name="lang" value="en"/></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>
- </target>
-
</project>
Added: branches/Branch_2_2_EAP/docs/eap-manual/en/Author_Group.xml
===================================================================
--- branches/Branch_2_2_EAP/docs/eap-manual/en/Author_Group.xml (rev 0)
+++ branches/Branch_2_2_EAP/docs/eap-manual/en/Author_Group.xml 2011-02-22 16:45:53 UTC (rev 10240)
@@ -0,0 +1,30 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!--
+ ~ Copyright 2009 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.
+ -->
+
+<!DOCTYPE authorgroup PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "HornetQ_EAP_Manual.ent">
+%BOOK_ENTITIES;
+]>
+<authorgroup>
+ <author>
+ <firstname>Andy</firstname>
+ <surname>Taylor</surname>
+ <affiliation>
+ <shortaffil>Red Hat, Inc.</shortaffil>
+ <jobtitle>Core Developer</jobtitle>
+ <orgdiv>JBoss</orgdiv>
+ </affiliation>
+ <email>ataylor(a)redhat.com</email>
+ </author>
+</authorgroup>
Added: branches/Branch_2_2_EAP/docs/eap-manual/en/Book_Info.xml
===================================================================
--- branches/Branch_2_2_EAP/docs/eap-manual/en/Book_Info.xml (rev 0)
+++ branches/Branch_2_2_EAP/docs/eap-manual/en/Book_Info.xml 2011-02-22 16:45:53 UTC (rev 10240)
@@ -0,0 +1,44 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!--
+ ~ Copyright 2009 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.
+ -->
+
+<!-- This document was created with Syntext Serna Free. -->
+<!DOCTYPE bookinfo PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "HornetQ_EAP_Manual.ent">
+%BOOK_ENTITIES;
+]>
+<bookinfo id="HornetQ_EAP_Manual">
+ <title>HornetQ Eap Manual</title>
+ <subtitle>Putting the buzz in messaging</subtitle>
+ <productname>HornetQ</productname>
+ <edition>2.1.0</edition>
+ <pubsnumber>1</pubsnumber>
+ <abstract>
+ <para>This is a guide to using HornetQ within EAP</para>
+ </abstract>
+ <corpauthor>
+ <inlinemediaobject>
+ <imageobject>
+ <imagedata fileref="images/hornetQ_logo_600px.png" format="PNG"/>
+ </imageobject>
+ <textobject>
+ <phrase>HornetQ Logo</phrase>
+ </textobject>
+ </inlinemediaobject>
+ </corpauthor>
+ <copyright>
+ <year>&YEAR;</year>
+ <holder>&HOLDER;</holder>
+ </copyright>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Author_Group.xml"/>
+</bookinfo>
Added: branches/Branch_2_2_EAP/docs/eap-manual/en/HornetQ_EAP_Manual.ent
===================================================================
--- branches/Branch_2_2_EAP/docs/eap-manual/en/HornetQ_EAP_Manual.ent (rev 0)
+++ branches/Branch_2_2_EAP/docs/eap-manual/en/HornetQ_EAP_Manual.ent 2011-02-22 16:45:53 UTC (rev 10240)
@@ -0,0 +1,7 @@
+<!ENTITY PRODUCT "HornetQ">
+<!ENTITY BOOKID "HornetQ_EAP_Manual">
+<!ENTITY YEAR "2011">
+<!ENTITY HOLDER "Red Hat Inc.">
+<!ENTITY semi ";">
+
+
Added: branches/Branch_2_2_EAP/docs/eap-manual/en/HornetQ_EAP_Manual.xml
===================================================================
--- branches/Branch_2_2_EAP/docs/eap-manual/en/HornetQ_EAP_Manual.xml (rev 0)
+++ branches/Branch_2_2_EAP/docs/eap-manual/en/HornetQ_EAP_Manual.xml 2011-02-22 16:45:53 UTC (rev 10240)
@@ -0,0 +1,24 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!--
+ ~ Copyright 2009 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.
+ -->
+
+<!-- This document was created with Syntext Serna Free. -->
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "HornetQ_EAP_Manual.ent">
+%BOOK_ENTITIES;
+
+]>
+<book>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Book_Info.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="clusters.xml"/>
+</book>
Deleted: branches/Branch_2_2_EAP/docs/eap-manual/en/master.xml
===================================================================
--- branches/Branch_2_2_EAP/docs/eap-manual/en/master.xml 2011-02-22 06:31:16 UTC (rev 10239)
+++ branches/Branch_2_2_EAP/docs/eap-manual/en/master.xml 2011-02-22 16:45:53 UTC (rev 10240)
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- ~ Copyright 2009 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.
- -->
-
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3CR3//EN"
- "../../../lib/docbook-support/support/docbook-dtd/docbookx.dtd" [
- <!ENTITY clusters SYSTEM "clusters.xml">
- ]>
-<book lang="en">
- <bookinfo>
- <title>HornetQ EAP Guide</title>
- <subtitle>Putting the buzz in messaging</subtitle>
- </bookinfo>
-
- <toc></toc>
-
- &clusters;
-</book>
Added: branches/Branch_2_2_EAP/docs/eap-manual/pom.xml
===================================================================
--- branches/Branch_2_2_EAP/docs/eap-manual/pom.xml (rev 0)
+++ branches/Branch_2_2_EAP/docs/eap-manual/pom.xml 2011-02-22 16:45:53 UTC (rev 10240)
@@ -0,0 +1,305 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ ~ Copyright 2009 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.
+ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.jboss.project</groupId>
+ <artifactId>${docname}-${translation}</artifactId>
+ <version>1.0</version>
+ <packaging>jdocbook</packaging>
+ <name>${bookname}-(${translation})</name>
+
+ <properties>
+ <translation>en</translation>
+ <docname>HornetQ_EAP_Manual</docname>
+ <bookname>HornetQ EAP Manual</bookname>
+ </properties>
+
+ <repositories>
+ <repository>
+ <id>jboss-public-repository-group</id>
+ <name>JBoss Public Maven Repository Group</name>
+ <url>https://repository.jboss.org/nexus/content/groups/public/</url>
+ <layout>default</layout>
+ <releases>
+ <enabled>true</enabled>
+ <updatePolicy>never</updatePolicy>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ <updatePolicy>never</updatePolicy>
+ </snapshots>
+ </repository>
+ </repositories>
+ <pluginRepositories>
+ <pluginRepository>
+ <id>jboss-public-repository-group</id>
+ <name>JBoss Public Maven Repository Group</name>
+ <url>https://repository.jboss.org/nexus/content/groups/public/</url>
+ <layout>default</layout>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </pluginRepository>
+ <!--pluginRepository>
+ <id>jboss-snapshot-repository-group</id>
+ <name>JBoss Snapshot Maven Repository Group</name>
+ <url>https://repository.jboss.org/nexus/content/groups/snapshot/</url>
+ <layout>default</layout>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </pluginRepository-->
+ </pluginRepositories>
+
+ <profiles>
+
+ <!-- mvn compile -->
+ <profile>
+ <id>all</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.jboss.maven.plugins</groupId>
+ <artifactId>maven-jdocbook-plugin</artifactId>
+ <version>2.2.1</version>
+ <extensions>true</extensions>
+ <configuration>
+ <formats>
+ <format>
+ <formatName>pdf</formatName>
+ <stylesheetResource>classpath:/xslt/org/jboss/pdf.xsl</stylesheetResource>
+ <finalName>${docname}.pdf</finalName>
+ </format>
+ <format>
+ <formatName>html</formatName>
+ <stylesheetResource>classpath:/xslt/org/jboss/xhtml.xsl</stylesheetResource>
+ <finalName>index.html</finalName>
+ </format>
+ <format>
+ <formatName>html_single</formatName>
+ <stylesheetResource>classpath:/xslt/org/jboss/xhtml-single.xsl</stylesheetResource>
+ <finalName>index.html</finalName>
+ </format>
+ </formats>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <!-- mvn compile -Phtml -->
+ <profile>
+ <id>html</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.jboss.maven.plugins</groupId>
+ <artifactId>maven-jdocbook-plugin</artifactId>
+ <version>2.2.1</version>
+ <extensions>true</extensions>
+ <configuration>
+ <formats>
+ <format>
+ <formatName>html</formatName>
+ <stylesheetResource>classpath:/xslt/org/jboss/xhtml.xsl</stylesheetResource>
+ <finalName>index.html</finalName>
+ </format>
+ </formats>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <!-- mvn compile -Phtml-single -->
+ <profile>
+ <id>html-single</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.jboss.maven.plugins</groupId>
+ <artifactId>maven-jdocbook-plugin</artifactId>
+ <version>2.2.1</version>
+ <extensions>true</extensions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <!-- mvn compile -Ppdf -->
+ <profile>
+ <id>pdf</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.jboss.maven.plugins</groupId>
+ <artifactId>maven-jdocbook-plugin</artifactId>
+ <version>2.1.0</version>
+ <extensions>true</extensions>
+ <configuration>
+ <formats>
+ <format>
+ <formatName>pdf</formatName>
+ <stylesheetResource>classpath:/xslt/org/jboss/pdf.xsl</stylesheetResource>
+ <finalName>${docname}.pdf</finalName>
+ </format>
+ </formats>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ </profiles>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.jboss.maven.plugins</groupId>
+ <artifactId>maven-jdocbook-plugin</artifactId>
+ <version>2.2.1</version>
+ <extensions>true</extensions>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.pressgang</groupId>
+ <artifactId>pressgang-xslt</artifactId>
+ <version>1.2.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jbossorg-jdocbook-style</artifactId>
+ <version>1.1.1</version>
+ <type>jdocbook-style</type>
+ </dependency>
+ </dependencies>
+ <configuration>
+ <sourceDirectory>${project.basedir}</sourceDirectory>
+ <sourceDocumentName>${docname}.xml</sourceDocumentName>
+ <masterTranslation>en</masterTranslation>
+ <imageResource>
+ <directory>${project.basedir}/en</directory>
+ <includes>
+ <include>images/*.png</include>
+ </includes>
+ </imageResource>
+ <formats>
+ <format>
+ <formatName>pdf</formatName>
+ <stylesheetResource>classpath:/xslt/org/jboss/pdf.xsl</stylesheetResource>
+ <finalName>${pdf.name}</finalName>
+ </format>
+ <format>
+ <formatName>html</formatName>
+ <stylesheetResource>classpath:/xslt/org/jboss/xhtml.xsl</stylesheetResource>
+ <finalName>index.html</finalName>
+ </format>
+ <format>
+ <formatName>html_single</formatName>
+ <stylesheetResource>classpath:/xslt/org/jboss/xhtml-single.xsl</stylesheetResource>
+ <finalName>index.html</finalName>
+ </format>
+ </formats>
+ <options>
+ <xincludeSupported>true</xincludeSupported>
+ <xmlTransformerType>saxon</xmlTransformerType>
+ <docbookVersion>1.72.0</docbookVersion>
+ <localeSeparator>-</localeSeparator>
+ <transformerParameters>
+ <property>
+ <name>javax.xml.parsers.DocumentBuilderFactory</name>
+ <value>org.apache.xerces.jaxp.DocumentBuilderFactoryImpl</value>
+ </property>
+ <property>
+ <name>javax.xml.parsers.SAXParserFactory</name>
+ <value>org.apache.xerces.jaxp.SAXParserFactoryImpl</value>
+ </property>
+ </transformerParameters>
+ </options>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+ <!--<build>
+ <plugins>
+ <plugin>
+ <groupId>org.jboss.maven.plugins</groupId>
+ <artifactId>maven-jdocbook-plugin</artifactId>
+ <version>2.2.1</version>
+ <extensions>true</extensions>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.pressgang</groupId>
+ <artifactId>pressgang-xslt</artifactId>
+ <version>1.2.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jbossorg-jdocbook-style</artifactId>
+ <version>1.1.1</version>
+ <type>jdocbook-style</type>
+ </dependency>
+ </dependencies>
+ <configuration>
+ <sourceDocumentName>${docname}.xml</sourceDocumentName>
+ <sourceDirectory>.</sourceDirectory>
+ <imageResource>
+ <directory>${translation}</directory>
+ <includes>
+ <include>images/*</include>
+ </includes>
+ </imageResource>
+ <options>
+ <xincludeSupported>true</xincludeSupported>
+ <xmlTransformerType>saxon</xmlTransformerType>
+ <transformerParameters>
+ <property>
+ <name>javax.xml.parsers.DocumentBuilderFactory</name>
+ <value>org.apache.xerces.jaxp.DocumentBuilderFactoryImpl</value>
+ </property>
+ <property>
+ <name>javax.xml.parsers.SAXParserFactory</name>
+ <value>org.apache.xerces.jaxp.SAXParserFactoryImpl</value>
+ </property>
+ </transformerParameters>
+ </options>
+ </configuration>
+ </plugin>
+
+ </plugins>
+ </build>-->
+
+</project>
Modified: branches/Branch_2_2_EAP/docs/quickstart-guide/build.xml
===================================================================
--- branches/Branch_2_2_EAP/docs/quickstart-guide/build.xml 2011-02-22 06:31:16 UTC (rev 10239)
+++ branches/Branch_2_2_EAP/docs/quickstart-guide/build.xml 2011-02-22 16:45:53 UTC (rev 10240)
@@ -1,23 +1,27 @@
<project name="HornetQ QuickStart Guide" default="all" basedir=".">
- <property name="build.dir" value="build"/>
- <property name="pdf.name" value="HornetQ_QuickStartGuide.pdf"/>
- <import file="${basedir}/../../lib/docbook-support/support.xml"/>
- <target name="all" depends="clean">
- <mkdir dir="en/images" />
- <antcall target="lang.all"><param name="lang" value="en"/></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 name="maven-init">
+ <property name="maven.home" location="${basedir}/../../tools/maven"/>
+ <echo message="Maven Home set to ${maven.home}"/>
</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>
+ <target name="clean" depends="maven-init">
+ <condition property="mvn.cmd" value="mvn.bat" else="mvn">
+ <os family="windows"/>
+ </condition>
+ <exec executable="${mvn.cmd}">
+ <arg line="clean"/>
+ </exec>
+ </target>
+ <target name="all" depends="maven-init">
+ <condition property="mvn.cmd" value="mvn.bat" else="mvn">
+ <os family="windows"/>
+ </condition>
+ <exec executable="${mvn.cmd}">
+ <arg line="install"/>
+ </exec>
+ </target>
+
</project>
Added: branches/Branch_2_2_EAP/docs/quickstart-guide/en/Author_Group.xml
===================================================================
--- branches/Branch_2_2_EAP/docs/quickstart-guide/en/Author_Group.xml (rev 0)
+++ branches/Branch_2_2_EAP/docs/quickstart-guide/en/Author_Group.xml 2011-02-22 16:45:53 UTC (rev 10240)
@@ -0,0 +1,45 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE authorgroup PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "HornetQ_QuickStart_Guide.ent">
+%BOOK_ENTITIES;
+]>
+<authorgroup>
+ <author>
+ <firstname>Clebert</firstname>
+ <surname>Suconic</surname>
+ <affiliation>
+ <shortaffil>Red Hat, Inc.</shortaffil>
+ <jobtitle>Project Lead</jobtitle>
+ <orgdiv>JBoss</orgdiv>
+ </affiliation>
+ <email>csuconic(a)redhat.com</email>
+ </author>
+ <author>
+ <firstname>Andy</firstname>
+ <surname>Taylor</surname>
+ <affiliation>
+ <shortaffil>Red Hat, Inc.</shortaffil>
+ <jobtitle>Core Developer</jobtitle>
+ <orgdiv>JBoss</orgdiv>
+ </affiliation>
+ <email>ataylor(a)redhat.com</email>
+ </author>
+ <author>
+ <firstname>Tim</firstname>
+ <surname>Fox</surname>
+ </author>
+ <author>
+ <firstname>Jeff</firstname>
+ <surname>Mesnil</surname>
+ </author>
+ <author>
+ <firstname>Howard</firstname>
+ <surname>Gao</surname>
+ <affiliation>
+ <shortaffil>Red Hat, Inc.</shortaffil>
+ <jobtitle>Core Developer</jobtitle>
+ <orgdiv>JBoss</orgdiv>
+ </affiliation>
+ <email>ghoward(a)redhat.com</email>
+ </author>
+</authorgroup>
Added: branches/Branch_2_2_EAP/docs/quickstart-guide/en/Book_Info.xml
===================================================================
--- branches/Branch_2_2_EAP/docs/quickstart-guide/en/Book_Info.xml (rev 0)
+++ branches/Branch_2_2_EAP/docs/quickstart-guide/en/Book_Info.xml 2011-02-22 16:45:53 UTC (rev 10240)
@@ -0,0 +1,31 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!-- This document was created with Syntext Serna Free. --><!DOCTYPE bookinfo PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "HornetQ_QuickStart_Guide.ent">
+%BOOK_ENTITIES;
+]>
+<bookinfo id="HornetQ_QuickStart_Guide">
+ <title>HornetQ QuickStart Guide</title>
+ <subtitle>Putting the buzz in messaging</subtitle>
+ <productname>HornetQ</productname>
+ <edition>2.1.0</edition>
+ <pubsnumber>1</pubsnumber>
+ <abstract>
+ <para>This Quickstart guide will help you get HornetQ up and running in a few minutes and will explain the basics needed
+ to get started.</para>
+ </abstract>
+ <corpauthor>
+ <inlinemediaobject>
+ <imageobject>
+ <imagedata fileref="images/hornetQ_logo_600px.png" format="PNG"/>
+ </imageobject>
+ <textobject>
+ <phrase>HornetQ Logo</phrase>
+ </textobject>
+ </inlinemediaobject>
+ </corpauthor>
+ <copyright>
+ <year>&YEAR;</year>
+ <holder>&HOLDER;</holder>
+ </copyright>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Author_Group.xml"/>
+</bookinfo>
Added: branches/Branch_2_2_EAP/docs/quickstart-guide/en/HornetQ_QuickStart_Guide.ent
===================================================================
--- branches/Branch_2_2_EAP/docs/quickstart-guide/en/HornetQ_QuickStart_Guide.ent (rev 0)
+++ branches/Branch_2_2_EAP/docs/quickstart-guide/en/HornetQ_QuickStart_Guide.ent 2011-02-22 16:45:53 UTC (rev 10240)
@@ -0,0 +1,5 @@
+<!ENTITY PRODUCT "HornetQ">
+<!ENTITY BOOKID "HornetQ_QuickStart_Guide">
+<!ENTITY YEAR "2011">
+<!ENTITY HOLDER "Red Hat Inc.">
+<!ENTITY semi ";">
Added: branches/Branch_2_2_EAP/docs/quickstart-guide/en/HornetQ_QuickStart_Guide.xml
===================================================================
--- branches/Branch_2_2_EAP/docs/quickstart-guide/en/HornetQ_QuickStart_Guide.xml (rev 0)
+++ branches/Branch_2_2_EAP/docs/quickstart-guide/en/HornetQ_QuickStart_Guide.xml 2011-02-22 16:45:53 UTC (rev 10240)
@@ -0,0 +1,17 @@
+<?xml version='1.0' encoding='UTF-8'?>
+
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "HornetQ_QuickStart_Guide.ent">
+%BOOK_ENTITIES;
+
+]>
+<book>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Book_Info.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="notice.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="about.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="introduction.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="download.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="installation.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="running.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="examples.xml"/>
+</book>
Modified: branches/Branch_2_2_EAP/docs/quickstart-guide/en/about.xml
===================================================================
--- branches/Branch_2_2_EAP/docs/quickstart-guide/en/about.xml 2011-02-22 06:31:16 UTC (rev 10239)
+++ branches/Branch_2_2_EAP/docs/quickstart-guide/en/about.xml 2011-02-22 16:45:53 UTC (rev 10240)
@@ -18,6 +18,11 @@
<!-- permitted by applicable law. -->
<!-- ============================================================================= -->
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "HornetQ_QuickStart_Guide.ent">
+%BOOK_ENTITIES;
+]>
+
<chapter id="about">
<title>About HornetQ</title>
<para>What is HornetQ?</para>
Modified: branches/Branch_2_2_EAP/docs/quickstart-guide/en/download.xml
===================================================================
--- branches/Branch_2_2_EAP/docs/quickstart-guide/en/download.xml 2011-02-22 06:31:16 UTC (rev 10239)
+++ branches/Branch_2_2_EAP/docs/quickstart-guide/en/download.xml 2011-02-22 16:45:53 UTC (rev 10240)
@@ -16,6 +16,11 @@
<!-- and agrees not to assert, Section 4d of CC-BY-SA to the fullest extent -->
<!-- permitted by applicable law. -->
<!-- ============================================================================= -->
+
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "HornetQ_QuickStart_Guide.ent">
+%BOOK_ENTITIES;
+]>
<chapter id="download">
<title>Download</title>
<para>The official HornetQ project page is <ulink url="http://hornetq.org/"
Modified: branches/Branch_2_2_EAP/docs/quickstart-guide/en/examples.xml
===================================================================
--- branches/Branch_2_2_EAP/docs/quickstart-guide/en/examples.xml 2011-02-22 06:31:16 UTC (rev 10239)
+++ branches/Branch_2_2_EAP/docs/quickstart-guide/en/examples.xml 2011-02-22 16:45:53 UTC (rev 10240)
@@ -16,6 +16,11 @@
<!-- and agrees not to assert, Section 4d of CC-BY-SA to the fullest extent -->
<!-- permitted by applicable law. -->
<!-- ============================================================================= -->
+
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "HornetQ_QuickStart_Guide.ent">
+%BOOK_ENTITIES;
+]>
<chapter id="examples">
<title>Running the Examples</title>
<para>In the directory <literal>examples</literal> there are 2 sets of examples, these are </para>
Modified: branches/Branch_2_2_EAP/docs/quickstart-guide/en/installation.xml
===================================================================
--- branches/Branch_2_2_EAP/docs/quickstart-guide/en/installation.xml 2011-02-22 06:31:16 UTC (rev 10239)
+++ branches/Branch_2_2_EAP/docs/quickstart-guide/en/installation.xml 2011-02-22 16:45:53 UTC (rev 10240)
@@ -16,6 +16,11 @@
<!-- and agrees not to assert, Section 4d of CC-BY-SA to the fullest extent -->
<!-- permitted by applicable law. -->
<!-- ============================================================================= -->
+
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "HornetQ_QuickStart_Guide.ent">
+%BOOK_ENTITIES;
+]>
<chapter id="installation">
<title>Installation</title>
<para>This section describes how to install HornetQ. </para>
Modified: branches/Branch_2_2_EAP/docs/quickstart-guide/en/introduction.xml
===================================================================
--- branches/Branch_2_2_EAP/docs/quickstart-guide/en/introduction.xml 2011-02-22 06:31:16 UTC (rev 10239)
+++ branches/Branch_2_2_EAP/docs/quickstart-guide/en/introduction.xml 2011-02-22 16:45:53 UTC (rev 10240)
@@ -16,6 +16,11 @@
<!-- and agrees not to assert, Section 4d of CC-BY-SA to the fullest extent -->
<!-- permitted by applicable law. -->
<!-- ============================================================================= -->
+
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "HornetQ_QuickStart_Guide.ent">
+%BOOK_ENTITIES;
+]>
<chapter id="introduction">
<title>Getting Started</title>
<para>This short guide explains how to download, install and quickly get started with
Deleted: branches/Branch_2_2_EAP/docs/quickstart-guide/en/master.xml
===================================================================
--- branches/Branch_2_2_EAP/docs/quickstart-guide/en/master.xml 2011-02-22 06:31:16 UTC (rev 10239)
+++ branches/Branch_2_2_EAP/docs/quickstart-guide/en/master.xml 2011-02-22 16:45:53 UTC (rev 10240)
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ============================================================================= -->
-<!-- Copyright © 2009 Red Hat, Inc. and others. -->
-<!-- -->
-<!-- The text of and illustrations in this document are licensed by Red Hat under -->
-<!-- a Creative Commons Attribution–Share Alike 3.0 Unported license ("CC-BY-SA"). -->
-<!-- -->
-<!-- An explanation of CC-BY-SA is available at -->
-<!-- -->
-<!-- http://creativecommons.org/licenses/by-sa/3.0/. -->
-<!-- -->
-<!-- In accordance with CC-BY-SA, if you distribute this document or an adaptation -->
-<!-- of it, you must provide the URL for the original version. -->
-<!-- -->
-<!-- Red Hat, as the licensor of this document, waives the right to enforce, -->
-<!-- and agrees not to assert, Section 4d of CC-BY-SA to the fullest extent -->
-<!-- permitted by applicable law. -->
-<!-- ============================================================================= -->
-
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3CR3//EN"
- "../../../lib/docbook-support/support/docbook-dtd/docbookx.dtd" [
- <!ENTITY about SYSTEM "about.xml">
- <!ENTITY download SYSTEM "download.xml">
- <!ENTITY examples SYSTEM "examples.xml">
- <!ENTITY installation SYSTEM "installation.xml">
- <!ENTITY introduction SYSTEM "introduction.xml">
- <!ENTITY notice SYSTEM "notice.xml">
- <!ENTITY running SYSTEM "running.xml">
- ]>
-<book lang="en">
- <bookinfo>
- <title>HornetQ Quickstart Guide</title>
- <subtitle>Putting the buzz in messaging</subtitle>
- </bookinfo>
-
- <toc></toc>
-
- ¬ice;
- &about;
- &introduction;
- &download;
- &installation;
- &running;
- &examples;
-</book>
Modified: branches/Branch_2_2_EAP/docs/quickstart-guide/en/notice.xml
===================================================================
--- branches/Branch_2_2_EAP/docs/quickstart-guide/en/notice.xml 2011-02-22 06:31:16 UTC (rev 10239)
+++ branches/Branch_2_2_EAP/docs/quickstart-guide/en/notice.xml 2011-02-22 16:45:53 UTC (rev 10240)
@@ -16,6 +16,11 @@
<!-- permitted by applicable law. -->
<!-- ============================================================================= -->
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "HornetQ_QuickStart_Guide.ent">
+%BOOK_ENTITIES;
+]>
+
<chapter id="notice">
<title>Legal Notice</title>
Modified: branches/Branch_2_2_EAP/docs/quickstart-guide/en/running.xml
===================================================================
--- branches/Branch_2_2_EAP/docs/quickstart-guide/en/running.xml 2011-02-22 06:31:16 UTC (rev 10239)
+++ branches/Branch_2_2_EAP/docs/quickstart-guide/en/running.xml 2011-02-22 16:45:53 UTC (rev 10240)
@@ -16,6 +16,11 @@
<!-- and agrees not to assert, Section 4d of CC-BY-SA to the fullest extent -->
<!-- permitted by applicable law. -->
<!-- ============================================================================= -->
+
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "HornetQ_QuickStart_Guide.ent">
+%BOOK_ENTITIES;
+]>
<chapter id="running">
<title>Starting The Server</title>
<section id="running.standalone">
Added: branches/Branch_2_2_EAP/docs/quickstart-guide/pom.xml
===================================================================
--- branches/Branch_2_2_EAP/docs/quickstart-guide/pom.xml (rev 0)
+++ branches/Branch_2_2_EAP/docs/quickstart-guide/pom.xml 2011-02-22 16:45:53 UTC (rev 10240)
@@ -0,0 +1,292 @@
+<?xml version="1.0" encoding="utf-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.jboss.project</groupId>
+ <artifactId>${docname}-${translation}</artifactId>
+ <version>1.0</version>
+ <packaging>jdocbook</packaging>
+ <name>${bookname}-(${translation})</name>
+
+ <properties>
+ <translation>en</translation>
+ <docname>HornetQ_QuickStart_Guide</docname>
+ <bookname>HornetQ QuickStart Guide</bookname>
+ </properties>
+
+ <repositories>
+ <repository>
+ <id>jboss-public-repository-group</id>
+ <name>JBoss Public Maven Repository Group</name>
+ <url>https://repository.jboss.org/nexus/content/groups/public/</url>
+ <layout>default</layout>
+ <releases>
+ <enabled>true</enabled>
+ <updatePolicy>never</updatePolicy>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ <updatePolicy>never</updatePolicy>
+ </snapshots>
+ </repository>
+ </repositories>
+ <pluginRepositories>
+ <pluginRepository>
+ <id>jboss-public-repository-group</id>
+ <name>JBoss Public Maven Repository Group</name>
+ <url>https://repository.jboss.org/nexus/content/groups/public/</url>
+ <layout>default</layout>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </pluginRepository>
+ <!--pluginRepository>
+ <id>jboss-snapshot-repository-group</id>
+ <name>JBoss Snapshot Maven Repository Group</name>
+ <url>https://repository.jboss.org/nexus/content/groups/snapshot/</url>
+ <layout>default</layout>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </pluginRepository-->
+ </pluginRepositories>
+
+ <profiles>
+
+ <!-- mvn compile -->
+ <profile>
+ <id>all</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.jboss.maven.plugins</groupId>
+ <artifactId>maven-jdocbook-plugin</artifactId>
+ <version>2.2.1</version>
+ <extensions>true</extensions>
+ <configuration>
+ <formats>
+ <format>
+ <formatName>pdf</formatName>
+ <stylesheetResource>classpath:/xslt/org/jboss/pdf.xsl</stylesheetResource>
+ <finalName>${docname}.pdf</finalName>
+ </format>
+ <format>
+ <formatName>html</formatName>
+ <stylesheetResource>classpath:/xslt/org/jboss/xhtml.xsl</stylesheetResource>
+ <finalName>index.html</finalName>
+ </format>
+ <format>
+ <formatName>html_single</formatName>
+ <stylesheetResource>classpath:/xslt/org/jboss/xhtml-single.xsl</stylesheetResource>
+ <finalName>index.html</finalName>
+ </format>
+ </formats>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <!-- mvn compile -Phtml -->
+ <profile>
+ <id>html</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.jboss.maven.plugins</groupId>
+ <artifactId>maven-jdocbook-plugin</artifactId>
+ <version>2.2.1</version>
+ <extensions>true</extensions>
+ <configuration>
+ <formats>
+ <format>
+ <formatName>html</formatName>
+ <stylesheetResource>classpath:/xslt/org/jboss/xhtml.xsl</stylesheetResource>
+ <finalName>index.html</finalName>
+ </format>
+ </formats>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <!-- mvn compile -Phtml-single -->
+ <profile>
+ <id>html-single</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.jboss.maven.plugins</groupId>
+ <artifactId>maven-jdocbook-plugin</artifactId>
+ <version>2.2.1</version>
+ <extensions>true</extensions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <!-- mvn compile -Ppdf -->
+ <profile>
+ <id>pdf</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.jboss.maven.plugins</groupId>
+ <artifactId>maven-jdocbook-plugin</artifactId>
+ <version>2.1.0</version>
+ <extensions>true</extensions>
+ <configuration>
+ <formats>
+ <format>
+ <formatName>pdf</formatName>
+ <stylesheetResource>classpath:/xslt/org/jboss/pdf.xsl</stylesheetResource>
+ <finalName>${docname}.pdf</finalName>
+ </format>
+ </formats>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ </profiles>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.jboss.maven.plugins</groupId>
+ <artifactId>maven-jdocbook-plugin</artifactId>
+ <version>2.2.1</version>
+ <extensions>true</extensions>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.pressgang</groupId>
+ <artifactId>pressgang-xslt</artifactId>
+ <version>1.2.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jbossorg-jdocbook-style</artifactId>
+ <version>1.1.1</version>
+ <type>jdocbook-style</type>
+ </dependency>
+ </dependencies>
+ <configuration>
+ <sourceDirectory>${project.basedir}</sourceDirectory>
+ <sourceDocumentName>${docname}.xml</sourceDocumentName>
+ <masterTranslation>en</masterTranslation>
+ <imageResource>
+ <directory>${project.basedir}/en</directory>
+ <includes>
+ <include>images/*.png</include>
+ </includes>
+ </imageResource>
+ <formats>
+ <format>
+ <formatName>pdf</formatName>
+ <stylesheetResource>classpath:/xslt/org/jboss/pdf.xsl</stylesheetResource>
+ <finalName>${pdf.name}</finalName>
+ </format>
+ <format>
+ <formatName>html</formatName>
+ <stylesheetResource>classpath:/xslt/org/jboss/xhtml.xsl</stylesheetResource>
+ <finalName>index.html</finalName>
+ </format>
+ <format>
+ <formatName>html_single</formatName>
+ <stylesheetResource>classpath:/xslt/org/jboss/xhtml-single.xsl</stylesheetResource>
+ <finalName>index.html</finalName>
+ </format>
+ </formats>
+ <options>
+ <xincludeSupported>true</xincludeSupported>
+ <xmlTransformerType>saxon</xmlTransformerType>
+ <docbookVersion>1.72.0</docbookVersion>
+ <localeSeparator>-</localeSeparator>
+ <transformerParameters>
+ <property>
+ <name>javax.xml.parsers.DocumentBuilderFactory</name>
+ <value>org.apache.xerces.jaxp.DocumentBuilderFactoryImpl</value>
+ </property>
+ <property>
+ <name>javax.xml.parsers.SAXParserFactory</name>
+ <value>org.apache.xerces.jaxp.SAXParserFactoryImpl</value>
+ </property>
+ </transformerParameters>
+ </options>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+ <!--<build>
+ <plugins>
+ <plugin>
+ <groupId>org.jboss.maven.plugins</groupId>
+ <artifactId>maven-jdocbook-plugin</artifactId>
+ <version>2.2.1</version>
+ <extensions>true</extensions>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.pressgang</groupId>
+ <artifactId>pressgang-xslt</artifactId>
+ <version>1.2.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jbossorg-jdocbook-style</artifactId>
+ <version>1.1.1</version>
+ <type>jdocbook-style</type>
+ </dependency>
+ </dependencies>
+ <configuration>
+ <sourceDocumentName>${docname}.xml</sourceDocumentName>
+ <sourceDirectory>.</sourceDirectory>
+ <imageResource>
+ <directory>${translation}</directory>
+ <includes>
+ <include>images/*</include>
+ </includes>
+ </imageResource>
+ <options>
+ <xincludeSupported>true</xincludeSupported>
+ <xmlTransformerType>saxon</xmlTransformerType>
+ <transformerParameters>
+ <property>
+ <name>javax.xml.parsers.DocumentBuilderFactory</name>
+ <value>org.apache.xerces.jaxp.DocumentBuilderFactoryImpl</value>
+ </property>
+ <property>
+ <name>javax.xml.parsers.SAXParserFactory</name>
+ <value>org.apache.xerces.jaxp.SAXParserFactoryImpl</value>
+ </property>
+ </transformerParameters>
+ </options>
+ </configuration>
+ </plugin>
+
+ </plugins>
+ </build>-->
+
+</project>
Modified: branches/Branch_2_2_EAP/docs/user-manual/build.xml
===================================================================
--- branches/Branch_2_2_EAP/docs/user-manual/build.xml 2011-02-22 06:31:16 UTC (rev 10239)
+++ branches/Branch_2_2_EAP/docs/user-manual/build.xml 2011-02-22 16:45:53 UTC (rev 10240)
@@ -1,23 +1,26 @@
<project name="HornetQ User Manual" default="all" basedir=".">
- <property name="build.dir" value="build"/>
- <property name="pdf.name" value="HornetQ_UserManual.pdf"/>
- <import file="${basedir}/../../lib/docbook-support/support.xml"/>
+ <target name="maven-init">
+ <property name="maven.home" location="${basedir}/../../tools/maven"/>
+ <echo message="Maven Home set to ${maven.home}"/>
+ </target>
- <target name="all" depends="clean">
- <mkdir dir="en/images" />
- <antcall target="lang.all"><param name="lang" value="en"/></antcall>
+ <target name="clean" depends="maven-init">
+ <condition property="mvn.cmd" value="mvn.bat" else="mvn">
+ <os family="windows"/>
+ </condition>
+ <exec executable="${mvn.cmd}">
+ <arg line="clean"/>
+ </exec>
+ </target>
- <!-- 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="all" depends="maven-init">
+ <condition property="mvn.cmd" value="mvn.bat" else="mvn">
+ <os family="windows"/>
+ </condition>
+ <exec executable="${mvn.cmd}">
+ <arg line="install"/>
+ </exec>
+ </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>
Added: branches/Branch_2_2_EAP/docs/user-manual/en/Author_Group.xml
===================================================================
--- branches/Branch_2_2_EAP/docs/user-manual/en/Author_Group.xml (rev 0)
+++ branches/Branch_2_2_EAP/docs/user-manual/en/Author_Group.xml 2011-02-22 16:45:53 UTC (rev 10240)
@@ -0,0 +1,58 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!--
+ ~ Copyright 2009 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.
+ -->
+
+<!DOCTYPE authorgroup PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "HornetQ_User_Manual.ent">
+%BOOK_ENTITIES;
+]>
+<authorgroup>
+ <author>
+ <firstname>Clebert</firstname>
+ <surname>Suconic</surname>
+ <affiliation>
+ <shortaffil>Red Hat, Inc.</shortaffil>
+ <jobtitle>Project Lead</jobtitle>
+ <orgdiv>JBoss</orgdiv>
+ </affiliation>
+ <email>csuconic(a)redhat.com</email>
+ </author>
+ <author>
+ <firstname>Andy</firstname>
+ <surname>Taylor</surname>
+ <affiliation>
+ <shortaffil>Red Hat, Inc.</shortaffil>
+ <jobtitle>Core Developer</jobtitle>
+ <orgdiv>JBoss</orgdiv>
+ </affiliation>
+ <email>ataylor(a)redhat.com</email>
+ </author>
+ <author>
+ <firstname>Tim</firstname>
+ <surname>Fox</surname>
+ </author>
+ <author>
+ <firstname>Jeff</firstname>
+ <surname>Mesnil</surname>
+ </author>
+ <author>
+ <firstname>Howard</firstname>
+ <surname>Gao</surname>
+ <affiliation>
+ <shortaffil>Red Hat, Inc.</shortaffil>
+ <jobtitle>Core Developer</jobtitle>
+ <orgdiv>JBoss</orgdiv>
+ </affiliation>
+ <email>ghoward(a)redhat.com</email>
+ </author>
+</authorgroup>
Added: branches/Branch_2_2_EAP/docs/user-manual/en/Book_Info.xml
===================================================================
--- branches/Branch_2_2_EAP/docs/user-manual/en/Book_Info.xml (rev 0)
+++ branches/Branch_2_2_EAP/docs/user-manual/en/Book_Info.xml 2011-02-22 16:45:53 UTC (rev 10240)
@@ -0,0 +1,43 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!--
+ ~ Copyright 2009 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.
+ -->
+
+<!DOCTYPE bookinfo PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "HornetQ_User_Manual.ent">
+%BOOK_ENTITIES;
+]>
+<bookinfo id="HornetQ_User_Manual">
+ <title>HornetQ User Manual</title>
+ <subtitle>Putting the buzz in messaging</subtitle>
+ <productname>HornetQ</productname>
+ <edition>2.1.0</edition>
+ <pubsnumber>1</pubsnumber>
+ <abstract>
+ <para>The User manual is an in depth manual on all aspects of HornetQ</para>
+ </abstract>
+ <corpauthor>
+ <inlinemediaobject>
+ <imageobject>
+ <imagedata fileref="images/hornetQ_logo_600px.png" format="PNG"/>
+ </imageobject>
+ <textobject>
+ <phrase>HornetQ Logo</phrase>
+ </textobject>
+ </inlinemediaobject>
+ </corpauthor>
+ <copyright>
+ <year>&YEAR;</year>
+ <holder>&HOLDER;</holder>
+ </copyright>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Author_Group.xml"/>
+</bookinfo>
Added: branches/Branch_2_2_EAP/docs/user-manual/en/HornetQ_User_Manual.ent
===================================================================
--- branches/Branch_2_2_EAP/docs/user-manual/en/HornetQ_User_Manual.ent (rev 0)
+++ branches/Branch_2_2_EAP/docs/user-manual/en/HornetQ_User_Manual.ent 2011-02-22 16:45:53 UTC (rev 10240)
@@ -0,0 +1,18 @@
+<!ENTITY PRODUCT "HornetQ">
+<!ENTITY BOOKID "HornetQ_QuickStart_Guide">
+<!ENTITY YEAR "2011">
+<!ENTITY HOLDER "Red Hat Inc.">
+<!ENTITY semi ";"><!--
+ ~ Copyright 2009 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.
+ -->
+
+
Added: branches/Branch_2_2_EAP/docs/user-manual/en/HornetQ_User_Manual.xml
===================================================================
--- branches/Branch_2_2_EAP/docs/user-manual/en/HornetQ_User_Manual.xml (rev 0)
+++ branches/Branch_2_2_EAP/docs/user-manual/en/HornetQ_User_Manual.xml 2011-02-22 16:45:53 UTC (rev 10240)
@@ -0,0 +1,70 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!--
+ ~ Copyright 2009 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.
+ -->
+
+<!-- This document was created with Syntext Serna Free. --><!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "HornetQ_User_Manual.ent">
+%BOOK_ENTITIES;
+
+]>
+<book>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Book_Info.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="notice.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="preface.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="project-info.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="messaging-concepts.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="architecture.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="using-server.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="using-jms.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="using-core.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="jms-core-mapping.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="client-classpath.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="examples.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="wildcard-routing.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="wildcard-syntax.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="filter-expressions.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="persistence.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="configuring-transports.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="connection-ttl.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="transaction-config.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="flow-control.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="send-guarantees.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="undelivered-messages.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="message-expiry.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="large-messages.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="paging.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="queue-attributes.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="scheduled-messages.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="last-value-queues.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="message-grouping.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pre-acknowledge.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="management.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="security.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="appserver-integration.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="jms-bridge.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="client-reconnection.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="diverts.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="core-bridges.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="duplicate-detection.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="clusters.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ha.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libaio.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="thread-pooling.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="logging.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="embedding-hornetq.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="spring-integration.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="intercepting-operations.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="interoperability.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="perf-tuning.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="configuration-index.xml"/>
+</book>
Modified: branches/Branch_2_2_EAP/docs/user-manual/en/appserver-integration.xml
===================================================================
--- branches/Branch_2_2_EAP/docs/user-manual/en/appserver-integration.xml 2011-02-22 06:31:16 UTC (rev 10239)
+++ branches/Branch_2_2_EAP/docs/user-manual/en/appserver-integration.xml 2011-02-22 16:45:53 UTC (rev 10240)
@@ -16,6 +16,11 @@
<!-- and agrees not to assert, Section 4d of CC-BY-SA to the fullest extent -->
<!-- permitted by applicable law. -->
<!-- ============================================================================= -->
+
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "HornetQ_User_Manual.ent">
+%BOOK_ENTITIES;
+]>
<chapter id="appserver-integration">
<title>Application Server Integration and Java EE</title>
<para>HornetQ can be easily installed in JBoss Application Server 4 or later. For details on
Modified: branches/Branch_2_2_EAP/docs/user-manual/en/architecture.xml
===================================================================
--- branches/Branch_2_2_EAP/docs/user-manual/en/architecture.xml 2011-02-22 06:31:16 UTC (rev 10239)
+++ branches/Branch_2_2_EAP/docs/user-manual/en/architecture.xml 2011-02-22 16:45:53 UTC (rev 10240)
@@ -16,6 +16,11 @@
<!-- and agrees not to assert, Section 4d of CC-BY-SA to the fullest extent -->
<!-- permitted by applicable law. -->
<!-- ============================================================================= -->
+
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "HornetQ_User_Manual.ent">
+%BOOK_ENTITIES;
+]>
<chapter id="architecture">
<title>Architecture</title>
<para>In this section we will give an overview of the HornetQ high level architecture.</para>
Modified: branches/Branch_2_2_EAP/docs/user-manual/en/client-classpath.xml
===================================================================
--- branches/Branch_2_2_EAP/docs/user-manual/en/client-classpath.xml 2011-02-22 06:31:16 UTC (rev 10239)
+++ branches/Branch_2_2_EAP/docs/user-manual/en/client-classpath.xml 2011-02-22 16:45:53 UTC (rev 10240)
@@ -16,6 +16,11 @@
<!-- and agrees not to assert, Section 4d of CC-BY-SA to the fullest extent -->
<!-- permitted by applicable law. -->
<!-- ============================================================================= -->
+
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "HornetQ_User_Manual.ent">
+%BOOK_ENTITIES;
+]>
<chapter id="client-classpath">
<title>The Client Classpath</title>
<para>HornetQ requires several jars on the <emphasis>Client Classpath</emphasis> depending on
Modified: branches/Branch_2_2_EAP/docs/user-manual/en/client-reconnection.xml
===================================================================
--- branches/Branch_2_2_EAP/docs/user-manual/en/client-reconnection.xml 2011-02-22 06:31:16 UTC (rev 10239)
+++ branches/Branch_2_2_EAP/docs/user-manual/en/client-reconnection.xml 2011-02-22 16:45:53 UTC (rev 10240)
@@ -16,6 +16,11 @@
<!-- and agrees not to assert, Section 4d of CC-BY-SA to the fullest extent -->
<!-- permitted by applicable law. -->
<!-- ============================================================================= -->
+
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "HornetQ_User_Manual.ent">
+%BOOK_ENTITIES;
+]>
<chapter id="client-reconnection">
<title>Client Reconnection and Session Reattachment</title>
<para>HornetQ clients can be configured to automatically reconnect or re-attach to the server in
Modified: branches/Branch_2_2_EAP/docs/user-manual/en/clusters.xml
===================================================================
--- branches/Branch_2_2_EAP/docs/user-manual/en/clusters.xml 2011-02-22 06:31:16 UTC (rev 10239)
+++ branches/Branch_2_2_EAP/docs/user-manual/en/clusters.xml 2011-02-22 16:45:53 UTC (rev 10240)
@@ -16,6 +16,11 @@
<!-- and agrees not to assert, Section 4d of CC-BY-SA to the fullest extent -->
<!-- permitted by applicable law. -->
<!-- ============================================================================= -->
+
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "HornetQ_User_Manual.ent">
+%BOOK_ENTITIES;
+]>
<chapter id="clusters">
<title>Clusters</title>
<section>
Modified: branches/Branch_2_2_EAP/docs/user-manual/en/configuration-index.xml
===================================================================
--- branches/Branch_2_2_EAP/docs/user-manual/en/configuration-index.xml 2011-02-22 06:31:16 UTC (rev 10239)
+++ branches/Branch_2_2_EAP/docs/user-manual/en/configuration-index.xml 2011-02-22 16:45:53 UTC (rev 10240)
@@ -16,6 +16,11 @@
<!-- and agrees not to assert, Section 4d of CC-BY-SA to the fullest extent -->
<!-- permitted by applicable law. a -->
<!-- ============================================================================= -->
+
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "HornetQ_User_Manual.ent">
+%BOOK_ENTITIES;
+]>
<chapter id="configuration-index">
<title>Configuration Reference</title>
<para>This section is a quick index for looking up configuration. Click on the element name to
Modified: branches/Branch_2_2_EAP/docs/user-manual/en/configuring-transports.xml
===================================================================
--- branches/Branch_2_2_EAP/docs/user-manual/en/configuring-transports.xml 2011-02-22 06:31:16 UTC (rev 10239)
+++ branches/Branch_2_2_EAP/docs/user-manual/en/configuring-transports.xml 2011-02-22 16:45:53 UTC (rev 10240)
@@ -16,6 +16,11 @@
<!-- and agrees not to assert, Section 4d of CC-BY-SA to the fullest extent -->
<!-- permitted by applicable law. -->
<!-- ============================================================================= -->
+
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "HornetQ_User_Manual.ent">
+%BOOK_ENTITIES;
+]>
<chapter id="configuring-transports">
<title>Configuring the Transport</title>
<para>HornetQ has a fully pluggable and highly flexible transport layer and defines its own
Modified: branches/Branch_2_2_EAP/docs/user-manual/en/connection-ttl.xml
===================================================================
--- branches/Branch_2_2_EAP/docs/user-manual/en/connection-ttl.xml 2011-02-22 06:31:16 UTC (rev 10239)
+++ branches/Branch_2_2_EAP/docs/user-manual/en/connection-ttl.xml 2011-02-22 16:45:53 UTC (rev 10240)
@@ -16,6 +16,11 @@
<!-- and agrees not to assert, Section 4d of CC-BY-SA to the fullest extent -->
<!-- permitted by applicable law. -->
<!-- ============================================================================= -->
+
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "HornetQ_User_Manual.ent">
+%BOOK_ENTITIES;
+]>
<chapter id="connection-ttl">
<title>Detecting Dead Connections</title>
<para>In this section we will discuss connection time-to-live (TTL) and explain how HornetQ
Modified: branches/Branch_2_2_EAP/docs/user-manual/en/core-bridges.xml
===================================================================
--- branches/Branch_2_2_EAP/docs/user-manual/en/core-bridges.xml 2011-02-22 06:31:16 UTC (rev 10239)
+++ branches/Branch_2_2_EAP/docs/user-manual/en/core-bridges.xml 2011-02-22 16:45:53 UTC (rev 10240)
@@ -16,6 +16,11 @@
<!-- and agrees not to assert, Section 4d of CC-BY-SA to the fullest extent -->
<!-- permitted by applicable law. -->
<!-- ============================================================================= -->
+
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "HornetQ_User_Manual.ent">
+%BOOK_ENTITIES;
+]>
<chapter id="core-bridges">
<title>Core Bridges</title>
<para>The function of a bridge is to consume messages from a source queue, and forward them to a
Modified: branches/Branch_2_2_EAP/docs/user-manual/en/diverts.xml
===================================================================
--- branches/Branch_2_2_EAP/docs/user-manual/en/diverts.xml 2011-02-22 06:31:16 UTC (rev 10239)
+++ branches/Branch_2_2_EAP/docs/user-manual/en/diverts.xml 2011-02-22 16:45:53 UTC (rev 10240)
@@ -18,6 +18,11 @@
<!-- permitted by applicable law. -->
<!-- ============================================================================= -->
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "HornetQ_User_Manual.ent">
+%BOOK_ENTITIES;
+]>
+
<chapter id="diverts">
<title>Diverting and Splitting Message Flows</title>
<para>HornetQ allows you to configure objects called <emphasis>diverts</emphasis> with
Modified: branches/Branch_2_2_EAP/docs/user-manual/en/duplicate-detection.xml
===================================================================
--- branches/Branch_2_2_EAP/docs/user-manual/en/duplicate-detection.xml 2011-02-22 06:31:16 UTC (rev 10239)
+++ branches/Branch_2_2_EAP/docs/user-manual/en/duplicate-detection.xml 2011-02-22 16:45:53 UTC (rev 10240)
@@ -18,6 +18,11 @@
<!-- permitted by applicable law. -->
<!-- ============================================================================= -->
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "HornetQ_User_Manual.ent">
+%BOOK_ENTITIES;
+]>
+
<chapter id="duplicate-detection">
<title>Duplicate Message Detection</title>
<para>HornetQ includes powerful automatic duplicate message detection, filtering out
Modified: branches/Branch_2_2_EAP/docs/user-manual/en/embedding-hornetq.xml
===================================================================
--- branches/Branch_2_2_EAP/docs/user-manual/en/embedding-hornetq.xml 2011-02-22 06:31:16 UTC (rev 10239)
+++ branches/Branch_2_2_EAP/docs/user-manual/en/embedding-hornetq.xml 2011-02-22 16:45:53 UTC (rev 10240)
@@ -18,6 +18,11 @@
<!-- and agrees not to assert, Section 4d of CC-BY-SA to the fullest extent -->
<!-- permitted by applicable law. -->
<!-- ============================================================================= -->
+
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "HornetQ_User_Manual.ent">
+%BOOK_ENTITIES;
+]>
<chapter id="embedding-hornetq">
<title>Embedding HornetQ</title>
Modified: branches/Branch_2_2_EAP/docs/user-manual/en/examples.xml
===================================================================
--- branches/Branch_2_2_EAP/docs/user-manual/en/examples.xml 2011-02-22 06:31:16 UTC (rev 10239)
+++ branches/Branch_2_2_EAP/docs/user-manual/en/examples.xml 2011-02-22 16:45:53 UTC (rev 10240)
@@ -16,6 +16,11 @@
<!-- and agrees not to assert, Section 4d of CC-BY-SA to the fullest extent -->
<!-- permitted by applicable law. -->
<!-- ============================================================================= -->
+
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "HornetQ_User_Manual.ent">
+%BOOK_ENTITIES;
+]>
<chapter id="examples">
<title>Examples</title>
<para>The HornetQ distribution comes with over 70 run out-of-the-box examples demonstrating many
Modified: branches/Branch_2_2_EAP/docs/user-manual/en/filter-expressions.xml
===================================================================
--- branches/Branch_2_2_EAP/docs/user-manual/en/filter-expressions.xml 2011-02-22 06:31:16 UTC (rev 10239)
+++ branches/Branch_2_2_EAP/docs/user-manual/en/filter-expressions.xml 2011-02-22 16:45:53 UTC (rev 10240)
@@ -18,6 +18,11 @@
<!-- permitted by applicable law. -->
<!-- ============================================================================= -->
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "HornetQ_User_Manual.ent">
+%BOOK_ENTITIES;
+]>
+
<chapter id="filter-expressions">
<title>Filter Expressions</title>
<para>HornetQ provides a powerful filter language based on a subset of the SQL 92
Modified: branches/Branch_2_2_EAP/docs/user-manual/en/flow-control.xml
===================================================================
--- branches/Branch_2_2_EAP/docs/user-manual/en/flow-control.xml 2011-02-22 06:31:16 UTC (rev 10239)
+++ branches/Branch_2_2_EAP/docs/user-manual/en/flow-control.xml 2011-02-22 16:45:53 UTC (rev 10240)
@@ -16,6 +16,11 @@
<!-- and agrees not to assert, Section 4d of CC-BY-SA to the fullest extent -->
<!-- permitted by applicable law. -->
<!-- ============================================================================= -->
+
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "HornetQ_User_Manual.ent">
+%BOOK_ENTITIES;
+]>
<chapter id="flow-control">
<title>Flow Control</title>
<para>Flow control is used to limit the flow of data between a client and server, or a server and
Modified: branches/Branch_2_2_EAP/docs/user-manual/en/ha.xml
===================================================================
--- branches/Branch_2_2_EAP/docs/user-manual/en/ha.xml 2011-02-22 06:31:16 UTC (rev 10239)
+++ branches/Branch_2_2_EAP/docs/user-manual/en/ha.xml 2011-02-22 16:45:53 UTC (rev 10240)
@@ -16,6 +16,11 @@
<!-- and agrees not to assert, Section 4d of CC-BY-SA to the fullest extent -->
<!-- permitted by applicable law. -->
<!-- ============================================================================= -->
+
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "HornetQ_User_Manual.ent">
+%BOOK_ENTITIES;
+]>
<chapter id="ha">
<title>High Availability and Failover</title>
<para>We define high availability as the <emphasis>ability for the system to continue
Modified: branches/Branch_2_2_EAP/docs/user-manual/en/intercepting-operations.xml
===================================================================
--- branches/Branch_2_2_EAP/docs/user-manual/en/intercepting-operations.xml 2011-02-22 06:31:16 UTC (rev 10239)
+++ branches/Branch_2_2_EAP/docs/user-manual/en/intercepting-operations.xml 2011-02-22 16:45:53 UTC (rev 10240)
@@ -18,6 +18,11 @@
<!-- permitted by applicable law. -->
<!-- ============================================================================= -->
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "HornetQ_User_Manual.ent">
+%BOOK_ENTITIES;
+]>
+
<chapter id="intercepting-operations">
<title>Intercepting Operations</title>
<para>HornetQ supports <emphasis>interceptors</emphasis> to intercept packets entering
Modified: branches/Branch_2_2_EAP/docs/user-manual/en/interoperability.xml
===================================================================
--- branches/Branch_2_2_EAP/docs/user-manual/en/interoperability.xml 2011-02-22 06:31:16 UTC (rev 10239)
+++ branches/Branch_2_2_EAP/docs/user-manual/en/interoperability.xml 2011-02-22 16:45:53 UTC (rev 10240)
@@ -16,6 +16,11 @@
<!-- and agrees not to assert, Section 4d of CC-BY-SA to the fullest extent -->
<!-- permitted by applicable law. -->
<!-- ============================================================================= -->
+
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "HornetQ_User_Manual.ent">
+%BOOK_ENTITIES;
+]>
<chapter id="interoperability">
<title>Interoperability</title>
<section id="stomp">
Modified: branches/Branch_2_2_EAP/docs/user-manual/en/jms-bridge.xml
===================================================================
--- branches/Branch_2_2_EAP/docs/user-manual/en/jms-bridge.xml 2011-02-22 06:31:16 UTC (rev 10239)
+++ branches/Branch_2_2_EAP/docs/user-manual/en/jms-bridge.xml 2011-02-22 16:45:53 UTC (rev 10240)
@@ -16,6 +16,11 @@
<!-- and agrees not to assert, Section 4d of CC-BY-SA to the fullest extent -->
<!-- permitted by applicable law. -->
<!-- ============================================================================= -->
+
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "HornetQ_User_Manual.ent">
+%BOOK_ENTITIES;
+]>
<chapter id="jms-bridge">
<title>The JMS Bridge</title>
<para>HornetQ includes a fully functional JMS message bridge.</para>
Modified: branches/Branch_2_2_EAP/docs/user-manual/en/jms-core-mapping.xml
===================================================================
--- branches/Branch_2_2_EAP/docs/user-manual/en/jms-core-mapping.xml 2011-02-22 06:31:16 UTC (rev 10239)
+++ branches/Branch_2_2_EAP/docs/user-manual/en/jms-core-mapping.xml 2011-02-22 16:45:53 UTC (rev 10240)
@@ -16,6 +16,11 @@
<!-- and agrees not to assert, Section 4d of CC-BY-SA to the fullest extent -->
<!-- permitted by applicable law. -->
<!-- ============================================================================= -->
+
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "HornetQ_User_Manual.ent">
+%BOOK_ENTITIES;
+]>
<chapter id="jms-core-mapping">
<title>Mapping JMS Concepts to the Core API</title>
<para>This chapter describes how JMS destinations are mapped to HornetQ addresses.</para>
Modified: branches/Branch_2_2_EAP/docs/user-manual/en/large-messages.xml
===================================================================
--- branches/Branch_2_2_EAP/docs/user-manual/en/large-messages.xml 2011-02-22 06:31:16 UTC (rev 10239)
+++ branches/Branch_2_2_EAP/docs/user-manual/en/large-messages.xml 2011-02-22 16:45:53 UTC (rev 10240)
@@ -16,6 +16,11 @@
<!-- and agrees not to assert, Section 4d of CC-BY-SA to the fullest extent -->
<!-- permitted by applicable law. -->
<!-- ============================================================================= -->
+
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "HornetQ_User_Manual.ent">
+%BOOK_ENTITIES;
+]>
<chapter id="large-messages">
<title>Large Messages</title>
<para>HornetQ supports sending and receiving of huge messages, even when the client and server
Modified: branches/Branch_2_2_EAP/docs/user-manual/en/last-value-queues.xml
===================================================================
--- branches/Branch_2_2_EAP/docs/user-manual/en/last-value-queues.xml 2011-02-22 06:31:16 UTC (rev 10239)
+++ branches/Branch_2_2_EAP/docs/user-manual/en/last-value-queues.xml 2011-02-22 16:45:53 UTC (rev 10240)
@@ -16,6 +16,11 @@
<!-- and agrees not to assert, Section 4d of CC-BY-SA to the fullest extent -->
<!-- permitted by applicable law. -->
<!-- ============================================================================= -->
+
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "HornetQ_User_Manual.ent">
+%BOOK_ENTITIES;
+]>
<chapter id="last-value-queues">
<title>Last-Value Queues</title>
<para>Last-Value queues are special queues which discard any messages when a newer message with
Modified: branches/Branch_2_2_EAP/docs/user-manual/en/libaio.xml
===================================================================
--- branches/Branch_2_2_EAP/docs/user-manual/en/libaio.xml 2011-02-22 06:31:16 UTC (rev 10239)
+++ branches/Branch_2_2_EAP/docs/user-manual/en/libaio.xml 2011-02-22 16:45:53 UTC (rev 10240)
@@ -16,6 +16,11 @@
<!-- and agrees not to assert, Section 4d of CC-BY-SA to the fullest extent -->
<!-- permitted by applicable law. -->
<!-- ============================================================================= -->
+
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "HornetQ_User_Manual.ent">
+%BOOK_ENTITIES;
+]>
<chapter id="libaio">
<title>Libaio Native Libraries</title>
<para>HornetQ distributes a native library, used as a bridge between HornetQ and linux
Modified: branches/Branch_2_2_EAP/docs/user-manual/en/logging.xml
===================================================================
--- branches/Branch_2_2_EAP/docs/user-manual/en/logging.xml 2011-02-22 06:31:16 UTC (rev 10239)
+++ branches/Branch_2_2_EAP/docs/user-manual/en/logging.xml 2011-02-22 16:45:53 UTC (rev 10240)
@@ -16,6 +16,11 @@
<!-- and agrees not to assert, Section 4d of CC-BY-SA to the fullest extent -->
<!-- permitted by applicable law. -->
<!-- ============================================================================= -->
+
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "HornetQ_User_Manual.ent">
+%BOOK_ENTITIES;
+]>
<chapter id="logging">
<title>Logging</title>
<para>HornetQ has its own logging delegate that has no dependencies on any particular logging
Modified: branches/Branch_2_2_EAP/docs/user-manual/en/management.xml
===================================================================
--- branches/Branch_2_2_EAP/docs/user-manual/en/management.xml 2011-02-22 06:31:16 UTC (rev 10239)
+++ branches/Branch_2_2_EAP/docs/user-manual/en/management.xml 2011-02-22 16:45:53 UTC (rev 10240)
@@ -16,6 +16,11 @@
<!-- and agrees not to assert, Section 4d of CC-BY-SA to the fullest extent -->
<!-- permitted by applicable law. -->
<!-- ============================================================================= -->
+
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "HornetQ_User_Manual.ent">
+%BOOK_ENTITIES;
+]>
<chapter id="management">
<title>Management</title>
<para>HornetQ has an extensive management API that allows a user to modify a server
Deleted: branches/Branch_2_2_EAP/docs/user-manual/en/master.xml
===================================================================
--- branches/Branch_2_2_EAP/docs/user-manual/en/master.xml 2011-02-22 06:31:16 UTC (rev 10239)
+++ branches/Branch_2_2_EAP/docs/user-manual/en/master.xml 2011-02-22 16:45:53 UTC (rev 10240)
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ============================================================================= -->
-<!-- Copyright © 2009 Red Hat, Inc. and others. -->
-<!-- -->
-<!-- The text of and illustrations in this document are licensed by Red Hat under -->
-<!-- a Creative Commons Attribution–Share Alike 3.0 Unported license ("CC-BY-SA"). -->
-<!-- -->
-<!-- An explanation of CC-BY-SA is available at -->
-<!-- -->
-<!-- http://creativecommons.org/licenses/by-sa/3.0/. -->
-<!-- -->
-<!-- In accordance with CC-BY-SA, if you distribute this document or an adaptation -->
-<!-- of it, you must provide the URL for the original version. -->
-<!-- -->
-<!-- Red Hat, as the licensor of this document, waives the right to enforce, -->
-<!-- and agrees not to assert, Section 4d of CC-BY-SA to the fullest extent -->
-<!-- permitted by applicable law. -->
-<!-- ============================================================================= -->
-
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3CR3//EN"
- "../../../lib/docbook-support/support/docbook-dtd/docbookx.dtd" [
- <!ENTITY appserver-integration SYSTEM "appserver-integration.xml">
- <!ENTITY architecture SYSTEM "architecture.xml">
- <!ENTITY client-reconnection SYSTEM "client-reconnection.xml">
- <!ENTITY client-classpath SYSTEM "client-classpath.xml">
- <!ENTITY clusters SYSTEM "clusters.xml">
- <!ENTITY configuration-index SYSTEM "configuration-index.xml">
- <!ENTITY configuring-transports SYSTEM "configuring-transports.xml">
- <!ENTITY connection-ttl SYSTEM "connection-ttl.xml">
- <!ENTITY core-bridges SYSTEM "core-bridges.xml">
- <!ENTITY diverts SYSTEM "diverts.xml">
- <!ENTITY duplicate-detection SYSTEM "duplicate-detection.xml">
- <!ENTITY embedding-hornetq SYSTEM "embedding-hornetq.xml">
- <!ENTITY examples SYSTEM "examples.xml">
- <!ENTITY filter-expressions SYSTEM "filter-expressions.xml">
- <!ENTITY flow-control SYSTEM "flow-control.xml">
- <!ENTITY ha SYSTEM "ha.xml">
- <!ENTITY transaction-config SYSTEM "transaction-config.xml">
- <!ENTITY intercepting-operations SYSTEM "intercepting-operations.xml">
- <!ENTITY interoperability SYSTEM "interoperability.xml">
- <!ENTITY jms-bridge SYSTEM "jms-bridge.xml">
- <!ENTITY jms-core-mapping SYSTEM "jms-core-mapping.xml">
- <!ENTITY large-messages SYSTEM "large-messages.xml">
- <!ENTITY last-value-queues SYSTEM "last-value-queues.xml">
- <!ENTITY logging SYSTEM "logging.xml">
- <!ENTITY management SYSTEM "management.xml">
- <!ENTITY message-expiry SYSTEM "message-expiry.xml">
- <!ENTITY message-grouping SYSTEM "message-grouping.xml">
- <!ENTITY messaging-concepts SYSTEM "messaging-concepts.xml">
- <!ENTITY notice SYSTEM "notice.xml">
- <!ENTITY paging SYSTEM "paging.xml">
- <!ENTITY perf-tuning SYSTEM "perf-tuning.xml">
- <!ENTITY persistence SYSTEM "persistence.xml">
- <!ENTITY pre-acknowledge SYSTEM "pre-acknowledge.xml">
- <!ENTITY preface SYSTEM "preface.xml">
- <!ENTITY project-info SYSTEM "project-info.xml">
- <!ENTITY queue-attributes SYSTEM "queue-attributes.xml">
- <!ENTITY scheduled-messages SYSTEM "scheduled-messages.xml">
- <!ENTITY security SYSTEM "security.xml">
- <!ENTITY send-guarantees SYSTEM "send-guarantees.xml">
- <!ENTITY spring-integration SYSTEM "spring-integration.xml">
- <!ENTITY thread-pooling SYSTEM "thread-pooling.xml">
- <!ENTITY undelivered-messages SYSTEM "undelivered-messages.xml">
- <!ENTITY using-core SYSTEM "using-core.xml">
- <!ENTITY using-jms SYSTEM "using-jms.xml">
- <!ENTITY using-server SYSTEM "using-server.xml">
- <!ENTITY wildcard-syntax SYSTEM "wildcard-syntax.xml">
- <!ENTITY wildcard-routing SYSTEM "wildcard-routing.xml">
- <!ENTITY libaio SYSTEM "libaio.xml">
- ]>
-<book lang="en">
- <bookinfo>
- <title>HornetQ 2.1 User Manual</title>
- <subtitle>Putting the buzz in messaging</subtitle>
- </bookinfo>
-
- <toc></toc>
-
- ¬ice;
- &preface;
- &project-info;
- &messaging-concepts;
- &architecture;
- &using-server;
- &using-jms;
- &using-core;
- &jms-core-mapping;
- &client-classpath;
- &examples;
- &wildcard-routing;
- &wildcard-syntax;
- &filter-expressions;
- &persistence;
- &configuring-transports;
- &connection-ttl;
- &transaction-config;
- &flow-control;
- &send-guarantees;
- &undelivered-messages;
- &message-expiry;
- &large-messages;
- &paging;
- &queue-attributes;
- &scheduled-messages;
- &last-value-queues;
- &message-grouping;
- &pre-acknowledge;
- &management;
- &security;
- &appserver-integration;
- &jms-bridge;
- &client-reconnection;
- &diverts;
- &core-bridges;
- &duplicate-detection;
- &clusters;
- &ha;
- &libaio;
- &thread-pooling;
- &logging;
- &embedding-hornetq;
- &spring-integration;
- &intercepting-operations;
- &interoperability;
- &perf-tuning;
- &configuration-index;
-
-
-</book>
Modified: branches/Branch_2_2_EAP/docs/user-manual/en/message-expiry.xml
===================================================================
--- branches/Branch_2_2_EAP/docs/user-manual/en/message-expiry.xml 2011-02-22 06:31:16 UTC (rev 10239)
+++ branches/Branch_2_2_EAP/docs/user-manual/en/message-expiry.xml 2011-02-22 16:45:53 UTC (rev 10240)
@@ -16,6 +16,11 @@
<!-- and agrees not to assert, Section 4d of CC-BY-SA to the fullest extent -->
<!-- permitted by applicable law. -->
<!-- ============================================================================= -->
+
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "HornetQ_User_Manual.ent">
+%BOOK_ENTITIES;
+]>
<chapter id="message-expiry">
<title>Message Expiry</title>
<para>Messages can be set with an optional <emphasis>time to live</emphasis> when sending
Modified: branches/Branch_2_2_EAP/docs/user-manual/en/message-grouping.xml
===================================================================
--- branches/Branch_2_2_EAP/docs/user-manual/en/message-grouping.xml 2011-02-22 06:31:16 UTC (rev 10239)
+++ branches/Branch_2_2_EAP/docs/user-manual/en/message-grouping.xml 2011-02-22 16:45:53 UTC (rev 10240)
@@ -16,6 +16,11 @@
<!-- and agrees not to assert, Section 4d of CC-BY-SA to the fullest extent -->
<!-- permitted by applicable law. -->
<!-- ============================================================================= -->
+
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "HornetQ_User_Manual.ent">
+%BOOK_ENTITIES;
+]>
<chapter id="message-grouping">
<title>Message Grouping</title>
<para>Message groups are sets of messages that have the following characteristics:</para>
Modified: branches/Branch_2_2_EAP/docs/user-manual/en/messaging-concepts.xml
===================================================================
--- branches/Branch_2_2_EAP/docs/user-manual/en/messaging-concepts.xml 2011-02-22 06:31:16 UTC (rev 10239)
+++ branches/Branch_2_2_EAP/docs/user-manual/en/messaging-concepts.xml 2011-02-22 16:45:53 UTC (rev 10240)
@@ -16,6 +16,11 @@
<!-- and agrees not to assert, Section 4d of CC-BY-SA to the fullest extent -->
<!-- permitted by applicable law. -->
<!-- ============================================================================= -->
+
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "HornetQ_User_Manual.ent">
+%BOOK_ENTITIES;
+]>
<chapter id="messaging-concepts">
<title>Messaging Concepts</title>
<para>HornetQ is an asynchronous messaging system, an example of <ulink
Modified: branches/Branch_2_2_EAP/docs/user-manual/en/notice.xml
===================================================================
--- branches/Branch_2_2_EAP/docs/user-manual/en/notice.xml 2011-02-22 06:31:16 UTC (rev 10239)
+++ branches/Branch_2_2_EAP/docs/user-manual/en/notice.xml 2011-02-22 16:45:53 UTC (rev 10240)
@@ -16,6 +16,11 @@
<!-- permitted by applicable law. -->
<!-- ============================================================================= -->
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "HornetQ_User_Manual.ent">
+%BOOK_ENTITIES;
+]>
+
<chapter id="notice">
<title>Legal Notice</title>
Modified: branches/Branch_2_2_EAP/docs/user-manual/en/paging.xml
===================================================================
--- branches/Branch_2_2_EAP/docs/user-manual/en/paging.xml 2011-02-22 06:31:16 UTC (rev 10239)
+++ branches/Branch_2_2_EAP/docs/user-manual/en/paging.xml 2011-02-22 16:45:53 UTC (rev 10240)
@@ -16,6 +16,11 @@
<!-- and agrees not to assert, Section 4d of CC-BY-SA to the fullest extent -->
<!-- permitted by applicable law. -->
<!-- ============================================================================= -->
+
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "HornetQ_User_Manual.ent">
+%BOOK_ENTITIES;
+]>
<chapter id="paging">
<title>Paging</title>
<para>HornetQ transparently supports huge queues containing millions of messages while the
Modified: branches/Branch_2_2_EAP/docs/user-manual/en/perf-tuning.xml
===================================================================
--- branches/Branch_2_2_EAP/docs/user-manual/en/perf-tuning.xml 2011-02-22 06:31:16 UTC (rev 10239)
+++ branches/Branch_2_2_EAP/docs/user-manual/en/perf-tuning.xml 2011-02-22 16:45:53 UTC (rev 10240)
@@ -16,6 +16,11 @@
<!-- and agrees not to assert, Section 4d of CC-BY-SA to the fullest extent -->
<!-- permitted by applicable law. -->
<!-- ============================================================================= -->
+
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "HornetQ_User_Manual.ent">
+%BOOK_ENTITIES;
+]>
<chapter id="perf-tuning">
<title>Performance Tuning</title>
<para>In this chapter we'll discuss how to tune HornetQ for optimum performance.</para>
Modified: branches/Branch_2_2_EAP/docs/user-manual/en/persistence.xml
===================================================================
--- branches/Branch_2_2_EAP/docs/user-manual/en/persistence.xml 2011-02-22 06:31:16 UTC (rev 10239)
+++ branches/Branch_2_2_EAP/docs/user-manual/en/persistence.xml 2011-02-22 16:45:53 UTC (rev 10240)
@@ -16,6 +16,11 @@
<!-- and agrees not to assert, Section 4d of CC-BY-SA to the fullest extent -->
<!-- permitted by applicable law. -->
<!-- ============================================================================= -->
+
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "HornetQ_User_Manual.ent">
+%BOOK_ENTITIES;
+]>
<chapter id="persistence">
<title>Persistence</title>
<para>In this chapter we will describe how persistence works with HornetQ and how to configure
Modified: branches/Branch_2_2_EAP/docs/user-manual/en/pre-acknowledge.xml
===================================================================
--- branches/Branch_2_2_EAP/docs/user-manual/en/pre-acknowledge.xml 2011-02-22 06:31:16 UTC (rev 10239)
+++ branches/Branch_2_2_EAP/docs/user-manual/en/pre-acknowledge.xml 2011-02-22 16:45:53 UTC (rev 10240)
@@ -16,6 +16,11 @@
<!-- and agrees not to assert, Section 4d of CC-BY-SA to the fullest extent -->
<!-- permitted by applicable law. -->
<!-- ============================================================================= -->
+
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "HornetQ_User_Manual.ent">
+%BOOK_ENTITIES;
+]>
<chapter id="pre-acknowledge">
<title>Pre-Acknowledge Mode</title>
<para>JMS specifies 3 acknowledgement modes:</para>
Modified: branches/Branch_2_2_EAP/docs/user-manual/en/preface.xml
===================================================================
--- branches/Branch_2_2_EAP/docs/user-manual/en/preface.xml 2011-02-22 06:31:16 UTC (rev 10239)
+++ branches/Branch_2_2_EAP/docs/user-manual/en/preface.xml 2011-02-22 16:45:53 UTC (rev 10240)
@@ -16,6 +16,11 @@
<!-- and agrees not to assert, Section 4d of CC-BY-SA to the fullest extent -->
<!-- permitted by applicable law. -->
<!-- ============================================================================= -->
+
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "HornetQ_User_Manual.ent">
+%BOOK_ENTITIES;
+]>
<chapter id="preface">
<title>Preface</title>
<para>What is HornetQ?</para>
Modified: branches/Branch_2_2_EAP/docs/user-manual/en/project-info.xml
===================================================================
--- branches/Branch_2_2_EAP/docs/user-manual/en/project-info.xml 2011-02-22 06:31:16 UTC (rev 10239)
+++ branches/Branch_2_2_EAP/docs/user-manual/en/project-info.xml 2011-02-22 16:45:53 UTC (rev 10240)
@@ -16,6 +16,11 @@
<!-- and agrees not to assert, Section 4d of CC-BY-SA to the fullest extent -->
<!-- permitted by applicable law. -->
<!-- ============================================================================= -->
+
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "HornetQ_User_Manual.ent">
+%BOOK_ENTITIES;
+]>
<chapter id="project-info">
<title>Project Information</title>
<para>The official HornetQ project page is <ulink url="http://hornetq.org/"
Modified: branches/Branch_2_2_EAP/docs/user-manual/en/queue-attributes.xml
===================================================================
--- branches/Branch_2_2_EAP/docs/user-manual/en/queue-attributes.xml 2011-02-22 06:31:16 UTC (rev 10239)
+++ branches/Branch_2_2_EAP/docs/user-manual/en/queue-attributes.xml 2011-02-22 16:45:53 UTC (rev 10240)
@@ -16,6 +16,11 @@
<!-- and agrees not to assert, Section 4d of CC-BY-SA to the fullest extent -->
<!-- permitted by applicable law. -->
<!-- ============================================================================= -->
+
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "HornetQ_User_Manual.ent">
+%BOOK_ENTITIES;
+]>
<chapter id="queue-attributes">
<title>Queue Attributes</title>
<para>Queue attributes can be set in one of two ways. Either by configuring them using the
Modified: branches/Branch_2_2_EAP/docs/user-manual/en/scheduled-messages.xml
===================================================================
--- branches/Branch_2_2_EAP/docs/user-manual/en/scheduled-messages.xml 2011-02-22 06:31:16 UTC (rev 10239)
+++ branches/Branch_2_2_EAP/docs/user-manual/en/scheduled-messages.xml 2011-02-22 16:45:53 UTC (rev 10240)
@@ -16,6 +16,11 @@
<!-- and agrees not to assert, Section 4d of CC-BY-SA to the fullest extent -->
<!-- permitted by applicable law. -->
<!-- ============================================================================= -->
+
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "HornetQ_User_Manual.ent">
+%BOOK_ENTITIES;
+]>
<chapter id="scheduled-messages">
<title>Scheduled Messages</title>
<para>Scheduled messages differ from normal messages in that they won't be delivered until a
Modified: branches/Branch_2_2_EAP/docs/user-manual/en/security.xml
===================================================================
--- branches/Branch_2_2_EAP/docs/user-manual/en/security.xml 2011-02-22 06:31:16 UTC (rev 10239)
+++ branches/Branch_2_2_EAP/docs/user-manual/en/security.xml 2011-02-22 16:45:53 UTC (rev 10240)
@@ -16,6 +16,11 @@
<!-- and agrees not to assert, Section 4d of CC-BY-SA to the fullest extent -->
<!-- permitted by applicable law. -->
<!-- ============================================================================= -->
+
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "HornetQ_User_Manual.ent">
+%BOOK_ENTITIES;
+]>
<chapter id="security">
<title>Security</title>
<para>This chapter describes how security works with HornetQ and how you can configure it. To
Modified: branches/Branch_2_2_EAP/docs/user-manual/en/send-guarantees.xml
===================================================================
--- branches/Branch_2_2_EAP/docs/user-manual/en/send-guarantees.xml 2011-02-22 06:31:16 UTC (rev 10239)
+++ branches/Branch_2_2_EAP/docs/user-manual/en/send-guarantees.xml 2011-02-22 16:45:53 UTC (rev 10240)
@@ -16,6 +16,11 @@
<!-- and agrees not to assert, Section 4d of CC-BY-SA to the fullest extent -->
<!-- permitted by applicable law. -->
<!-- ============================================================================= -->
+
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "HornetQ_User_Manual.ent">
+%BOOK_ENTITIES;
+]>
<chapter id="send-guarantees">
<title>Guarantees of sends and commits</title>
<section>
Modified: branches/Branch_2_2_EAP/docs/user-manual/en/spring-integration.xml
===================================================================
--- branches/Branch_2_2_EAP/docs/user-manual/en/spring-integration.xml 2011-02-22 06:31:16 UTC (rev 10239)
+++ branches/Branch_2_2_EAP/docs/user-manual/en/spring-integration.xml 2011-02-22 16:45:53 UTC (rev 10240)
@@ -18,6 +18,11 @@
<!-- and agrees not to assert, Section 4d of CC-BY-SA to the fullest extent -->
<!-- permitted by applicable law. -->
<!-- ============================================================================= -->
+
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "HornetQ_User_Manual.ent">
+%BOOK_ENTITIES;
+]>
<chapter id="spring.integration">
<title>Spring Integration<parameter></parameter></title>
Modified: branches/Branch_2_2_EAP/docs/user-manual/en/thread-pooling.xml
===================================================================
--- branches/Branch_2_2_EAP/docs/user-manual/en/thread-pooling.xml 2011-02-22 06:31:16 UTC (rev 10239)
+++ branches/Branch_2_2_EAP/docs/user-manual/en/thread-pooling.xml 2011-02-22 16:45:53 UTC (rev 10240)
@@ -16,6 +16,11 @@
<!-- and agrees not to assert, Section 4d of CC-BY-SA to the fullest extent -->
<!-- permitted by applicable law. -->
<!-- ============================================================================= -->
+
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "HornetQ_User_Manual.ent">
+%BOOK_ENTITIES;
+]>
<chapter id="thread-pooling">
<title>Thread management</title>
<para>This chapter describes how HornetQ uses and pools threads and how you can manage
Modified: branches/Branch_2_2_EAP/docs/user-manual/en/transaction-config.xml
===================================================================
--- branches/Branch_2_2_EAP/docs/user-manual/en/transaction-config.xml 2011-02-22 06:31:16 UTC (rev 10239)
+++ branches/Branch_2_2_EAP/docs/user-manual/en/transaction-config.xml 2011-02-22 16:45:53 UTC (rev 10240)
@@ -16,6 +16,11 @@
<!-- and agrees not to assert, Section 4d of CC-BY-SA to the fullest extent -->
<!-- permitted by applicable law. -->
<!-- ============================================================================= -->
+
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "HornetQ_User_Manual.ent">
+%BOOK_ENTITIES;
+]>
<chapter id="transaction-config">
<title>Resource Manager Configuration</title>
<para>HornetQ has its own Resource Manager for handling the lifespan of JTA transactions. When a
Modified: branches/Branch_2_2_EAP/docs/user-manual/en/undelivered-messages.xml
===================================================================
--- branches/Branch_2_2_EAP/docs/user-manual/en/undelivered-messages.xml 2011-02-22 06:31:16 UTC (rev 10239)
+++ branches/Branch_2_2_EAP/docs/user-manual/en/undelivered-messages.xml 2011-02-22 16:45:53 UTC (rev 10240)
@@ -16,6 +16,11 @@
<!-- and agrees not to assert, Section 4d of CC-BY-SA to the fullest extent -->
<!-- permitted by applicable law. -->
<!-- ============================================================================= -->
+
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "HornetQ_User_Manual.ent">
+%BOOK_ENTITIES;
+]>
<chapter id="undelivered-messages">
<title>Message Redelivery and Undelivered Messages</title>
<para>Messages can be delivered unsuccessfully (e.g. if the transacted session used to consume
Modified: branches/Branch_2_2_EAP/docs/user-manual/en/using-core.xml
===================================================================
--- branches/Branch_2_2_EAP/docs/user-manual/en/using-core.xml 2011-02-22 06:31:16 UTC (rev 10239)
+++ branches/Branch_2_2_EAP/docs/user-manual/en/using-core.xml 2011-02-22 16:45:53 UTC (rev 10240)
@@ -16,6 +16,11 @@
<!-- and agrees not to assert, Section 4d of CC-BY-SA to the fullest extent -->
<!-- permitted by applicable law. -->
<!-- ============================================================================= -->
+
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "HornetQ_User_Manual.ent">
+%BOOK_ENTITIES;
+]>
<chapter id="using-core">
<title>Using Core</title>
<para>HornetQ core is a completely JMS-agnostic messaging system with its own non-JMS API. We
Modified: branches/Branch_2_2_EAP/docs/user-manual/en/using-jms.xml
===================================================================
--- branches/Branch_2_2_EAP/docs/user-manual/en/using-jms.xml 2011-02-22 06:31:16 UTC (rev 10239)
+++ branches/Branch_2_2_EAP/docs/user-manual/en/using-jms.xml 2011-02-22 16:45:53 UTC (rev 10240)
@@ -16,6 +16,11 @@
<!-- and agrees not to assert, Section 4d of CC-BY-SA to the fullest extent -->
<!-- permitted by applicable law. -->
<!-- ============================================================================= -->
+
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "HornetQ_User_Manual.ent">
+%BOOK_ENTITIES;
+]>
<chapter id="using-jms">
<title>Using JMS</title>
<para>Although HornetQ provides a JMS agnostic messaging API, many users will be more
Modified: branches/Branch_2_2_EAP/docs/user-manual/en/using-server.xml
===================================================================
--- branches/Branch_2_2_EAP/docs/user-manual/en/using-server.xml 2011-02-22 06:31:16 UTC (rev 10239)
+++ branches/Branch_2_2_EAP/docs/user-manual/en/using-server.xml 2011-02-22 16:45:53 UTC (rev 10240)
@@ -16,6 +16,11 @@
<!-- and agrees not to assert, Section 4d of CC-BY-SA to the fullest extent -->
<!-- permitted by applicable law. -->
<!-- ============================================================================= -->
+
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "HornetQ_User_Manual.ent">
+%BOOK_ENTITIES;
+]>
<chapter id="using-server">
<title>Using the Server</title>
<para>This chapter will familiarise you with how to use the HornetQ server.</para>
Modified: branches/Branch_2_2_EAP/docs/user-manual/en/wildcard-routing.xml
===================================================================
--- branches/Branch_2_2_EAP/docs/user-manual/en/wildcard-routing.xml 2011-02-22 06:31:16 UTC (rev 10239)
+++ branches/Branch_2_2_EAP/docs/user-manual/en/wildcard-routing.xml 2011-02-22 16:45:53 UTC (rev 10240)
@@ -18,6 +18,11 @@
<!-- permitted by applicable law. -->
<!-- ============================================================================= -->
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "HornetQ_User_Manual.ent">
+%BOOK_ENTITIES;
+]>
+
<chapter id="wildcard-routing">
<title>Routing Messages With Wild Cards</title>
<para>HornetQ allows the routing of messages via wildcard addresses.</para>
Modified: branches/Branch_2_2_EAP/docs/user-manual/en/wildcard-syntax.xml
===================================================================
--- branches/Branch_2_2_EAP/docs/user-manual/en/wildcard-syntax.xml 2011-02-22 06:31:16 UTC (rev 10239)
+++ branches/Branch_2_2_EAP/docs/user-manual/en/wildcard-syntax.xml 2011-02-22 16:45:53 UTC (rev 10240)
@@ -18,6 +18,11 @@
<!-- permitted by applicable law. -->
<!-- ============================================================================= -->
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "HornetQ_User_Manual.ent">
+%BOOK_ENTITIES;
+]>
+
<chapter id="wildcard-syntax">
<title>Understanding the HornetQ Wildcard Syntax</title>
<para>HornetQ uses a specific syntax for representing wildcards in security settings,
Added: branches/Branch_2_2_EAP/docs/user-manual/pom.xml
===================================================================
--- branches/Branch_2_2_EAP/docs/user-manual/pom.xml (rev 0)
+++ branches/Branch_2_2_EAP/docs/user-manual/pom.xml 2011-02-22 16:45:53 UTC (rev 10240)
@@ -0,0 +1,306 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ ~ Copyright 2009 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.
+ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.jboss.project</groupId>
+ <artifactId>${docname}-${translation}</artifactId>
+ <version>1.0</version>
+ <packaging>jdocbook</packaging>
+ <name>${bookname}-(${translation})</name>
+
+ <properties>
+ <translation>en</translation>
+ <docname>HornetQ_User_Manual</docname>
+ <bookname>HornetQ User Manual</bookname>
+ </properties>
+
+ <repositories>
+ <repository>
+ <id>jboss-public-repository-group</id>
+ <name>JBoss Public Maven Repository Group</name>
+ <url>https://repository.jboss.org/nexus/content/groups/public/</url>
+ <layout>default</layout>
+ <releases>
+ <enabled>true</enabled>
+ <updatePolicy>never</updatePolicy>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ <updatePolicy>never</updatePolicy>
+ </snapshots>
+ </repository>
+ </repositories>
+ <pluginRepositories>
+ <pluginRepository>
+ <id>jboss-public-repository-group</id>
+ <name>JBoss Public Maven Repository Group</name>
+ <url>https://repository.jboss.org/nexus/content/groups/public/</url>
+ <layout>default</layout>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </pluginRepository>
+ <!--pluginRepository>
+ <id>jboss-snapshot-repository-group</id>
+ <name>JBoss Snapshot Maven Repository Group</name>
+ <url>https://repository.jboss.org/nexus/content/groups/snapshot/</url>
+ <layout>default</layout>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </pluginRepository-->
+ </pluginRepositories>
+
+ <profiles>
+
+ <!-- mvn compile -->
+ <profile>
+ <id>all</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.jboss.maven.plugins</groupId>
+ <artifactId>maven-jdocbook-plugin</artifactId>
+ <version>2.2.1</version>
+ <extensions>true</extensions>
+ <configuration>
+ <formats>
+ <format>
+ <formatName>pdf</formatName>
+ <stylesheetResource>classpath:/xslt/org/jboss/pdf.xsl</stylesheetResource>
+ <finalName>${docname}.pdf</finalName>
+ </format>
+ <format>
+ <formatName>html</formatName>
+ <stylesheetResource>classpath:/xslt/org/jboss/xhtml.xsl</stylesheetResource>
+ <finalName>index.html</finalName>
+ </format>
+ <format>
+ <formatName>html_single</formatName>
+ <stylesheetResource>classpath:/xslt/org/jboss/xhtml-single.xsl</stylesheetResource>
+ <finalName>index.html</finalName>
+ </format>
+ </formats>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <!-- mvn compile -Phtml -->
+ <profile>
+ <id>html</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.jboss.maven.plugins</groupId>
+ <artifactId>maven-jdocbook-plugin</artifactId>
+ <version>2.2.1</version>
+ <extensions>true</extensions>
+ <configuration>
+ <formats>
+ <format>
+ <formatName>html</formatName>
+ <stylesheetResource>classpath:/xslt/org/jboss/xhtml.xsl</stylesheetResource>
+ <finalName>index.html</finalName>
+ </format>
+ </formats>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <!-- mvn compile -Phtml-single -->
+ <profile>
+ <id>html-single</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.jboss.maven.plugins</groupId>
+ <artifactId>maven-jdocbook-plugin</artifactId>
+ <version>2.2.1</version>
+ <extensions>true</extensions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <!-- mvn compile -Ppdf -->
+ <profile>
+ <id>pdf</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.jboss.maven.plugins</groupId>
+ <artifactId>maven-jdocbook-plugin</artifactId>
+ <version>2.1.0</version>
+ <extensions>true</extensions>
+ <configuration>
+ <formats>
+ <format>
+ <formatName>pdf</formatName>
+ <stylesheetResource>classpath:/xslt/org/jboss/pdf.xsl</stylesheetResource>
+ <finalName>${docname}.pdf</finalName>
+ </format>
+ </formats>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ </profiles>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.jboss.maven.plugins</groupId>
+ <artifactId>maven-jdocbook-plugin</artifactId>
+ <version>2.2.1</version>
+ <extensions>true</extensions>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.pressgang</groupId>
+ <artifactId>pressgang-xslt</artifactId>
+ <version>1.2.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jbossorg-jdocbook-style</artifactId>
+ <version>1.1.1</version>
+ <type>jdocbook-style</type>
+ </dependency>
+ </dependencies>
+ <configuration>
+ <sourceDirectory>${project.basedir}</sourceDirectory>
+ <sourceDocumentName>${docname}.xml</sourceDocumentName>
+ <masterTranslation>en</masterTranslation>
+ <imageResource>
+ <directory>${project.basedir}/en</directory>
+ <includes>
+ <include>images/*.png</include>
+ <include>images/*.jpg</include>
+ </includes>
+ </imageResource>
+ <formats>
+ <format>
+ <formatName>pdf</formatName>
+ <stylesheetResource>classpath:/xslt/org/jboss/pdf.xsl</stylesheetResource>
+ <finalName>${pdf.name}</finalName>
+ </format>
+ <format>
+ <formatName>html</formatName>
+ <stylesheetResource>classpath:/xslt/org/jboss/xhtml.xsl</stylesheetResource>
+ <finalName>index.html</finalName>
+ </format>
+ <format>
+ <formatName>html_single</formatName>
+ <stylesheetResource>classpath:/xslt/org/jboss/xhtml-single.xsl</stylesheetResource>
+ <finalName>index.html</finalName>
+ </format>
+ </formats>
+ <options>
+ <xincludeSupported>true</xincludeSupported>
+ <xmlTransformerType>saxon</xmlTransformerType>
+ <docbookVersion>1.72.0</docbookVersion>
+ <localeSeparator>-</localeSeparator>
+ <transformerParameters>
+ <property>
+ <name>javax.xml.parsers.DocumentBuilderFactory</name>
+ <value>org.apache.xerces.jaxp.DocumentBuilderFactoryImpl</value>
+ </property>
+ <property>
+ <name>javax.xml.parsers.SAXParserFactory</name>
+ <value>org.apache.xerces.jaxp.SAXParserFactoryImpl</value>
+ </property>
+ </transformerParameters>
+ </options>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+ <!--<build>
+ <plugins>
+ <plugin>
+ <groupId>org.jboss.maven.plugins</groupId>
+ <artifactId>maven-jdocbook-plugin</artifactId>
+ <version>2.2.1</version>
+ <extensions>true</extensions>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.pressgang</groupId>
+ <artifactId>pressgang-xslt</artifactId>
+ <version>1.2.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jbossorg-jdocbook-style</artifactId>
+ <version>1.1.1</version>
+ <type>jdocbook-style</type>
+ </dependency>
+ </dependencies>
+ <configuration>
+ <sourceDocumentName>${docname}.xml</sourceDocumentName>
+ <sourceDirectory>.</sourceDirectory>
+ <imageResource>
+ <directory>${translation}</directory>
+ <includes>
+ <include>images/*</include>
+ </includes>
+ </imageResource>
+ <options>
+ <xincludeSupported>true</xincludeSupported>
+ <xmlTransformerType>saxon</xmlTransformerType>
+ <transformerParameters>
+ <property>
+ <name>javax.xml.parsers.DocumentBuilderFactory</name>
+ <value>org.apache.xerces.jaxp.DocumentBuilderFactoryImpl</value>
+ </property>
+ <property>
+ <name>javax.xml.parsers.SAXParserFactory</name>
+ <value>org.apache.xerces.jaxp.SAXParserFactoryImpl</value>
+ </property>
+ </transformerParameters>
+ </options>
+ </configuration>
+ </plugin>
+
+ </plugins>
+ </build>-->
+
+</project>
Modified: branches/Branch_2_2_EAP/examples/common/build.xml
===================================================================
--- branches/Branch_2_2_EAP/examples/common/build.xml 2011-02-22 06:31:16 UTC (rev 10239)
+++ branches/Branch_2_2_EAP/examples/common/build.xml 2011-02-22 16:45:53 UTC (rev 10240)
@@ -201,12 +201,14 @@
<include name="jms/*/build.xml"/>
<exclude name="common/build.xml"/>
<exclude name="core/perf/build.xml"/>
+ <exclude name="core/twitter-connector/build.xml"/>
<exclude name="jms/applet/build.xml"/>
<exclude name="jms/clustered-standalone/build.xml"/>
<exclude name="jms/jms-bridge/build.xml"/>
<exclude name="jms/large-message/build.xml"/>
<exclude name="jms/perf/build.xml"/>
<exclude name="jms/stomp-websockets/build.xml"/>
+ <exclude name="jms/spring-integration/build.xml"/>
</fileset>
</subant>
Modified: branches/Branch_2_2_EAP/examples/javaee/common/build.xml
===================================================================
--- branches/Branch_2_2_EAP/examples/javaee/common/build.xml 2011-02-22 06:31:16 UTC (rev 10239)
+++ branches/Branch_2_2_EAP/examples/javaee/common/build.xml 2011-02-22 16:45:53 UTC (rev 10240)
@@ -56,7 +56,7 @@
<fileset dir="${jboss.home}/client">
<include name="**/*.jar"/>
</fileset>
- <fileset dir="${jboss.home}/server/default-with-hornetq/lib">
+ <fileset dir="${jboss.home}/server/default/lib">
<include name="netty*.jar"/>
</fileset>
</path>
@@ -136,7 +136,7 @@
</target>
<target name="copy-profile" depends="profile.check" unless="donot.copy.profile">
- <property name="profile" value="${jboss.home}/server/default-with-hornetq"/>
+ <property name="profile" value="${jboss.home}/server/default"/>
<property name="example-profile" value="${jboss.home}/server/${example.name}-example-profile"/>
<property name="deploy.dir" value="${example-profile}/deploy/"/>
<mkdir dir="${example-profile}"/>
@@ -168,8 +168,8 @@
<target name="validate-jboss">
<fail unless="ENV.JBOSS_HOME" message="JBOSS_HOME environment variable not set! Set it and try again."/>
- <available property="default-config" type="dir" file="${jboss.home}/server/default-with-hornetq"/>
- <fail unless="default-config" message="${jboss.home}/server/default-with-hornetq not found!"/>
+ <available property="default-config" type="dir" file="${jboss.home}/server/default"/>
+ <fail unless="default-config" message="${jboss.home}/server/default not found!"/>
</target>
<target name="runExample" depends="validate-jboss,compile">
Modified: branches/Branch_2_2_EAP/examples/javaee/mdb-cmt-tx-required/src/org/hornetq/javaee/example/MDB_CMT_TxRequiredClientExample.java
===================================================================
--- branches/Branch_2_2_EAP/examples/javaee/mdb-cmt-tx-required/src/org/hornetq/javaee/example/MDB_CMT_TxRequiredClientExample.java 2011-02-22 06:31:16 UTC (rev 10239)
+++ branches/Branch_2_2_EAP/examples/javaee/mdb-cmt-tx-required/src/org/hornetq/javaee/example/MDB_CMT_TxRequiredClientExample.java 2011-02-22 16:45:53 UTC (rev 10240)
@@ -48,15 +48,19 @@
// Step 6. Create a JMS Message Producer
MessageProducer producer = session.createProducer(queue);
+ TextMessage message = null;
- // Step 7. Create a Text Message
- TextMessage message = session.createTextMessage("This is a text message");
+ for (int i = 0; i < 100; i++)
+ {
+// Step 7. Create a Text Message
+ message = session.createTextMessage("This is a text message");
- System.out.println("Sent message: " + message.getText());
-
+ System.out.println("Sent message: " + message.getText());
// Step 8. Send the Message
producer.send(message);
+ }
+
// Step 9,10 and 11 in MDBExample
}
finally
Modified: branches/Branch_2_2_EAP/examples/javaee/mdb-cmt-tx-required/src/org/hornetq/javaee/example/server/MDB_CMT_TxRequiredExample.java
===================================================================
--- branches/Branch_2_2_EAP/examples/javaee/mdb-cmt-tx-required/src/org/hornetq/javaee/example/server/MDB_CMT_TxRequiredExample.java 2011-02-22 06:31:16 UTC (rev 10239)
+++ branches/Branch_2_2_EAP/examples/javaee/mdb-cmt-tx-required/src/org/hornetq/javaee/example/server/MDB_CMT_TxRequiredExample.java 2011-02-22 16:45:53 UTC (rev 10240)
@@ -29,18 +29,18 @@
import org.jboss.ejb3.annotation.ResourceAdapter;
+import java.util.Calendar;
+
/**
* @author <a href="mailto:andy.taylor@jboss.org">Andy Taylor</a>
*/
@MessageDriven(name = "MDB_CMT_TxRequiredExample", activationConfig = { @ActivationConfigProperty(propertyName = "destinationType", propertyValue = "javax.jms.Queue"),
- @ActivationConfigProperty(propertyName = "destination", propertyValue = "queue/testQueue") })
+ @ActivationConfigProperty(propertyName = "destination", propertyValue = "queue/testQueue"),
+ @ActivationConfigProperty(propertyName = "consumerMaxRate", propertyValue = "1")})
@TransactionManagement(value = TransactionManagementType.CONTAINER)
@TransactionAttribute(value = TransactionAttributeType.REQUIRED)
-@ResourceAdapter("hornetq-ra.rar")
public class MDB_CMT_TxRequiredExample implements MessageListener
{
- @Resource(mappedName = "java:/TransactionManager")
- private TransactionManager tm;
public void onMessage(final Message message)
{
@@ -52,27 +52,14 @@
// Step 10. get the text from the message.
String text = textMessage.getText();
- System.out.println("message " + text + " received");
+ Calendar c =Calendar.getInstance();
- // Step 11. Lets take a look at the transaction and see whats happening.
- Transaction tx = tm.getTransaction();
+ System.out.println("message " + text + " received at " + c.getTime());
- if (tx != null)
- {
- System.out.println("we're in the middle of a transaction: " + tx);
- }
- else
- {
- System.out.println("something is wrong, I was expecting a transaction");
- }
}
catch (JMSException e)
{
e.printStackTrace();
}
- catch (SystemException e)
- {
- e.printStackTrace();
- }
}
}
Modified: branches/Branch_2_2_EAP/examples/jms/clustered-static-oneway/src/org/hornetq/jms/example/ClusterStaticOnewayExample.java
===================================================================
--- branches/Branch_2_2_EAP/examples/jms/clustered-static-oneway/src/org/hornetq/jms/example/ClusterStaticOnewayExample.java 2011-02-22 06:31:16 UTC (rev 10239)
+++ branches/Branch_2_2_EAP/examples/jms/clustered-static-oneway/src/org/hornetq/jms/example/ClusterStaticOnewayExample.java 2011-02-22 16:45:53 UTC (rev 10240)
@@ -141,6 +141,7 @@
TextMessage message2 = (TextMessage)consumer2.receive(5000);
System.out.println("Got message: " + message2.getText() + " from node " + con2Node);
+ System.out.println("i = " + i);
}
return true;
13 years, 10 months
- 1
- 0