[jboss-cvs] JBoss Messaging SVN: r6898 - in trunk: docs/user-manual/en/modules and 10 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue May 19 15:08:14 EDT 2009
Author: clebert.suconic at jboss.com
Date: 2009-05-19 15:08:13 -0400 (Tue, 19 May 2009)
New Revision: 6898
Removed:
trunk/tests/config/ConfigurationTest-config.xml
Modified:
trunk/docs/reference-guide/en/modules/server-configuration.xml
trunk/docs/user-manual/en/modules/configuration-index.xml
trunk/docs/user-manual/en/modules/embedding-jbm.xml
trunk/docs/user-manual/en/modules/large-messages.xml
trunk/docs/user-manual/en/modules/paging.xml
trunk/docs/user-manual/en/modules/persistence.xml
trunk/examples/core/embedded/src/org/jboss/core/example/EmbeddedExample.java
trunk/examples/jms/embedded/src/org/jboss/jms/example/EmbeddedExample.java
trunk/src/config/common/schema/jbm-configuration.xsd
trunk/src/main/org/jboss/messaging/core/config/Configuration.java
trunk/src/main/org/jboss/messaging/core/config/impl/ConfigurationImpl.java
trunk/src/main/org/jboss/messaging/core/config/impl/FileConfiguration.java
trunk/src/main/org/jboss/messaging/core/server/Messaging.java
trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java
trunk/tests/config/ConfigurationTest-full-config.xml
trunk/tests/joram-tests/src/org/jboss/test/jms/SpawnedJMSServer.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/config/impl/ConfigurationImplTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/config/impl/FileConfigurationTest.java
Log:
Few tweaks (part I)
Modified: trunk/docs/reference-guide/en/modules/server-configuration.xml
===================================================================
--- trunk/docs/reference-guide/en/modules/server-configuration.xml 2009-05-19 18:12:39 UTC (rev 6897)
+++ trunk/docs/reference-guide/en/modules/server-configuration.xml 2009-05-19 19:08:13 UTC (rev 6898)
@@ -803,8 +803,8 @@
</varlistentry>
</variablelist>
</section>
- <section id="enable-file-deployment.configuration">
- <title>enable-file-deployment</title>
+ <section id="file-deployment-enabled.configuration">
+ <title>file-deployment-enabled</title>
<variablelist>
<varlistentry>
<term>type</term>
Modified: trunk/docs/user-manual/en/modules/configuration-index.xml
===================================================================
--- trunk/docs/user-manual/en/modules/configuration-index.xml 2009-05-19 18:12:39 UTC (rev 6897)
+++ trunk/docs/user-manual/en/modules/configuration-index.xml 2009-05-19 19:08:13 UTC (rev 6898)
@@ -30,15 +30,15 @@
<entry>false</entry>
</row>
<row>
- <entry>enable-file-deployment</entry>
+ <entry>file-deployment-enabled</entry>
<entry>Boolean</entry>
<entry>True means that the server will load configuration from the
configuration files</entry>
<entry>true</entry>
</row>
<row>
- <entry><link linkend="enable.persistence"
- >enable-persistence</link></entry>
+ <entry><link linkend="persistence.enabled"
+ >persistence-enabled</link></entry>
<entry>Boolean</entry>
<entry>True means that the server will use the file based journal for
persistence.</entry>
Modified: trunk/docs/user-manual/en/modules/embedding-jbm.xml
===================================================================
--- trunk/docs/user-manual/en/modules/embedding-jbm.xml 2009-05-19 18:12:39 UTC (rev 6897)
+++ trunk/docs/user-manual/en/modules/embedding-jbm.xml 2009-05-19 19:08:13 UTC (rev 6898)
@@ -70,7 +70,7 @@
required to instantiate a Server:</para>
<itemizedlist>
<listitem>
- <para>The configuration. We will use <literal>ConfigurationImpl</literal></para>
+ <para>The configuration</para>
</listitem>
<listitem>
<para>A <literal>MBeanServer</literal> required by management.</para>
@@ -195,8 +195,8 @@
</section>
<section>
<title>JMS Embedding Example</title>
- <para>The <ulink url="../../../../examples/jms/embedded/readme.html"><literal
- >JMS Embedding</literal> Example</ulink> shows how to setup and run JBoss Messaging
+ <para>The <ulink url="../../../../examples/jms/embedded/readme.html"><literal>JMS
+ Embedding</literal> Example</ulink> shows how to setup and run JBoss Messaging
embedded with JMS...</para>
</section>
</chapter>
Modified: trunk/docs/user-manual/en/modules/large-messages.xml
===================================================================
--- trunk/docs/user-manual/en/modules/large-messages.xml 2009-05-19 18:12:39 UTC (rev 6897)
+++ trunk/docs/user-manual/en/modules/large-messages.xml 2009-05-19 19:08:13 UTC (rev 6898)
@@ -7,7 +7,7 @@
files on the server. Flow control (<xref linkend="flow-control"/>) is used on the
transmission to prevent overusing the channel or running out of memory during the
transmission process, so it is possible to send and receive very large messages. </para>
- <para>For example, it is possible to send an 8GB message even if you only had 50MB of RAM on
+ <para>For example, it is possible to send an 8GiB message even if you only had 50MiB of RAM on
either client and server. </para>
<section id="large.message.configuring">
<title>Configuring the server</title>
@@ -32,16 +32,16 @@
<title>Setting the limits</title>
<para>The definition of what is a large message is done on the session factory. For example,
you may configure a factory on the http transport considering a message as large when
- its size is greater than 10KB and another one on the socket transport considering
- messages greater than 200KB as large.</para>
- <para>By default the min large message size is 100KB.</para>
+ its size is greater than 10KiB and another one on the socket transport considering
+ messages greater than 200KiB as large.</para>
+ <para>By default the min large message size is 100KiB.</para>
<section id="large-messages.core.config">
<title>Using Core API</title>
<para>If the JBoss Messaging Core API is used, the minimal large message size is
specified by <literal>ClientSessionFactory.setMinLargeMessageSize</literal>.</para>
<programlisting>ClientSessionFactory factory = new ClientSessionFactoryImpl(new
TransportConfiguration(NettyConnectorFactory.class.getName()), null);
-factory.setMinLargeMessageSize(25000);</programlisting>
+factory.setMinLargeMessageSize(25 * 1024);</programlisting>
<para><xref linkend="configuring-transports.client.side"/> will provide more information
on how to instantiate the session factory.</para>
</section>
@@ -230,11 +230,11 @@
<literal>ObjectMessage</literal> and <literal>MapMessage</literal> transparently.
However those types of message will require a full reconstruction in memory in order to
work properly.</para>
- <para>For example: You may choose to send a 1MB String over a TextMessage. When you read the
- message Java will need to parse the body of the message back into a String, so you need
- to have enough memory to allocate your large messages when using those types. If you use
- <literal>BytesMessage</literal> or <literal>StreamMessage</literal> this restriction
- won't apply.</para>
+ <para>For example: You may choose to send a 1MiB String over a TextMessage. When you read
+ the message Java will need to parse the body of the message back into a String, so you
+ need to have enough memory to allocate your large messages when using those types. If
+ you use <literal>BytesMessage</literal> or <literal>StreamMessage</literal> this
+ restriction won't apply.</para>
</section>
<section>
<title>Resending a large message</title>
Modified: trunk/docs/user-manual/en/modules/paging.xml
===================================================================
--- trunk/docs/user-manual/en/modules/paging.xml 2009-05-19 18:12:39 UTC (rev 6897)
+++ trunk/docs/user-manual/en/modules/paging.xml 2009-05-19 19:08:13 UTC (rev 6898)
@@ -69,7 +69,7 @@
<row>
<entry><literal>page-size-bytes</literal></entry>
<entry>The size of each page file used on the paging system</entry>
- <entry>10MB (10 * 1024 * 1024 bytes)</entry>
+ <entry>10MiB (10 * 1024 * 1024 bytes)</entry>
</row>
<row>
<entry><literal>drop-messages-when-full</literal></entry>
@@ -133,7 +133,7 @@
<entry><literal>paging-global-watermark-size</literal></entry>
<entry>The watermark used to determine when we start depaging. This
value should be equivalent to a page-file size.</entry>
- <entry>10MB (10 * 1024 * 1024 bytes)</entry>
+ <entry>10MiB (10 * 1024 * 1024 bytes)</entry>
</row>
</tbody>
</tgroup>
@@ -162,11 +162,9 @@
the Address enters in page mode, messages will be stored on disk and not routed to
queues until messages are consumed on that queue.</para>
</section>
-
<section>
<title>Paging Example</title>
- <para>The <ulink url="../../../../examples/jms/paging/readme.html"><literal
- >Paging</literal> Example</ulink> shows how to JBoss Messaging avoids running out of memory.</para>
+ <para>The <ulink url="../../../../examples/jms/paging/readme.html"><literal>Paging</literal>
+ Example</ulink> shows how to JBoss Messaging avoids running out of memory.</para>
</section>
-
</chapter>
Modified: trunk/docs/user-manual/en/modules/persistence.xml
===================================================================
--- trunk/docs/user-manual/en/modules/persistence.xml 2009-05-19 18:12:39 UTC (rev 6897)
+++ trunk/docs/user-manual/en/modules/persistence.xml 2009-05-19 19:08:13 UTC (rev 6898)
@@ -20,7 +20,7 @@
file to be about the right size to fit on a disk cylinder. Modern disk topologies are
complex and we are not in control over which cylinder(s) the file is mapped onto so this is
not an exact science. By minimising the number of disk cylinders the file is using, we can
- minimise the amount of disk head movement, since an entire disk cyclinder is accessible
+ minimise the amount of disk head movement, since an entire disk cylinder is accessible
simply by the disk rotating - the head does not have to move.</para>
<para>As delete records are added to the journal, JBoss Messaging has a sophisticated file
garbage collection algorithm which can determine if a particular journal file is needed any
@@ -112,7 +112,7 @@
<para>For the best performance, we recommend the journal is located on its own
volume in order to minimise disk head movement. If the journal is on a volume
which is shared with other processes which might be writing other files (e.g.
- bindings journal, database, or transaction co-ordinator) then the disk head may
+ bindings journal, database, or transaction coordinator) then the disk head may
well be moving rapidly between these files as it writes them, thus reducing
performance.</para>
<para>When the message journal is stored on a SAN we recommend each journal instance
@@ -130,7 +130,7 @@
<para>Valid values are <literal>NIO</literal> or <literal>AIO</literal>.</para>
<para>Choosing <literal>NIO</literal> chooses the Java NIO journal. Choosing
<literal>AIO</literal> chooses the Linux asynchronous IO journal. If you
- choose <literal>AIO</literal> but are not running Linux or you you do not have
+ choose <literal>AIO</literal> but are not running Linux or you do not have
libaio installed then JBoss Messaging will detect this and automatically fall
back to using <literal>NIO</literal>.</para>
</listitem>
@@ -175,7 +175,7 @@
</listitem>
<listitem>
<para><literal>journal-buffer-reuse-size</literal></para>
- <para>Creaing direct byte buffers is an expensive operation, so the journal will
+ <para>Creaking direct byte buffers is an expensive operation, so the journal will
attempt to re-use any buffers with a size less than this setting, in bytes. If
this value is set to <literal>-1</literal> then the journal will not attempt to
re-use any buffers. This setting only takes effect if the journal is <literal
@@ -199,11 +199,11 @@
<para>Using aptitude, (e.g. on Ubuntu or Debian system):
<programlisting>sudo apt-get install libaio1</programlisting></para>
</section>
- <section id="enable.persistence">
+ <section id="persistence.enabled">
<title>Configuring JBoss Messaging for zero persistence</title>
<para> In some situations, zero persistence is sometimes required for a messaging system.
Configuring JBoss Messaging to perform zero persistence is straightforward. Simply set
- the parameter <literal>enable-persistence</literal> in <literal
+ the parameter <literal>persistence-enabled</literal> in <literal
>jbm-configuration.xml</literal> to <literal>false</literal>. </para>
<para>Please note that if you set this parameter to false, then <emphasis>zero</emphasis>
persistence will occur. That means no bindings data, message data, large message data,
Modified: trunk/examples/core/embedded/src/org/jboss/core/example/EmbeddedExample.java
===================================================================
--- trunk/examples/core/embedded/src/org/jboss/core/example/EmbeddedExample.java 2009-05-19 18:12:39 UTC (rev 6897)
+++ trunk/examples/core/embedded/src/org/jboss/core/example/EmbeddedExample.java 2009-05-19 19:08:13 UTC (rev 6898)
@@ -54,7 +54,7 @@
// Step 1. Create the Configuration, and set the properties accordingly
Configuration configuration = new ConfigurationImpl();
- configuration.setEnablePersistence(false);
+ configuration.setPersistenceEnabled(false);
configuration.setSecurityEnabled(false);
// Step 2. Create and start the server
Modified: trunk/examples/jms/embedded/src/org/jboss/jms/example/EmbeddedExample.java
===================================================================
--- trunk/examples/jms/embedded/src/org/jboss/jms/example/EmbeddedExample.java 2009-05-19 18:12:39 UTC (rev 6897)
+++ trunk/examples/jms/embedded/src/org/jboss/jms/example/EmbeddedExample.java 2009-05-19 19:08:13 UTC (rev 6898)
@@ -55,7 +55,7 @@
// Step 1. Create the Configuration, and set the properties accordingly
Configuration configuration = new ConfigurationImpl();
- configuration.setEnablePersistence(false);
+ configuration.setPersistenceEnabled(false);
configuration.setSecurityEnabled(false);
// Step 2. Create and start the server
Modified: trunk/src/config/common/schema/jbm-configuration.xsd
===================================================================
--- trunk/src/config/common/schema/jbm-configuration.xsd 2009-05-19 18:12:39 UTC (rev 6897)
+++ trunk/src/config/common/schema/jbm-configuration.xsd 2009-05-19 19:08:13 UTC (rev 6898)
@@ -10,9 +10,9 @@
<xsd:all>
<xsd:element ref="clustered" maxOccurs="1"
minOccurs="0" />
- <xsd:element ref="enable-file-deployment" maxOccurs="1"
+ <xsd:element ref="file-deployment-enabled" maxOccurs="1"
minOccurs="0" />
- <xsd:element ref="enable-persistence" maxOccurs="1"
+ <xsd:element ref="persistence-enabled" maxOccurs="1"
minOccurs="0" />
<xsd:element name="scheduled-thread-pool-max-size"
type="xsd:int" maxOccurs="1" minOccurs="0">
@@ -222,9 +222,9 @@
<xsd:element name="clustered" type="xsd:boolean"></xsd:element>
- <xsd:element name="enable-file-deployment" type="xsd:boolean"></xsd:element>
+ <xsd:element name="file-deployment-enabled" type="xsd:boolean"></xsd:element>
- <xsd:element name="enable-persistence" type="xsd:boolean"></xsd:element>
+ <xsd:element name="persistence-enabled" type="xsd:boolean"></xsd:element>
<xsd:element name="local-bind-address" type="xsd:string"></xsd:element>
Modified: trunk/src/main/org/jboss/messaging/core/config/Configuration.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/config/Configuration.java 2009-05-19 18:12:39 UTC (rev 6897)
+++ trunk/src/main/org/jboss/messaging/core/config/Configuration.java 2009-05-19 19:08:13 UTC (rev 6898)
@@ -60,13 +60,13 @@
void setBackup(boolean backup);
- boolean isEnableFileDeployment();
+ boolean isFileDeploymentEnabled();
- void setEnableFileDeployment(boolean enable);
+ void setFileDeploymentEnabled(boolean enable);
- boolean isEnablePersistence();
+ boolean isPersistenceEnabled();
- void setEnablePersistence(boolean enable);
+ void setPersistenceEnabled(boolean enable);
long getFileDeployerScanPeriod();
@@ -228,6 +228,8 @@
void setLargeMessagesDirectory(String directory);
+ // Other Properties ---------------------------------------------------------------------
+
boolean isWildcardRoutingEnabled();
void setWildcardRoutingEnabled(boolean enabled);
Modified: trunk/src/main/org/jboss/messaging/core/config/impl/ConfigurationImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/config/impl/ConfigurationImpl.java 2009-05-19 18:12:39 UTC (rev 6897)
+++ trunk/src/main/org/jboss/messaging/core/config/impl/ConfigurationImpl.java 2009-05-19 19:08:13 UTC (rev 6898)
@@ -47,9 +47,9 @@
public static final boolean DEFAULT_BACKUP = false;
- public static final boolean DEFAULT_ENABLE_FILE_DEPLOYMENT = false;
+ public static final boolean DEFAULT_FILE_DEPLOYMENT_ENABLED = false;
- public static final boolean DEFAULT_ENABLE_PERSISTENCE = true;
+ public static final boolean DEFAULT_PERSISTENCE_ENABLED = true;
public static final long DEFAULT_FILE_DEPLOYER_SCAN_PERIOD = 5000;
@@ -136,13 +136,13 @@
public static final boolean DEFAULT_CLUSTER_FORWARD_WHEN_NO_CONSUMERS = false;
public static final int DEFAULT_CLUSTER_MAX_HOPS = 1;
-
+
public static final int DEFAULT_CLUSTER_RETRY_INTERVAL = 500;
public static final boolean DEFAULT_DIVERT_EXCLUSIVE = false;
public static final boolean DEFAULT_BRIDGE_DUPLICATE_DETECTION = true;
-
+
public static final int DEFAULT_BRIDGE_RECONNECT_ATTEMPTS = -1;
// Attributes -----------------------------------------------------------------------------
@@ -151,9 +151,9 @@
protected boolean backup = DEFAULT_BACKUP;
- protected boolean enableFileDeployment = DEFAULT_ENABLE_FILE_DEPLOYMENT;
+ protected boolean fileDeploymentEnabled = DEFAULT_FILE_DEPLOYMENT_ENABLED;
- protected boolean enablePersistence = DEFAULT_ENABLE_PERSISTENCE;
+ protected boolean persistenceEnabled = DEFAULT_PERSISTENCE_ENABLED;
protected long fileDeploymentScanPeriod = DEFAULT_FILE_DEPLOYER_SCAN_PERIOD;
@@ -289,24 +289,24 @@
return backup;
}
- public boolean isEnableFileDeployment()
+ public boolean isFileDeploymentEnabled()
{
- return enableFileDeployment;
+ return fileDeploymentEnabled;
}
- public void setEnableFileDeployment(final boolean enable)
+ public void setFileDeploymentEnabled(final boolean enable)
{
- enableFileDeployment = enable;
+ fileDeploymentEnabled = enable;
}
- public boolean isEnablePersistence()
+ public boolean isPersistenceEnabled()
{
- return this.enablePersistence;
+ return this.persistenceEnabled;
}
- public void setEnablePersistence(boolean enable)
+ public void setPersistenceEnabled(boolean enable)
{
- this.enablePersistence = enable;
+ this.persistenceEnabled = enable;
}
public long getFileDeployerScanPeriod()
Modified: trunk/src/main/org/jboss/messaging/core/config/impl/FileConfiguration.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/config/impl/FileConfiguration.java 2009-05-19 18:12:39 UTC (rev 6897)
+++ trunk/src/main/org/jboss/messaging/core/config/impl/FileConfiguration.java 2009-05-19 19:08:13 UTC (rev 6898)
@@ -98,9 +98,9 @@
backup = getBoolean(e, "backup", backup);
//Defaults to true when using FileConfiguration
- enableFileDeployment = getBoolean(e, "enable-file-deployment", true);
+ fileDeploymentEnabled = getBoolean(e, "file-deployment-enabled", true);
- enablePersistence = getBoolean(e, "enable-persistence", enablePersistence);
+ persistenceEnabled = getBoolean(e, "persistence-enabled", persistenceEnabled);
persistDeliveryCountBeforeDelivery = getBoolean(e, "persist-delivery-count-before-delivery", persistDeliveryCountBeforeDelivery);
Modified: trunk/src/main/org/jboss/messaging/core/server/Messaging.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/Messaging.java 2009-05-19 18:12:39 UTC (rev 6897)
+++ trunk/src/main/org/jboss/messaging/core/server/Messaging.java 2009-05-19 19:08:13 UTC (rev 6898)
@@ -59,7 +59,7 @@
public static MessagingServer newMessagingServer(final Configuration config)
{
- return newMessagingServer(config, config.isEnablePersistence());
+ return newMessagingServer(config, config.isPersistenceEnabled());
}
public static MessagingServer newMessagingServer(final Configuration config,
@@ -92,7 +92,7 @@
final JBMSecurityManager securityManager,
final boolean enablePersistence)
{
- config.setEnablePersistence(enablePersistence);
+ config.setPersistenceEnabled(enablePersistence);
MessagingServer server = new MessagingServerImpl(config, mbeanServer, securityManager);
Modified: trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java 2009-05-19 18:12:39 UTC (rev 6897)
+++ trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java 2009-05-19 19:08:13 UTC (rev 6898)
@@ -286,7 +286,7 @@
remotingService.stop();
// Stop the deployers
- if (configuration.isEnableFileDeployment())
+ if (configuration.isFileDeploymentEnabled())
{
basicUserCredentialsDeployer.stop();
@@ -896,12 +896,12 @@
{
// Create the hard-wired components
- if (configuration.isEnableFileDeployment())
+ if (configuration.isFileDeploymentEnabled())
{
deploymentManager = new FileDeploymentManager(configuration.getFileDeployerScanPeriod());
}
- if (configuration.isEnablePersistence())
+ if (configuration.isPersistenceEnabled())
{
storageManager = new JournalStorageManager(configuration, threadPool);
}
@@ -953,7 +953,7 @@
// Address settings need to deployed initially, since they're require on paging manager.start()
- if (configuration.isEnableFileDeployment())
+ if (configuration.isFileDeploymentEnabled())
{
addressSettingsDeployer = new AddressSettingsDeployer(deploymentManager, addressSettingsRepository);
@@ -973,7 +973,7 @@
resourceManager.start();
// Deploy all security related config
- if (configuration.isEnableFileDeployment())
+ if (configuration.isFileDeploymentEnabled())
{
basicUserCredentialsDeployer = new BasicUserCredentialsDeployer(deploymentManager, securityManager);
@@ -994,7 +994,7 @@
// Deploy any predefined queues - on backup we don't start queue deployer - instead deployments
// are replicated from live
- if (configuration.isEnableFileDeployment() && !configuration.isBackup())
+ if (configuration.isFileDeploymentEnabled() && !configuration.isBackup())
{
queueDeployer = new QueueDeployer(deploymentManager, messagingServerControl);
Deleted: trunk/tests/config/ConfigurationTest-config.xml
===================================================================
--- trunk/tests/config/ConfigurationTest-config.xml 2009-05-19 18:12:39 UTC (rev 6897)
+++ trunk/tests/config/ConfigurationTest-config.xml 2009-05-19 19:08:13 UTC (rev 6898)
@@ -1,64 +0,0 @@
-<configuration
- xmlns="urn:jboss:messaging"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../../src/schemas/jbm-configuration.xsd ">
- <clustered>true</clustered>
- <enable-file-deployment>true</enable-file-deployment>
- <scheduled-thread-pool-max-size>12345</scheduled-thread-pool-max-size>
- <security-enabled>false</security-enabled>
- <security-invalidation-interval>5423</security-invalidation-interval>
- <wild-card-routing-enabled>true</wild-card-routing-enabled>
- <management-address>Giraffe</management-address>
- <management-request-timeout>91</management-request-timeout>
- <message-counter-enabled>true</message-counter-enabled>
- <message-counter-sample-period>5678</message-counter-sample-period>
- <message-counter-max-day-history>78910</message-counter-max-day-history>
- <connection-scan-period>6543</connection-scan-period>
- <transaction-timeout>98765</transaction-timeout>
- <transaction-timeout-scan-period>56789</transaction-timeout-scan-period>
- <message-expiry-scan-period>10111213</message-expiry-scan-period>
- <message-expiry-thread-priority>8</message-expiry-thread-priority>
- <remoting-interceptors>
- <class-name>org.jboss.messaging.tests.unit.core.config.impl.TestInterceptor1</class-name>
- <class-name>org.jboss.messaging.tests.unit.core.config.impl.TestInterceptor2</class-name>
- </remoting-interceptors>
- <queue-activation-timeout>12456</queue-activation-timeout>
- <backup>true</backup>
- <backup-connector-ref connector-name="backup-connector"/>
- <connectors>
- <connector name="backup-connector">
- <factory-class>org.jboss.messaging.tests.unit.core.config.impl.TestConnectorFactory1</factory-class>
- <param key="c_mykey1" value="c_foovalue1" type="String"/>
- <param key="c_mykey2" value="6000" type="Long"/>
- <param key="c_mykey3" value="60" type="Integer"/>
- <param key="c_mykey4" value="c_foovalue4" type="String"/>
- </connector>
- </connectors>
- <acceptors>
- <acceptor>
- <factory-class>org.jboss.messaging.tests.unit.core.config.impl.TestAcceptorFactory1</factory-class>
- <param key="a_mykey1" value="a_foovalue1" type="String"/>
- <param key="a_mykey2" value="1234567" type="Long"/>
- <param key="a_mykey3" value="123" type="Integer"/>
- <param key="a_mykey4" value="a_foovalue4" type="String"/>
- </acceptor>
- <acceptor>
- <factory-class>org.jboss.messaging.tests.unit.core.config.impl.TestAcceptorFactory2</factory-class>
- <param key="b_mykey1" value="b_foovalue1" type="String"/>
- <param key="b_mykey2" value="7654321" type="Long"/>
- <param key="b_mykey3" value="321" type="Integer"/>
- <param key="b_mykey4" value="b_foovalue4" type="String"/>
- </acceptor>
- </acceptors>
-
- <bindings-directory>somedir</bindings-directory>
- <create-bindings-dir>false</create-bindings-dir>
- <journal-directory>somedir2</journal-directory>
- <create-journal-dir>false</create-journal-dir>
- <journal-type>NIO</journal-type>
- <journal-sync-transactional>false</journal-sync-transactional>
- <journal-sync-non-transactional>true</journal-sync-non-transactional>
- <journal-file-size>12345678</journal-file-size>
- <journal-min-files>100</journal-min-files>
- <journal-max-aio>56546</journal-max-aio>
- </configuration>
Modified: trunk/tests/config/ConfigurationTest-full-config.xml
===================================================================
--- trunk/tests/config/ConfigurationTest-full-config.xml 2009-05-19 18:12:39 UTC (rev 6897)
+++ trunk/tests/config/ConfigurationTest-full-config.xml 2009-05-19 19:08:13 UTC (rev 6898)
@@ -1,11 +1,12 @@
<configuration
xmlns="urn:jboss:messaging"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../../src/schemas/jbm-configuration.xsd ">
+ xsi:schemaLocation="urn:jboss:messaging ../../src/schemas/jbm-configuration.xsd">
<clustered>true</clustered>
- <enable-file-deployment>true</enable-file-deployment>
<scheduled-thread-pool-max-size>12345</scheduled-thread-pool-max-size>
<thread-pool-max-size>54321</thread-pool-max-size>
+ <persistence-enabled>false</persistence-enabled>
+ <file-deployment-enabled>true</file-deployment-enabled>
<security-enabled>false</security-enabled>
<security-invalidation-interval>5423</security-invalidation-interval>
<wild-card-routing-enabled>true</wild-card-routing-enabled>
Modified: trunk/tests/joram-tests/src/org/jboss/test/jms/SpawnedJMSServer.java
===================================================================
--- trunk/tests/joram-tests/src/org/jboss/test/jms/SpawnedJMSServer.java 2009-05-19 18:12:39 UTC (rev 6897)
+++ trunk/tests/joram-tests/src/org/jboss/test/jms/SpawnedJMSServer.java 2009-05-19 19:08:13 UTC (rev 6898)
@@ -75,7 +75,7 @@
Configuration conf = new ConfigurationImpl();
conf.getAcceptorConfigurations().add(new TransportConfiguration(NettyAcceptorFactory.class.getName()));
conf.setSecurityEnabled(false);
- conf.setEnableFileDeployment(false);
+ conf.setFileDeploymentEnabled(false);
// disable server persistence since JORAM tests do not restart server
final MessagingServer server = Messaging.newMessagingServer(conf, false);
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/config/impl/ConfigurationImplTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/config/impl/ConfigurationImplTest.java 2009-05-19 18:12:39 UTC (rev 6897)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/config/impl/ConfigurationImplTest.java 2009-05-19 19:08:13 UTC (rev 6898)
@@ -74,6 +74,8 @@
assertEquals(ConfigurationImpl.DEFAULT_MESSAGE_EXPIRY_THREAD_PRIORITY, conf.getMessageExpiryThreadPriority());
assertEquals(ConfigurationImpl.DEFAULT_TRANSACTION_TIMEOUT_SCAN_PERIOD, conf.getTransactionTimeoutScanPeriod());
assertEquals(ConfigurationImpl.DEFAULT_MANAGEMENT_ADDRESS, conf.getManagementAddress());
+ assertEquals(ConfigurationImpl.DEFAULT_PERSISTENCE_ENABLED, conf.isPersistenceEnabled());
+ assertEquals(ConfigurationImpl.DEFAULT_FILE_DEPLOYMENT_ENABLED, conf.isFileDeploymentEnabled());
}
public void testSetGetAttributes()
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/config/impl/FileConfigurationTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/config/impl/FileConfigurationTest.java 2009-05-19 18:12:39 UTC (rev 6897)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/config/impl/FileConfigurationTest.java 2009-05-19 19:08:13 UTC (rev 6898)
@@ -43,8 +43,10 @@
public void testDefaults()
{
//Check they match the values from the test file
+ assertEquals(false, conf.isPersistenceEnabled());
+ assertEquals(true, conf.isFileDeploymentEnabled());
assertEquals(true, conf.isClustered());
- assertEquals(true, conf.isEnableFileDeployment());
+ assertEquals(true, conf.isFileDeploymentEnabled());
assertEquals(12345, conf.getScheduledThreadPoolMaxSize());
assertEquals(54321, conf.getThreadPoolMaxSize());
assertEquals(false, conf.isSecurityEnabled());
More information about the jboss-cvs-commits
mailing list