[jboss-svn-commits] JBL Code SVN: r8416 - in labs/jbossesb/trunk/product: core/listeners/src/org/jboss/soa/esb/listeners/config 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
Tue Dec 19 14:13:49 EST 2006
Author: kurt.stam at jboss.com
Date: 2006-12-19 14:13:46 -0500 (Tue, 19 Dec 2006)
New Revision: 8416
Modified:
labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/config/Generator.java
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/src/org/jboss/soa/esb/listeners/config/mappers/UntypedListenerMapper.java
labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/config/GeneratorUnitTest.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:
updating based on experience whn creating the tb config.
Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/config/Generator.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/config/Generator.java 2006-12-19 18:06:29 UTC (rev 8415)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/config/Generator.java 2006-12-19 19:13:46 UTC (rev 8416)
@@ -243,7 +243,7 @@
for(Service service : services) {
for(Listener listener : service.getListeners().getListenerArray()) {
- if(listener.getIsGateway() == isGateway) {
+ if(service.getIsGateway() == isGateway) {
gateways.add(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-19 18:06:29 UTC (rev 8415)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/config/mappers/JmsListenerMapper.java 2006-12-19 19:13:46 UTC (rev 8416)
@@ -31,7 +31,6 @@
import org.jboss.soa.esb.listeners.config.JmsMessageFilterDocument.JmsMessageFilter;
import org.jboss.soa.esb.listeners.config.JmsProviderDocument.JmsProvider;
import org.jboss.soa.esb.listeners.gateway.JmsGatewayListener;
-import org.jboss.soa.esb.listeners.message.JmsQueueListener;
import org.w3c.dom.Element;
/**
@@ -51,7 +50,7 @@
* @throws ConfigurationException Invalid listener configuration.
*/
public static Element map(Element root, JmsListener listener, XMLBeansModel model) throws ConfigurationException {
- Element listenerNode = YADOMUtil.addElement(root, "jms-listener-config");
+ Element listenerNode = YADOMUtil.addElement(root, listener.getName());
JmsBus bus;
JmsProvider provider;
@@ -81,7 +80,7 @@
// Map maxThreads - appears to be a JMS only attrib...
listenerNode.setAttribute(ListenerTagNames.MAX_THREADS_TAG, Integer.toString(listener.getMaxThreads()));
- if(listener.getIsGateway()) {
+ if(model.getService(listener).getIsGateway()) {
listenerNode.setAttribute("gatewayClass", JmsGatewayListener.class.getName());
// Map EPR related attributes onto the listener - from the bus and provider and listener.
// Note: This will change - the Gateways will also support the EPR element...
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-19 18:06:29 UTC (rev 8415)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/config/mappers/MapperUtil.java 2006-12-19 19:13:46 UTC (rev 8416)
@@ -29,19 +29,12 @@
import org.jboss.soa.esb.listeners.config.Bus;
import org.jboss.soa.esb.listeners.config.Listener;
import org.jboss.soa.esb.listeners.config.Provider;
-import org.jboss.soa.esb.listeners.config.YADOMUtil;
import org.jboss.soa.esb.listeners.config.Generator.XMLBeansModel;
import org.jboss.soa.esb.listeners.config.PropertyDocument.Property;
import org.jboss.soa.esb.listeners.config.ServiceDocument.Service;
-import org.jboss.soa.esb.listeners.message.JmsQueueListener;
import org.jboss.soa.esb.listeners.message.MessageAwareListener;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
-import org.xml.sax.Attributes;
-import org.xml.sax.ContentHandler;
-import org.xml.sax.Locator;
-import org.xml.sax.SAXException;
-import org.xml.sax.ext.LexicalHandler;
/**
* Mapper utility methods.
@@ -58,7 +51,7 @@
protected static void mapDefaultAttributes(Listener listener, Element target, XMLBeansModel model) {
Service service = model.getService(listener);
- if(listener.getIsGateway()) {
+ if(service.getIsGateway()) {
target.setAttribute(ListenerTagNames.TARGET_SERVICE_CATEGORY_TAG, service.getCategory());
target.setAttribute(ListenerTagNames.TARGET_SERVICE_NAME_TAG, service.getName());
} else {
@@ -87,7 +80,7 @@
// Map the properties from the bus config...
mapProperties(bus.getPropertyArray(), target);
- if(!listener.getIsGateway()) {
+ if(!model.getService(listener).getIsGateway()) {
// And the EPR description.
target.setAttribute(ListenerTagNames.EPR_DESCRIPTION_TAG, listener.getName());
}
Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/config/mappers/UntypedListenerMapper.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/config/mappers/UntypedListenerMapper.java 2006-12-19 18:06:29 UTC (rev 8415)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/config/mappers/UntypedListenerMapper.java 2006-12-19 19:13:46 UTC (rev 8416)
@@ -58,7 +58,7 @@
// Map the <property> elements targeted at the listener - from the listener itself.
MapperUtil.mapProperties(listener.getPropertyArray(), listenerNode);
- if(listener.getIsGateway()) {
+ if(model.getService(listener).getIsGateway()) {
MapperUtil.mapEPRProperties(listener, listenerNode, model);
} else {
Element eprNode = YADOMUtil.addElement(listenerNode, ListenerTagNames.EPR_TAG);
Modified: labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/config/GeneratorUnitTest.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/config/GeneratorUnitTest.java 2006-12-19 18:06:29 UTC (rev 8415)
+++ labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/config/GeneratorUnitTest.java 2006-12-19 19:13:46 UTC (rev 8416)
@@ -37,8 +37,6 @@
import org.jboss.soa.esb.listeners.config.ServiceDocument.Service;
import org.jboss.soa.esb.testutils.FileUtil;
-import com.sun.java_cup.internal.internal_error;
-
/**
* Generator unit tests.
* @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
@@ -118,7 +116,7 @@
JmsListener gatewayListener = (JmsListener)gateways.get(0);
assertEquals("Bank-JMS-Gateway", gatewayListener.getName());
assertEquals("server1-jms", gatewayListener.getBusidref());
- assertTrue(gatewayListener.getIsGateway());
+ assertTrue(model.getService(gatewayListener).getIsGateway());
assertEquals(1, gatewayListener.getMaxThreads());
List<Listener> awareListeners = model.getESBAwareListeners();
@@ -126,7 +124,7 @@
JmsListener awareListener = (JmsListener)awareListeners.get(0);
assertEquals("Bank-Listener", awareListener.getName());
assertEquals("local-jms", awareListener.getBusidref());
- assertTrue(!awareListener.getIsGateway());
+ assertTrue(!model.getService(awareListener).getIsGateway());
assertEquals(2, awareListener.getMaxThreads());
JmsMessageFilter listenerDestination = awareListener.getJmsMessageFilter();
assertEquals("queue/B", listenerDestination.getDestName());
@@ -136,14 +134,14 @@
Listener untypedAwareListener = awareListeners.get(1);
assertEquals("Bank-Listener-Generic", untypedAwareListener.getName());
assertEquals("my-generic-bus", untypedAwareListener.getBusidref());
- assertTrue(!untypedAwareListener.getIsGateway());
+ assertTrue(!model.getService(untypedAwareListener).getIsGateway());
Service gatewayService = model.getService(gatewayListener);
Service awareService = model.getService(awareListener);
- assertEquals(gatewayService, awareService);
- assertEquals("Bank", gatewayService.getCategory());
- assertEquals("Reconciliation", gatewayService.getName());
- assertEquals("Bank Reconciliation Service", gatewayService.getDescription());
+ assertNotSame(gatewayService, awareService);
+ assertEquals("Bank", awareService.getCategory());
+ assertEquals("Reconciliation", awareService.getName());
+ assertEquals("Bank Reconciliation Service", awareService.getDescription());
}
private void test_generate_badargs(File outdir, String expectedMessage) throws ConfigurationException, IOException {
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-19 18:06:29 UTC (rev 8415)
+++ labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/config/jbossesb_config_01.xml 2006-12-19 19:13:46 UTC (rev 8416)
@@ -2,11 +2,11 @@
<jbossesb xmlns="http://anonsvn.labs.jboss.com/labs/jbossesb/trunk/product/etc/schemas/xml/jbossesb-1.0.xsd">
<providers>
- <jms-provider connection-factory="ConnectionFactory" jndi-URL="jnp://localhost:1099">
+ <jms-provider name="JBossMQ" connection-factory="ConnectionFactory" jndi-URL="jnp://localhost:1099">
<jms-bus busid="local-jms" />
</jms-provider>
- <jms-provider connection-factory="com.xyz.provider.XYZConnectionFactory"
+ <jms-provider name="JBossMessaging" connection-factory="com.xyz.provider.XYZConnectionFactory"
jndi-context-factory="com.xyz.provider.NamingContextFactory"
jndi-URL="xyz://server1:9876"
jndi-pkg-prefix="com.xyz">
@@ -15,7 +15,7 @@
</jms-bus>
</jms-provider>
- <provider>
+ <provider name="JBossAS">
<property name="my-generic-provider" value="my-generic-provider#someattribvalue" />
<bus busid="my-generic-bus">
@@ -25,23 +25,24 @@
</providers>
<services>
- <service category="Bank" name="Reconciliation" description="Bank Reconciliation Service">
+ <service category="Bank" name="Reconciliation" description="Bank Reconciliation Service" is-gateway="true">
<listeners>
<jms-listener name="Bank-JMS-Gateway"
- is-gateway="true"
busidref="server1-jms"
maxThreads="1"/>
-
+ </listeners>
+
+ </service>
+ <service category="Bank" name="Reconciliation" description="Bank Reconciliation Service" is-gateway="false">
+
+ <listeners>
<jms-listener name="Bank-Listener"
- is-gateway="false"
busidref="local-jms"
maxThreads="2">
<jms-message-filter dest-type="TOPIC" dest-name="queue/B" selector="service='Reconciliation'" />
</jms-listener>
-
<listener name="Bank-Listener-Generic"
- is-gateway="false"
busidref="my-generic-bus">
<property name="my-generic-listener" value="my-generic-listener#someattribvalue" />
</listener>
@@ -50,20 +51,20 @@
<actions>
<action name="TestDefaultRouteAction" process="route" class="org.jboss.soa.esb.actions.CbrProxyAction">
<property name="propName" value="propValue" />
- <property name="propName">
+ <property name="propName">
This is some complex..
<!-- property -->
value.
- <xxxx>
- boooo
- <yyyy/>
- </xxxx>
- <![CDATA[ Some CDATA data...]]>
+ <xxxx>
+ boooo
+ <yyyy/>
+ </xxxx>
+ <![CDATA[ Some CDATA data...]]>
</property>
</action>
</actions>
- </service>
+ </service>
</services>
</jbossesb>
\ No newline at end of file
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-19 18:06:29 UTC (rev 8415)
+++ labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/config/jbossesb_config_01_esbaware.xml 2006-12-19 19:13:46 UTC (rev 8416)
@@ -1,33 +1,33 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- NOTE: DO NOT MODIFY
- This file was auto-generated.
--->
-<jbossesb-listeners parameterReloadSecs="180">
-<jms-listener-config listenerClass="org.jboss.soa.esb.listeners.message.MessageAwareListener" maxThreads="2" service-category="Bank" service-description="Bank Reconciliation Service" service-name="Reconciliation">
-<EPR connection-factory="ConnectionFactory" destination-name="queue/B" destination-type="topic" epr-description="Bank-Listener" jndi-URL="jnp://localhost:1099" message-selector="service='Reconciliation'" protocol="jms"/>
-<action action="TestDefaultRouteAction" class="org.jboss.soa.esb.actions.CbrProxyAction" process="route" propName="propValue">
- This is some complex..
- <!-- property -->
- value.
- <xxxx>
- boooo
- <yyyy/>
- </xxxx>
- Some CDATA data...
- </action>
-</jms-listener-config>
-<listener-config 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">
-<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..
- <!-- property -->
- value.
- <xxxx>
- boooo
- <yyyy/>
- </xxxx>
- Some CDATA data...
- </action>
-</listener-config>
-</jbossesb-listeners>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ NOTE: DO NOT MODIFY
+ This file was auto-generated.
+-->
+<jbossesb-listeners parameterReloadSecs="180">
+<Bank-Listener listenerClass="org.jboss.soa.esb.listeners.message.MessageAwareListener" maxThreads="2" service-category="Bank" service-description="Bank Reconciliation Service" service-name="Reconciliation">
+<EPR connection-factory="ConnectionFactory" destination-name="queue/B" destination-type="topic" epr-description="Bank-Listener" jndi-URL="jnp://localhost:1099" message-selector="service='Reconciliation'" protocol="jms"/>
+<action action="TestDefaultRouteAction" class="org.jboss.soa.esb.actions.CbrProxyAction" process="route" propName="propValue">
+ This is some complex..
+ <!-- property -->
+ value.
+ <xxxx>
+ boooo
+ <yyyy/>
+ </xxxx>
+ Some CDATA data...
+ </action>
+</Bank-Listener>
+<listener-config 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">
+<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..
+ <!-- property -->
+ value.
+ <xxxx>
+ boooo
+ <yyyy/>
+ </xxxx>
+ Some CDATA data...
+ </action>
+</listener-config>
+</jbossesb-listeners>
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-19 18:06:29 UTC (rev 8415)
+++ labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/config/jbossesb_config_01_gateways.xml 2006-12-19 19:13:46 UTC (rev 8416)
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- NOTE: DO NOT MODIFY
- This file was auto-generated.
--->
-<jbossesb-gateways parameterReloadSecs="180">
-<jms-listener-config 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'" target-service-category="Bank" target-service-name="Reconciliation"/>
-</jbossesb-gateways>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ NOTE: DO NOT MODIFY
+ This file was auto-generated.
+-->
+<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'" target-service-category="Bank" target-service-name="Reconciliation"/>
+</jbossesb-gateways>
\ No newline at end of file
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-19 18:06:29 UTC (rev 8415)
+++ labs/jbossesb/trunk/product/etc/schemas/xml/jbossesb-1.0.xsd 2006-12-19 19:13:46 UTC (rev 8416)
@@ -58,7 +58,8 @@
<xsd:sequence>
<xsd:element ref="jesb:property" minOccurs="0" maxOccurs="unbounded"/>
<xsd:element ref="jesb:bus" maxOccurs="unbounded" minOccurs="1"/>
- </xsd:sequence>
+ </xsd:sequence>
+ <xsd:attribute name="name" use="required" type="xsd:string"/>
</xsd:complexType>
<xsd:element name="provider" type="jesb:provider"/>
@@ -98,7 +99,7 @@
<xsd:complexType>
<xsd:sequence>
<xsd:element ref="jesb:listeners" minOccurs="1" maxOccurs="1"/>
- <xsd:element ref="jesb:actions" minOccurs="1" maxOccurs="1"/>
+ <xsd:element ref="jesb:actions" minOccurs="0" maxOccurs="1"/>
</xsd:sequence>
<xsd:attribute name="category" use="required" type="xsd:string">
<xsd:annotation>
@@ -115,6 +116,12 @@
<xsd:documentation xml:lang="en">The service description which stored with this service in the registry, so that the purpose of this service can be understood by a human.</xsd:documentation>
</xsd:annotation>
</xsd:attribute>
+ <xsd:attribute name="is-gateway" use="required" type="xsd:boolean">
+ <xsd:annotation>
+ <xsd:documentation xml:lang="en">true if the listener is a gateway. A gateway is an ESB-Unware listener, while a
+ listener is ESB-aware and as such expects jbossesb formatted messages.</xsd:documentation>
+ </xsd:annotation>
+ </xsd:attribute>
</xsd:complexType>
</xsd:element>
@@ -187,12 +194,6 @@
<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="is-gateway" use="required" type="xsd:boolean">
- <xsd:annotation>
- <xsd:documentation xml:lang="en">true if the listener is a gateway. A gateway is an ESB-Unware listener, while a
- listener is ESB-aware and as such expects jbossesb formatted messages.</xsd:documentation>
- </xsd:annotation>
- </xsd:attribute>
</xsd:complexType>
<xsd:element name="listener" type="jesb:listener" />
More information about the jboss-svn-commits
mailing list