[jboss-cvs] JBoss Messaging SVN: r5429 - in trunk: src/config and 5 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Nov 25 04:11:00 EST 2008
Author: timfox
Date: 2008-11-25 04:11:00 -0500 (Tue, 25 Nov 2008)
New Revision: 5429
Added:
trunk/src/config/jbm-jms.xml
Removed:
trunk/src/config/jbm-jndi.xml
Modified:
trunk/docs/userguide/en/modules/configuration.xml
trunk/docs/userguide/en/modules/installation.xml
trunk/src/config/jbm-configuration.xml
trunk/src/main/org/jboss/messaging/core/config/impl/FileConfiguration.java
trunk/src/main/org/jboss/messaging/core/deployers/impl/XmlDeployer.java
trunk/src/main/org/jboss/messaging/core/server/cluster/impl/BroadcastGroupImpl.java
trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java
trunk/src/main/org/jboss/messaging/jms/server/impl/JMSServerDeployer.java
Log:
A few tweaks
Modified: trunk/docs/userguide/en/modules/configuration.xml
===================================================================
--- trunk/docs/userguide/en/modules/configuration.xml 2008-11-25 07:10:34 UTC (rev 5428)
+++ trunk/docs/userguide/en/modules/configuration.xml 2008-11-25 09:11:00 UTC (rev 5429)
@@ -14,7 +14,7 @@
<filename>queues.xml</filename>
</listitem>
<listitem>
- <filename>jbm-jndi.xml</filename>
+ <filename>jbm-jms.xml</filename>
</listitem>
<listitem>
<filename>jbm-standalone-beans.xml</filename>
@@ -471,13 +471,13 @@
</itemizedlist>
</section>
<section id="configuration.jms">
- <title>jbm-jndi.xml</title>
+ <title>jbm-jms.xml</title>
<para>This configuration file is used to create destinations and Connection Factories and make them available in
JNDI. Note that this is the only configuration file that exposes JMS functionality, the rest of the
configuration is 100% JMS agnostic.
</para>
<para>
- A typical jbm-jndi.xml config looks like:
+ A typical jbm-jms.xml config looks like:
</para>
<programlisting>
<![CDATA[
@@ -883,7 +883,7 @@
<para>The JMS Server Deployer</para>
<para>The JMS Server Deployer takes care of deploying Destinations and Connection Factories into JNDi via
the
- file<literal>jbm-jndi.xml</literal>. This can be removed if no objects are needed in JNDI or if only core
+ file<literal>jbm-jms.xml</literal>. This can be removed if no objects are needed in JNDI or if only core
messaging is being used.
</para>
<programlisting>
Modified: trunk/docs/userguide/en/modules/installation.xml
===================================================================
--- trunk/docs/userguide/en/modules/installation.xml 2008-11-25 07:10:34 UTC (rev 5428)
+++ trunk/docs/userguide/en/modules/installation.xml 2008-11-25 09:11:00 UTC (rev 5429)
@@ -114,7 +114,7 @@
10:26:02,831 INFO @main [XmlDeployer] deploying guest
10:26:02,991 INFO @main [FileDeploymentManager] Deploying org.jboss.messagin
g.jms.server.impl.JMSServerDeployer at d6c07 with urlfile:/home/andy/projects/jB
- ossMessaging/build/messaging-2.0.0.alpha1/config/jbm-jndi.xml
+ ossMessaging/build/messaging-2.0.0.alpha1/config/jbm-jms.xml
10:26:03,005 INFO @main [XmlDeployer] deploying DLQ
10:26:03,035 INFO @main [XmlDeployer] deploying ExpiryQueue
10:26:03,038 INFO @main [XmlDeployer] deploying testQueue
Modified: trunk/src/config/jbm-configuration.xml
===================================================================
--- trunk/src/config/jbm-configuration.xml 2008-11-25 07:10:34 UTC (rev 5428)
+++ trunk/src/config/jbm-configuration.xml 2008-11-25 09:11:00 UTC (rev 5429)
@@ -11,6 +11,7 @@
<group-address>231.7.7.7</group-address>
<group-port>9876</group-port>
<broadcast-period>5000</broadcast-period>
+ <connector-ref connector-name="netty"/>
</broadcast-group>
<discovery-group name="dg-group1">
@@ -32,9 +33,9 @@
<message-flow name="example-static-connectors">
<address>jmstopics.#</address>
- <connector-link connector-name="connector1"/>
- <connector-link connector-name="connector2"/>
- <connector-link connector-name="connector3"/>
+ <connector-ref connector-name="connector1"/>
+ <connector-ref connector-name="connector2"/>
+ <connector-ref connector-name="connector3"/>
<fanout>true</fanout>
</message-flow>
Copied: trunk/src/config/jbm-jms.xml (from rev 5424, trunk/src/config/jbm-jndi.xml)
===================================================================
--- trunk/src/config/jbm-jms.xml (rev 0)
+++ trunk/src/config/jbm-jms.xml 2008-11-25 09:11:00 UTC (rev 5429)
@@ -0,0 +1,153 @@
+<deployment>
+
+ <connection-factory name="testConnectionFactory">
+ <connector-ref connector-name="netty"/>
+ <entry name="testConnectionFactory"/>
+ </connection-factory>
+
+ <connection-factory name="ConnectionFactory">
+ <connector-ref connector-name="netty"/>
+ <entry name="ConnectionFactory"/>
+ <entry name="/ConnectionFactory"/>
+ <entry name="/XAConnectionFactory"/>
+ <entry name="java:/ConnectionFactory"/>
+ <entry name="java:/XAConnectionFactory"/>
+ </connection-factory>
+
+ <connection-factory name="ServerAckConnectionFactory">
+ <connector-ref connector-name="netty"/>
+ <pre-commit-acks>true</pre-commit-acks>
+ <entry name="ServerAckConnectionFactory"/>
+ <entry name="/ServerAckConnectionFactory"/>
+ <entry name="/ServerAckXAConnectionFactory"/>
+ <entry name="java:/ServerAckConnectionFactory"/>
+ <entry name="java:/ServerAckXAConnectionFactory"/>
+ </connection-factory>
+
+ <connection-factory name="ClusteredConnectionFactory">
+ <connector-ref connector-name="netty"/>
+ <backup-connector connector-name="netty-backup"/>
+ <entry name="/ClusteredConnectionFactory"/>
+ <entry name="/ClusteredXAConnectionFactory"/>
+ <entry name="java:/ClusteredConnectionFactory"/>
+ <entry name="java:/ClusteredXAConnectionFactory"/>
+ </connection-factory>
+
+ <connection-factory name="MyExampleConnectionFactory">
+ <connector-ref connector-name="netty"/>
+ <ping-period>5000</ping-period>
+ <call-timeout>30000</call-timeout>
+ <entry name="/MyExampleConnectionFactory"/>
+ <entry name="/acme/MyExampleConnectionFactoryDupe"/>
+ <entry name="java:/xyz/CF1"/>
+ <entry name="java:/connectionfactories/acme/connection_factory"/>
+ <!-- You can specify the default Client ID to use for connections created using this factory -->
+ <client-id>MyClientID</client-id>
+ <!-- The batch size in bytes to use when using the DUPS_OK_ACKNOWLEDGE acknowledgement mode -->
+ <dups-ok-batch-size>1048576</dups-ok-batch-size>-size>
+ <!-- The batch size in bytes to use when using transactional sessions -->
+ <transaction-batch-size>1048576</transaction-batch-size>-size>
+ <!-- This is the send window size in bytes -->
+ <producer-window-size>1048576</producer-window-size>
+ <!-- This is the maximum producer send rate that will be applied when using rate based producer flow control -->
+ <producer-max-rate>100</producer-max-rate>
+ <!-- This is the window size in bytes to use when using consumer window based flow control -->
+ <consumer-window-size>1048576</consumer-window-size>
+ <!-- This is the maximum producer send rate that will be applied when using rate based consumer flow control -->
+ <consumer-max-rate>5000</consumer-max-rate>
+ <!--Whether or not we use a blocking call when acknowledging a message-->
+ <block-on-acknowledge>false</block-on-acknowledge>
+ <!--Whether we send non persistent messages synchronously-->
+ <send-np-messages-synchronously>true</send-np-messages-synchronously>
+ <!--Whether we send persistent messages synchronously-->
+ <send-p-messages-synchronously>true</send-p-messages-synchronously>
+ <!--If true, any connections will automatically set a unique group id (per producer) on every message sent-->
+ <auto-group-id>true</auto-group-id>
+ <!--if true then the server will pre ack any message before delivery to a consumer-->
+ <pre-commit-acks>false</pre-commit-acks>
+ </connection-factory>
+
+ <connection-factory name="TestInVMConnectionFactory">
+ <connector-ref connector-name="in-vm"/>
+ <entry name="/TestInVMConnectionFactory"/>
+ </connection-factory>
+
+ <connection-factory name="TestSSLConnectionFactory">
+ <connector-ref connector-name="netty-ssl"/>
+ <entry name="/TestSSLConnectionFactory"/>
+ </connection-factory>
+
+ <queue name="MyQueue">
+ <entry name="MyQueue"/>
+ </queue>
+ <queue name="DLQ">
+ <entry name="/queue/DLQ"/>
+ </queue>
+ <queue name="ExpiryQueue">
+ <entry name="/queue/ExpiryQueue"/>
+ </queue>
+ <topic name="testTopic">
+ <entry name="/topic/testTopic"/>
+ </topic>
+ <topic name="topic.A">
+ <entry name="/topic/topicA"/>
+ </topic>
+ <topic name="topic.B">
+ <entry name="/topic/topicB"/>
+ </topic>
+ <topic name="securedTopic">
+ <entry name="/topic/securedTopic"/>
+ </topic>
+ <topic name="testDurableTopic">
+ <entry name="/topic/testDurableTopic"/>
+ </topic>
+ <queue name="testQueue">
+ <entry name="/queue/testQueue"/>
+ </queue>
+ <queue name="testGroupQueue">
+ <entry name="/queue/testGroupQueue"/>
+ </queue>
+ <queue name="testPerfQueue">
+ <entry name="/queue/testPerfQueue"/>
+ </queue>
+ <queue name="A">
+ <entry name="/queue/A"/>
+ </queue>
+ <queue name="B">
+ <entry name="/queue/B"/>
+ </queue>
+ <queue name="C">
+ <entry name="/queue/C"/>
+ </queue>
+ <queue name="D">
+ <entry name="/queue/D"/>
+ </queue>
+ <queue name="ex">
+ <entry name="/queue/ex"/>
+ </queue>
+ <queue name="PrivateDLQ">
+ <entry name="/queue/PrivateDLQ"/>
+ </queue>
+ <queue name="PrivateExpiryQueue">
+ <entry name="/queue/PrivateExpiryQueue"/>
+ </queue>
+ <queue name="QueueWithOwnDLQAndExpiryQueue">
+ <entry name="/queue/QueueWithOwnDLQAndExpiryQueue"/>
+ </queue>
+ <topic name="TopicWithOwnDLQAndExpiryQueue">
+ <entry name="/topic/QueueWithOwnDLQAndExpiryQueue"/>
+ </topic>
+ <queue name="QueueWithOwnRedeliveryDelay">
+ <entry name="/queue/QueueWithOwnRedeliveryDelay"/>
+ </queue>
+ <topic name="TopicWithOwnRedeliveryDelay">
+ <entry name="/topic/TopicWithOwnRedeliveryDelay"/>
+ </topic>
+ <queue name="testDistributedQueue">
+ <entry name="/topic/testDistributedQueue"/>
+ </queue>
+ <topic name="testDistributedTopic">
+ <entry name="/topic/testDistributedTopic"/>
+ </topic>
+
+</deployment>
\ No newline at end of file
Deleted: trunk/src/config/jbm-jndi.xml
===================================================================
--- trunk/src/config/jbm-jndi.xml 2008-11-25 07:10:34 UTC (rev 5428)
+++ trunk/src/config/jbm-jndi.xml 2008-11-25 09:11:00 UTC (rev 5429)
@@ -1,154 +0,0 @@
-<deployment>
-
- <connection-factory name="testConnectionFactory">
- <connector-link connector-name="netty"/>
- <entry name="testConnectionFactory"/>
- </connection-factory>
-
- <connection-factory name="ConnectionFactory">
- <connector-link connector-name="netty"/>
- <entry name="ConnectionFactory"/>
- <entry name="/ConnectionFactory"/>
- <entry name="/XAConnectionFactory"/>
- <entry name="java:/ConnectionFactory"/>
- <entry name="java:/XAConnectionFactory"/>
- </connection-factory>
-
- <connection-factory name="ServerAckConnectionFactory">
- <connector-link connector-name="netty"/>
- <pre-commit-acks>true</pre-commit-acks>
- <entry name="ServerAckConnectionFactory"/>
- <entry name="/ServerAckConnectionFactory"/>
- <entry name="/ServerAckXAConnectionFactory"/>
- <entry name="java:/ServerAckConnectionFactory"/>
- <entry name="java:/ServerAckXAConnectionFactory"/>
- </connection-factory>
-
-
- <connection-factory name="ClusteredConnectionFactory">
- <connector-link connector-name="netty"/>
- <backup-connector connector-name="netty-backup"/>
- <entry name="/ClusteredConnectionFactory"/>
- <entry name="/ClusteredXAConnectionFactory"/>
- <entry name="java:/ClusteredConnectionFactory"/>
- <entry name="java:/ClusteredXAConnectionFactory"/>
- </connection-factory>
-
- <connection-factory name="MyExampleConnectionFactory">
- <connector-link connector-name="netty"/>
- <ping-period>5000</ping-period>
- <call-timeout>30000</call-timeout>
- <entry name="/MyExampleConnectionFactory"/>
- <entry name="/acme/MyExampleConnectionFactoryDupe"/>
- <entry name="java:/xyz/CF1"/>
- <entry name="java:/connectionfactories/acme/connection_factory"/>
- <!-- You can specify the default Client ID to use for connections created using this factory -->
- <client-id>MyClientID</client-id>
- <!-- The batch size in bytes to use when using the DUPS_OK_ACKNOWLEDGE acknowledgement mode -->
- <dups-ok-batch-size>1048576</dups-ok-batch-size>-size>
- <!-- The batch size in bytes to use when using transactional sessions -->
- <transaction-batch-size>1048576</transaction-batch-size>-size>
- <!-- This is the send window size in bytes -->
- <producer-window-size>1048576</producer-window-size>
- <!-- This is the maximum producer send rate that will be applied when using rate based producer flow control -->
- <producer-max-rate>100</producer-max-rate>
- <!-- This is the window size in bytes to use when using consumer window based flow control -->
- <consumer-window-size>1048576</consumer-window-size>
- <!-- This is the maximum producer send rate that will be applied when using rate based consumer flow control -->
- <consumer-max-rate>5000</consumer-max-rate>
- <!--Whether or not we use a blocking call when acknowledging a message-->
- <block-on-acknowledge>false</block-on-acknowledge>
- <!--Whether we send non persistent messages synchronously-->
- <send-np-messages-synchronously>true</send-np-messages-synchronously>
- <!--Whether we send persistent messages synchronously-->
- <send-p-messages-synchronously>true</send-p-messages-synchronously>
- <!--If true, any connections will automatically set a unique group id (per producer) on every message sent-->
- <auto-group-id>true</auto-group-id>
- <!--if true then the server will pre ack any message before delivery to a consumer-->
- <pre-commit-acks>false</pre-commit-acks>
- </connection-factory>
-
- <connection-factory name="TestInVMConnectionFactory">
- <connector-link connector-name="in-vm"/>
- <entry name="/TestInVMConnectionFactory"/>
- </connection-factory>
-
- <connection-factory name="TestSSLConnectionFactory">
- <connector-link connector-name="netty-ssl"/>
- <entry name="/TestSSLConnectionFactory"/>
- </connection-factory>
-
- <queue name="MyQueue">
- <entry name="MyQueue"/>
- </queue>
- <queue name="DLQ">
- <entry name="/queue/DLQ"/>
- </queue>
- <queue name="ExpiryQueue">
- <entry name="/queue/ExpiryQueue"/>
- </queue>
- <topic name="testTopic">
- <entry name="/topic/testTopic"/>
- </topic>
- <topic name="topic.A">
- <entry name="/topic/topicA"/>
- </topic>
- <topic name="topic.B">
- <entry name="/topic/topicB"/>
- </topic>
- <topic name="securedTopic">
- <entry name="/topic/securedTopic"/>
- </topic>
- <topic name="testDurableTopic">
- <entry name="/topic/testDurableTopic"/>
- </topic>
- <queue name="testQueue">
- <entry name="/queue/testQueue"/>
- </queue>
- <queue name="testGroupQueue">
- <entry name="/queue/testGroupQueue"/>
- </queue>
- <queue name="testPerfQueue">
- <entry name="/queue/testPerfQueue"/>
- </queue>
- <queue name="A">
- <entry name="/queue/A"/>
- </queue>
- <queue name="B">
- <entry name="/queue/B"/>
- </queue>
- <queue name="C">
- <entry name="/queue/C"/>
- </queue>
- <queue name="D">
- <entry name="/queue/D"/>
- </queue>
- <queue name="ex">
- <entry name="/queue/ex"/>
- </queue>
- <queue name="PrivateDLQ">
- <entry name="/queue/PrivateDLQ"/>
- </queue>
- <queue name="PrivateExpiryQueue">
- <entry name="/queue/PrivateExpiryQueue"/>
- </queue>
- <queue name="QueueWithOwnDLQAndExpiryQueue">
- <entry name="/queue/QueueWithOwnDLQAndExpiryQueue"/>
- </queue>
- <topic name="TopicWithOwnDLQAndExpiryQueue">
- <entry name="/topic/QueueWithOwnDLQAndExpiryQueue"/>
- </topic>
- <queue name="QueueWithOwnRedeliveryDelay">
- <entry name="/queue/QueueWithOwnRedeliveryDelay"/>
- </queue>
- <topic name="TopicWithOwnRedeliveryDelay">
- <entry name="/topic/TopicWithOwnRedeliveryDelay"/>
- </topic>
- <queue name="testDistributedQueue">
- <entry name="/topic/testDistributedQueue"/>
- </queue>
- <topic name="testDistributedTopic">
- <entry name="/topic/testDistributedTopic"/>
- </topic>
-
-</deployment>
\ No newline at end of file
Modified: trunk/src/main/org/jboss/messaging/core/config/impl/FileConfiguration.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/config/impl/FileConfiguration.java 2008-11-25 07:10:34 UTC (rev 5428)
+++ trunk/src/main/org/jboss/messaging/core/config/impl/FileConfiguration.java 2008-11-25 09:11:00 UTC (rev 5429)
@@ -68,8 +68,6 @@
public void start() throws Exception
{
- log.info("********* starting file configuration");
-
URL url = getClass().getClassLoader().getResource(configurationUrl);
Reader reader = new InputStreamReader(url.openStream());
String xml = XMLUtil.readerToString(reader);
@@ -138,8 +136,6 @@
NodeList connectorNodes = e.getElementsByTagName("connector");
- log.info("There are " + connectorNodes + " connectorNodes");
-
for (int i = 0; i < connectorNodes.getLength(); i++)
{
Node connectorNode = connectorNodes.item(i);
@@ -161,8 +157,6 @@
continue;
}
- log.info("loaded connector " + connectorConfig.getName());
-
connectorConfigs.put(connectorConfig.getName(), connectorConfig);
}
@@ -253,8 +247,6 @@
wildcardRoutingEnabled = getBoolean(e, "wild-card-routing-enabled", wildcardRoutingEnabled);
messageCounterEnabled = getBoolean(e, "message-counter-enabled", messageCounterEnabled);
-
- log.info("Done starting file configuration");
}
public String getConfigurationUrl()
@@ -417,7 +409,7 @@
{
broadcastPeriod = parseLong(child);
}
- else if (child.getNodeName().equals("connector-link"))
+ else if (child.getNodeName().equals("connector-ref"))
{
String connectorName = child.getAttributes().getNamedItem("connector-name").getNodeValue();
Modified: trunk/src/main/org/jboss/messaging/core/deployers/impl/XmlDeployer.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/deployers/impl/XmlDeployer.java 2008-11-25 07:10:34 UTC (rev 5428)
+++ trunk/src/main/org/jboss/messaging/core/deployers/impl/XmlDeployer.java 2008-11-25 09:11:00 UTC (rev 5429)
@@ -207,8 +207,6 @@
return;
}
- log.info("******** starting xml deployer server");
-
deploymentManager.registerDeployer(this);
started = true;
Modified: trunk/src/main/org/jboss/messaging/core/server/cluster/impl/BroadcastGroupImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/cluster/impl/BroadcastGroupImpl.java 2008-11-25 07:10:34 UTC (rev 5428)
+++ trunk/src/main/org/jboss/messaging/core/server/cluster/impl/BroadcastGroupImpl.java 2008-11-25 09:11:00 UTC (rev 5429)
@@ -151,8 +151,6 @@
DatagramPacket packet = new DatagramPacket(data, data.length, groupAddress, groupPort);
- // log.info("broadcasting packet");
-
socket.send(packet);
}
Modified: trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java 2008-11-25 07:10:34 UTC (rev 5428)
+++ trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java 2008-11-25 09:11:00 UTC (rev 5429)
@@ -155,9 +155,7 @@
{
return;
}
-
- log.info("******** starting messaging server");
-
+
/*
* The following components are pluggable on the messaging server: Configuration, StorageManager, RemotingService,
* SecurityManager and ManagementRegistration They must already be injected by the time the messaging server
@@ -304,8 +302,6 @@
clusterManager.start();
}
- log.info("connectors " + this.configuration.getConnectorConfigurations().size());
-
log.info("Started messaging server");
started = true;
Modified: trunk/src/main/org/jboss/messaging/jms/server/impl/JMSServerDeployer.java
===================================================================
--- trunk/src/main/org/jboss/messaging/jms/server/impl/JMSServerDeployer.java 2008-11-25 07:10:34 UTC (rev 5428)
+++ trunk/src/main/org/jboss/messaging/jms/server/impl/JMSServerDeployer.java 2008-11-25 09:11:00 UTC (rev 5429)
@@ -69,7 +69,7 @@
private static final String PRE_ACKNOWLEDGE_ELEMENT = "pre-acknowledge";
- private static final String CONNECTOR_LINK_ELEMENT = "connector-link";
+ private static final String CONNECTOR_LINK_ELEMENT = "connector-ref";
private static final String BACKUP_CONNECTOR_ELEMENT = "backup-connector";
@@ -350,7 +350,7 @@
*/
public String getConfigFileName()
{
- return "jbm-jndi.xml";
+ return "jbm-jms.xml";
}
}
More information about the jboss-cvs-commits
mailing list