[jboss-svn-commits] JBL Code SVN: r8452 - in labs/jbossesb/trunk/product: core/listeners/src/org/jboss/soa/esb/listeners/config/mappers core/listeners/tests/src/org/jboss/soa/esb/listeners/config etc/schemas/xml
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Dec 20 12:50:21 EST 2006
Author: kurt.stam at jboss.com
Date: 2006-12-20 12:50:18 -0500 (Wed, 20 Dec 2006)
New Revision: 8452
Modified:
labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/config/mappers/JmsListenerMapper.java
labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/config/mappers/MapperUtil.java
labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/config/jbossesb_config_01.xml
labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/config/jbossesb_config_01_esbaware.xml
labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/config/jbossesb_config_01_gateways.xml
labs/jbossesb/trunk/product/etc/schemas/xml/jbossesb-1.0.xsd
Log:
Moving the maxThread attribute from jms-listener to listener
Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/config/mappers/JmsListenerMapper.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/config/mappers/JmsListenerMapper.java 2006-12-20 17:35:47 UTC (rev 8451)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/config/mappers/JmsListenerMapper.java 2006-12-20 17:50:18 UTC (rev 8452)
@@ -76,9 +76,7 @@
// Map the standard listener attributes - common across all listener types...
MapperUtil.mapDefaultAttributes(listener, listenerNode, model);
// Map the <property> elements targeted at the listener - from the listener itself.
- MapperUtil.mapProperties(listener.getPropertyArray(), listenerNode);
- // Map maxThreads - appears to be a JMS only attrib...
- listenerNode.setAttribute(ListenerTagNames.MAX_THREADS_TAG, Integer.toString(listener.getMaxThreads()));
+ MapperUtil.mapProperties(listener.getPropertyArray(), listenerNode);
if(model.getService(listener).getIsGateway()) {
listenerNode.setAttribute("gatewayClass", JmsGatewayListener.class.getName());
Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/config/mappers/MapperUtil.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/config/mappers/MapperUtil.java 2006-12-20 17:35:47 UTC (rev 8451)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/config/mappers/MapperUtil.java 2006-12-20 17:50:18 UTC (rev 8452)
@@ -51,6 +51,8 @@
protected static void mapDefaultAttributes(Listener listener, Element target, XMLBeansModel model) {
Service service = model.getService(listener);
+ // Map maxThreads - appears to be a JMS only attrib...
+ target.setAttribute(ListenerTagNames.MAX_THREADS_TAG, String.valueOf(listener.getMaxThreads()));
target.setAttribute(ListenerTagNames.SERVICE_CATEGORY_NAME_TAG, service.getCategory());
target.setAttribute(ListenerTagNames.SERVICE_NAME_TAG, service.getName());
target.setAttribute(ListenerTagNames.SERVICE_DESCRIPTION_TAG, service.getDescription());
Modified: labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/config/jbossesb_config_01.xml
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/config/jbossesb_config_01.xml 2006-12-20 17:35:47 UTC (rev 8451)
+++ labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/config/jbossesb_config_01.xml 2006-12-20 17:50:18 UTC (rev 8452)
@@ -43,7 +43,8 @@
<jms-message-filter dest-type="TOPIC" dest-name="queue/B" selector="service='Reconciliation'" />
</jms-listener>
<listener name="Bank-Listener-Generic"
- busidref="my-generic-bus">
+ busidref="my-generic-bus"
+ maxThreads="2">
<property name="my-generic-listener" value="my-generic-listener#someattribvalue" />
</listener>
</listeners>
Modified: labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/config/jbossesb_config_01_esbaware.xml
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/config/jbossesb_config_01_esbaware.xml 2006-12-20 17:35:47 UTC (rev 8451)
+++ labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/config/jbossesb_config_01_esbaware.xml 2006-12-20 17:50:18 UTC (rev 8452)
@@ -17,7 +17,7 @@
Some CDATA data...
</action>
</Bank-Listener>
-<Bank-Listener-Generic listenerClass="org.jboss.soa.esb.listeners.message.MessageAwareListener" my-generic-listener="my-generic-listener#someattribvalue" service-category="Bank" service-description="Bank Reconciliation Service" service-name="Reconciliation">
+<Bank-Listener-Generic listenerClass="org.jboss.soa.esb.listeners.message.MessageAwareListener" maxThreads="2" my-generic-listener="my-generic-listener#someattribvalue" service-category="Bank" service-description="Bank Reconciliation Service" service-name="Reconciliation">
<EPR epr-description="Bank-Listener-Generic" my-generic-bus="my-generic-bus#someattribvalue" my-generic-provider="my-generic-provider#someattribvalue"/>
<action action="TestDefaultRouteAction" class="org.jboss.soa.esb.actions.CbrProxyAction" process="route" propName="propValue">
This is some complex..
Modified: labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/config/jbossesb_config_01_gateways.xml
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/config/jbossesb_config_01_gateways.xml 2006-12-20 17:35:47 UTC (rev 8451)
+++ labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/config/jbossesb_config_01_gateways.xml 2006-12-20 17:50:18 UTC (rev 8452)
@@ -5,4 +5,4 @@
-->
<jbossesb-gateways parameterReloadSecs="180">
<Bank-JMS-Gateway connection-factory="com.xyz.provider.XYZConnectionFactory" destination-name="queue/A" destination-type="queue" gatewayClass="org.jboss.soa.esb.listeners.gateway.JmsGatewayListener" jndi-URL="xyz://server1:9876" jndi-context-factory="com.xyz.provider.NamingContextFactory" jndi-pkg-prefix="com.xyz" maxThreads="1" message-selector="service='Reconciliation'" service-category="Bank" service-description="Bank Reconciliation Service" service-name="Reconciliation" target-service-category="Bank" target-service-name="Reconciliation"/>
-</jbossesb-gateways>
\ No newline at end of file
+</jbossesb-gateways>
Modified: labs/jbossesb/trunk/product/etc/schemas/xml/jbossesb-1.0.xsd
===================================================================
--- labs/jbossesb/trunk/product/etc/schemas/xml/jbossesb-1.0.xsd 2006-12-20 17:35:47 UTC (rev 8451)
+++ labs/jbossesb/trunk/product/etc/schemas/xml/jbossesb-1.0.xsd 2006-12-20 17:50:18 UTC (rev 8452)
@@ -208,6 +208,9 @@
<xsd:annotation>
<xsd:documentation xml:lang="en">A reference to an existing bus, as defined in the 'buses' section of this jbossesb config.</xsd:documentation>
</xsd:annotation>
+ </xsd:attribute>
+ <xsd:attribute name="maxThreads" use="required" type="xsd:int">
+ <xsd:annotation><xsd:documentation xml:lang="en">The number of threads which will be started for this listener.</xsd:documentation></xsd:annotation>
</xsd:attribute>
</xsd:complexType>
<xsd:element name="listener" type="jesb:listener" />
@@ -280,9 +283,6 @@
<xsd:sequence>
<xsd:element ref="jesb:jms-message-filter" maxOccurs="1" minOccurs="0"/>
</xsd:sequence>
- <xsd:attribute name="maxThreads" use="required" type="xsd:int">
- <xsd:annotation><xsd:documentation xml:lang="en">The number of threads which will be started for this listener.</xsd:documentation></xsd:annotation>
- </xsd:attribute>
</xsd:extension>
</xsd:complexContent>
</xsd:complexType>
More information about the jboss-svn-commits
mailing list