[jboss-svn-commits] JBL Code SVN: r9031 - in labs/jbossesb/trunk: product/core/listeners/src/org/jboss/soa/esb/listeners/config/mappers and 19 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Jan 26 01:17:01 EST 2007
Author: kurt.stam at jboss.com
Date: 2007-01-26 01:17:00 -0500 (Fri, 26 Jan 2007)
New Revision: 9031
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/FsListenerMapper.java
labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/config/mappers/FtpListenerMapper.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/SqlListenerMapper.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/core/listeners/tests/src/org/jboss/soa/esb/listeners/config/jbossesb_config_02.xml
labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/config/jbossesb_config_03.xml
labs/jbossesb/trunk/product/etc/schemas/xml/jbossesb-1.0.xsd
labs/jbossesb/trunk/product/samples/quickstarts/fun_cbr/jbossesb.xml
labs/jbossesb/trunk/product/samples/quickstarts/helloworld/jbossesb.xml
labs/jbossesb/trunk/product/samples/quickstarts/helloworld_action/jbossesb.xml
labs/jbossesb/trunk/product/samples/quickstarts/helloworld_db_registration/jbossesb.xml
labs/jbossesb/trunk/product/samples/quickstarts/helloworld_embedded_reg/jbossesb.xml
labs/jbossesb/trunk/product/samples/quickstarts/helloworld_file_action/jbossesb.xml
labs/jbossesb/trunk/product/samples/quickstarts/helloworld_ftp_action/jbossesb.xml
labs/jbossesb/trunk/product/samples/quickstarts/helloworld_sql_action/jbossesb.xml
labs/jbossesb/trunk/product/samples/quickstarts/more_action/jbossesb.xml
labs/jbossesb/trunk/product/samples/quickstarts/quickstarts.properties
labs/jbossesb/trunk/product/samples/quickstarts/simple_cbr/jbossesb.xml
labs/jbossesb/trunk/product/samples/quickstarts/static_router/jbossesb.xml
labs/jbossesb/trunk/product/samples/quickstarts/transform_XML2POJO/jbossesb.xml
labs/jbossesb/trunk/product/samples/quickstarts/transform_XML2XML_date_manipulation/jbossesb.xml
labs/jbossesb/trunk/product/samples/quickstarts/transform_XML2XML_simple/jbossesb.xml
labs/jbossesb/trunk/product/samples/trailblazer/esb/conf/jbossesb.xml
labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/actions/ContentBasedRouterTest.xml
Log:
Moving gateways back next to listeners in the service. Simplifying the configuration.
Updating all the configuration files to reflect this change.
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 2007-01-26 04:30:23 UTC (rev 9030)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/config/Generator.java 2007-01-26 06:17:00 UTC (rev 9031)
@@ -243,7 +243,7 @@
for(Service service : services) {
for(Listener listener : service.getListeners().getListenerList()) {
- if(service.getIsGateway() == isGateway) {
+ if(listener.getIsGateway() == isGateway) {
gateways.add(listener);
}
}
Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/config/mappers/FsListenerMapper.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/config/mappers/FsListenerMapper.java 2007-01-26 04:30:23 UTC (rev 9030)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/config/mappers/FsListenerMapper.java 2007-01-26 06:17:00 UTC (rev 9031)
@@ -31,7 +31,6 @@
import org.jboss.soa.esb.listeners.config.FsMessageFilterDocument.FsMessageFilter;
import org.jboss.soa.esb.listeners.config.FsProviderDocument.FsProvider;
import org.jboss.soa.esb.listeners.config.Generator.XMLBeansModel;
-import org.jboss.soa.esb.listeners.config.ServiceDocument.Service;
import org.jboss.soa.esb.listeners.gateway.FileGatewayListener;
import org.w3c.dom.Element;
@@ -79,11 +78,8 @@
MapperUtil.mapDefaultAttributes(listener, listenerNode, model);
// Map the <property> elements targeted at the listener - from the listener itself.
MapperUtil.mapProperties(listener.getPropertyList(), listenerNode);
- Service service = model.getService(listener);
- if(model.getService(listener).getIsGateway()) {
- if (service.getServiceClass()==null) {
- listenerNode.setAttribute("gatewayClass", FileGatewayListener.class.getName());
- }
+ if(listener.getIsGateway()) {
+ listenerNode.setAttribute("gatewayClass", FileGatewayListener.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...
mapFsEprProperties(listenerNode, provider, messageFilter);
Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/config/mappers/FtpListenerMapper.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/config/mappers/FtpListenerMapper.java 2007-01-26 04:30:23 UTC (rev 9030)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/config/mappers/FtpListenerMapper.java 2007-01-26 06:17:00 UTC (rev 9031)
@@ -30,7 +30,6 @@
import org.jboss.soa.esb.listeners.config.FtpMessageFilterDocument.FtpMessageFilter;
import org.jboss.soa.esb.listeners.config.FtpProviderDocument.FtpProvider;
import org.jboss.soa.esb.listeners.config.Generator.XMLBeansModel;
-import org.jboss.soa.esb.listeners.config.ServiceDocument.Service;
import org.jboss.soa.esb.listeners.gateway.RemoteGatewayListener;
import org.w3c.dom.Element;
@@ -78,11 +77,8 @@
MapperUtil.mapDefaultAttributes(listener, listenerNode, model);
// Map the <property> elements targeted at the listener - from the listener itself.
MapperUtil.mapProperties(listener.getPropertyList(), listenerNode);
- Service service = model.getService(listener);
- if(model.getService(listener).getIsGateway()) {
- if (service.getServiceClass()==null) {
- listenerNode.setAttribute("gatewayClass", RemoteGatewayListener.class.getName());
- }
+ if(listener.getIsGateway()) {
+ listenerNode.setAttribute("gatewayClass", RemoteGatewayListener.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...
mapFtpEprProperties(listenerNode, provider, messageFilter);
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 2007-01-26 04:30:23 UTC (rev 9030)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/config/mappers/JmsListenerMapper.java 2007-01-26 06:17:00 UTC (rev 9031)
@@ -30,7 +30,6 @@
import org.jboss.soa.esb.listeners.config.JmsListenerDocument.JmsListener;
import org.jboss.soa.esb.listeners.config.JmsMessageFilterDocument.JmsMessageFilter;
import org.jboss.soa.esb.listeners.config.JmsProviderDocument.JmsProvider;
-import org.jboss.soa.esb.listeners.config.ServiceDocument.Service;
import org.jboss.soa.esb.listeners.gateway.JmsGatewayListener;
import org.w3c.dom.Element;
@@ -78,11 +77,8 @@
MapperUtil.mapDefaultAttributes(listener, listenerNode, model);
// Map the <property> elements targeted at the listener - from the listener itself.
MapperUtil.mapProperties(listener.getPropertyList(), listenerNode);
- Service service = model.getService(listener);
- if(model.getService(listener).getIsGateway()) {
- if (service.getServiceClass()==null) {
- listenerNode.setAttribute("gatewayClass", JmsGatewayListener.class.getName());
- }
+ if(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...
mapJmsEprProperties(listenerNode, provider, messageFilter);
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 2007-01-26 04:30:23 UTC (rev 9030)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/config/mappers/MapperUtil.java 2007-01-26 06:17:00 UTC (rev 9031)
@@ -55,16 +55,13 @@
// 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());
- if(service.getIsGateway()) {
- target.setAttribute(ListenerTagNames.GATEWAY_CLASS_TAG, service.getServiceClass());
- target.setAttribute(ListenerTagNames.TARGET_SERVICE_CATEGORY_TAG, service.getTargetServiceCategory());
- target.setAttribute(ListenerTagNames.TARGET_SERVICE_NAME_TAG, service.getTargetServiceName());
- } else if (service.getServiceClass()!=null) {
- target.setAttribute(ListenerTagNames.LISTENER_CLASS_TAG, service.getServiceClass());
+ if(listener.getIsGateway()) {
+ target.setAttribute(ListenerTagNames.TARGET_SERVICE_CATEGORY_TAG, service.getCategory());
+ target.setAttribute(ListenerTagNames.TARGET_SERVICE_NAME_TAG, service.getName());
} else {
+ target.setAttribute(ListenerTagNames.SERVICE_CATEGORY_NAME_TAG, service.getCategory());
+ target.setAttribute(ListenerTagNames.SERVICE_NAME_TAG, service.getName());
target.setAttribute(ListenerTagNames.LISTENER_CLASS_TAG, MessageAwareListener.class.getName());
}
}
Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/config/mappers/SqlListenerMapper.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/config/mappers/SqlListenerMapper.java 2007-01-26 04:30:23 UTC (rev 9030)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/config/mappers/SqlListenerMapper.java 2007-01-26 06:17:00 UTC (rev 9031)
@@ -25,7 +25,6 @@
import org.jboss.soa.esb.dom.YADOMUtil;
import org.jboss.soa.esb.listeners.ListenerTagNames;
import org.jboss.soa.esb.listeners.config.Generator.XMLBeansModel;
-import org.jboss.soa.esb.listeners.config.ServiceDocument.Service;
import org.jboss.soa.esb.listeners.config.SqlBusDocument.SqlBus;
import org.jboss.soa.esb.listeners.config.SqlListenerDocument.SqlListener;
import org.jboss.soa.esb.listeners.config.SqlMessageFilterDocument.SqlMessageFilter;
@@ -77,11 +76,8 @@
MapperUtil.mapDefaultAttributes(listener, listenerNode, model);
// Map the <property> elements targeted at the listener - from the listener itself.
MapperUtil.mapProperties(listener.getPropertyList(), listenerNode);
- Service service = model.getService(listener);
- if(model.getService(listener).getIsGateway()) {
- if (service.getServiceClass()==null) {
- listenerNode.setAttribute("gatewayClass", SqlTableGatewayListener.class.getName());
- }
+ if(listener.getIsGateway()) {
+ listenerNode.setAttribute("gatewayClass", SqlTableGatewayListener.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...
mapSqlEprProperties(listenerNode, provider, messageFilter);
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 2007-01-26 04:30:23 UTC (rev 9030)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/config/mappers/UntypedListenerMapper.java 2007-01-26 06:17:00 UTC (rev 9031)
@@ -65,7 +65,7 @@
// Map the <property> elements targeted at the listener - from the listener itself.
MapperUtil.mapProperties(listener.getPropertyList(), listenerNode);
- if(model.getService(listener).getIsGateway()) {
+ if(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 2007-01-26 04:30:23 UTC (rev 9030)
+++ labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/config/GeneratorUnitTest.java 2007-01-26 06:17:00 UTC (rev 9031)
@@ -81,7 +81,8 @@
gatewayConfig = new File(outdir, Generator.ESB_CONFIG_GATEWAY_XML_FILE);
assertTrue(gatewayConfig.exists());
actualGatewayConfig = FileUtil.readTextFile(gatewayConfig);
- System.out.println("[" + actualGatewayConfig + "]");
+ System.out.println("actual [" + removeEOL(actualGatewayConfig) + "]");
+ System.out.println("expected[" + expectedGatewayConfig + "]");
assertEquals(expectedGatewayConfig, removeEOL(actualGatewayConfig));
awareConfig = new File(outdir, Generator.ESB_CONFIG_XML_FILE);
@@ -142,7 +143,7 @@
JmsListener gatewayListener = (JmsListener)gateways.get(0);
assertEquals("Bank-JMS-Gateway", gatewayListener.getName());
assertEquals("server1-jms", gatewayListener.getBusidref());
- assertTrue(model.getService(gatewayListener).getIsGateway());
+ assertTrue(gatewayListener.getIsGateway());
assertEquals(1, gatewayListener.getMaxThreads());
List<Listener> awareListeners = model.getESBAwareListeners();
@@ -150,7 +151,7 @@
JmsListener awareListener = (JmsListener)awareListeners.get(0);
assertEquals("Bank-Listener", awareListener.getName());
assertEquals("local-jms", awareListener.getBusidref());
- assertTrue(!model.getService(awareListener).getIsGateway());
+ assertTrue(!awareListener.getIsGateway());
assertEquals(2, awareListener.getMaxThreads());
JmsMessageFilter listenerDestination = awareListener.getJmsMessageFilter();
assertEquals("queue/B", listenerDestination.getDestName());
@@ -160,11 +161,11 @@
Listener untypedAwareListener = awareListeners.get(1);
assertEquals("Bank-Listener-Generic", untypedAwareListener.getName());
assertEquals("my-generic-bus", untypedAwareListener.getBusidref());
- assertTrue(!model.getService(untypedAwareListener).getIsGateway());
+ assertTrue(!untypedAwareListener.getIsGateway());
Service gatewayService = model.getService(gatewayListener);
Service awareService = model.getService(awareListener);
- assertNotSame(gatewayService, awareService);
+ assertSame(gatewayService, awareService);
assertEquals("Bank", awareService.getCategory());
assertEquals("Reconciliation", awareService.getName());
assertEquals("Bank Reconciliation Service", awareService.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 2007-01-26 04:30:23 UTC (rev 9030)
+++ labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/config/jbossesb_config_01.xml 2007-01-26 06:17:00 UTC (rev 9031)
@@ -37,18 +37,13 @@
</providers>
<services>
- <service category="Bank" name="Reconciliation" description="Bank Reconciliation Service" is-gateway="true" target-service-category="Bank" target-service-name="Reconciliation">
+ <service category="Bank" name="Reconciliation" description="Bank Reconciliation Service">
- <listeners>
+ <listeners>
<jms-listener name="Bank-JMS-Gateway"
- busidref="server1-jms"
- maxThreads="1"/>
- </listeners>
-
- </service>
- <service category="Bank" name="Reconciliation" description="Bank Reconciliation Service" is-gateway="false">
-
- <listeners>
+ busidref="server1-jms"
+ maxThreads="1"
+ is-gateway="true"/>
<jms-listener name="Bank-Listener"
busidref="local-jms"
maxThreads="2">
@@ -62,7 +57,7 @@
</listeners>
<actions>
- <action name="TestDefaultRouteAction" process="route" class="org.jboss.soa.esb.actions.CbrProxyAction">
+ <action name="TestDefaultRouteAction" class="org.jboss.soa.esb.actions.ContentBasedRouter">
<property name="propName" value="propValue" />
<property name="propName">
This is some complex..
@@ -78,7 +73,7 @@
</actions>
</service>
- <service category="Test2" name="FTPTest" description="FTP server Test" is-gateway="false">
+ <service category="Test2" name="FTPTest" description="FTP server Test">
<listeners>
<ftp-listener name="test-ftp-listener"
@@ -86,11 +81,11 @@
maxThreads="1"/>
</listeners>
<actions>
- <action name="TestFtpRouteAction" process="route" class="org.jboss.soa.esb.actions.CbrProxyAction"/>
+ <action name="TestFtpRouteAction" class="org.jboss.soa.esb.actions.ContentBasedRouter"/>
</actions>
</service>
- <service category="Test3" name="SQLTest" description="SQL server Test" is-gateway="false">
+ <service category="Test3" name="SQLTest" description="SQL server Test">
<listeners>
<sql-listener name="test-sql-listener"
@@ -98,7 +93,7 @@
maxThreads="1"/>
</listeners>
<actions>
- <action name="TestSqlRouteAction" process="route" class="org.jboss.soa.esb.actions.CbrProxyAction"/>
+ <action name="TestSqlRouteAction" class="org.jboss.soa.esb.actions.ContentBasedRouter"/>
</actions>
</service>
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 2007-01-26 04:30:23 UTC (rev 9030)
+++ labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/config/jbossesb_config_01_esbaware.xml 2007-01-26 06:17:00 UTC (rev 9031)
@@ -1,41 +1 @@
-<?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" 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>
-<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 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>
-</Bank-Listener-Generic>
-<test-ftp-listener listenerClass="org.jboss.soa.esb.listeners.message.MessageAwareListener" maxThreads="1" pollLatencySeconds="10" service-category="Test2" service-description="FTP server Test" service-name="FTPTest">
-<EPR URL="ftp://joe:secret@localhost:/Temp" errorDelete="true" inputSuffix=".txt" passive="false" postDelete="true" workSuffix=".esbInProcess"/>
-<action action="TestFtpRouteAction" class="org.jboss.soa.esb.actions.CbrProxyAction" process="route"/>
-</test-ftp-listener>
-<test-sql-listener listenerClass="org.jboss.soa.esb.listeners.message.MessageAwareListener" maxThreads="1" pollLatencySeconds="10" service-category="Test3" service-description="SQL server Test" service-name="SQLTest">
-<EPR URL="jdbc:postgresql://myhost:5432/testDB" driver="org.postgresql.Driver" errorDelete="true" insert_timestamp_column="insert_timestamp" message_column="message" message_id_column="message_id" password="secret" postDelete="true" status_column="status" tablename="testtable" username="joe"/>
-<action action="TestSqlRouteAction" class="org.jboss.soa.esb.actions.CbrProxyAction" process="route"/>
-</test-sql-listener>
-</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" jndi-URL="jnp://localhost:1099" message-selector="service='Reconciliation'" protocol="jms"/><action action="TestDefaultRouteAction" class="org.jboss.soa.esb.actions.ContentBasedRouter" propName="propValue"> This is some complex.. <!-- property --> value. <xxxx> boooo <yyyy/> </xxxx> Some CDATA data... </action></Bank-Listener><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 my-generic-bus="my-generic-bus#someattribvalue" my-generic-provider="my-generic-provider#someattribvalue"/><action action="TestDefaultRouteAction" class="org.jboss.soa.esb.actions.ContentBasedRouter" propName="propValue"> This is some complex.. <!-- property --> value. <xxxx> boooo <yyyy/> </xxxx> Some CDATA data... </action></Bank-Listener-Generic><test-ftp-listener listenerClass="org.jboss.soa.esb.listeners.message.MessageAwareListener" maxThreads="1" pollLatencySeconds="10" service-category="Test2" service-description="FTP server Test" service-name="FTPTest"><EPR URL="ftp://joe:secret@localhost:/Temp" errorDelete="true" inputSuffix=".txt" passive="false" postDelete="true" workSuffix=".esbInProcess"/><action action="TestFtpRouteAction" class="org.jboss.soa.esb.actions.ContentBasedRouter"/></test-ftp-listener><test-sql-!
listener listenerClass="org.jboss.soa.esb.listeners.message.MessageAwa
reListener" maxThreads="1" pollLatencySeconds="10" service-category="Test3" service-description="SQL server Test" service-name="SQLTest"><EPR URL="jdbc:postgresql://myhost:5432/testDB" driver="org.postgresql.Driver" errorDelete="true" insert_timestamp_column="insert_timestamp" message_column="message" message_id_column="message_id" password="secret" postDelete="true" status_column="status" tablename="testtable" username="joe"/><action action="TestSqlRouteAction" class="org.jboss.soa.esb.actions.ContentBasedRouter"/></test-sql-listener></jbossesb-listeners>
\ No newline at end of file
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 2007-01-26 04:30:23 UTC (rev 9030)
+++ labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/config/jbossesb_config_01_gateways.xml 2007-01-26 06:17:00 UTC (rev 9031)
@@ -1,8 +1 @@
-<?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'" service-category="Bank" service-description="Bank Reconciliation Service" service-name="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'" service-description="Bank Reconciliation Service" target-service-category="Bank" target-service-name="Reconciliation"/></jbossesb-gateways>
\ No newline at end of file
Modified: labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/config/jbossesb_config_02.xml
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/config/jbossesb_config_02.xml 2007-01-26 04:30:23 UTC (rev 9030)
+++ labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/config/jbossesb_config_02.xml 2007-01-26 06:17:00 UTC (rev 9031)
@@ -68,20 +68,15 @@
</providers>
<services>
- <service category="Bank" name="Reconciliation" description="Bank Reconciliation Service" is-gateway="true" target-service-category="Bank" target-service-name="Reconciliation">
+ <service category="Bank" name="Reconciliation" description="Bank Reconciliation Service">
- <listeners>
+ <listeners>
<listener name="Bank-JMS-Gateway"
- busidref="server1-jms"
- maxThreads="1">
+ busidref="server1-jms"
+ maxThreads="1"
+ is-gateway="true">
<property name="gatewayClass" value="org.jboss.soa.esb.listeners.gateway.JmsGatewayListener" />
- </listener>
- </listeners>
-
- </service>
- <service category="Bank" name="Reconciliation" description="Bank Reconciliation Service" is-gateway="false">
-
- <listeners>
+ </listener>
<listener name="Bank-Listener"
busidref="local-jms"
maxThreads="2">
@@ -94,7 +89,7 @@
</listeners>
<actions>
- <action name="TestDefaultRouteAction" process="route" class="org.jboss.soa.esb.actions.CbrProxyAction">
+ <action name="TestDefaultRouteAction" class="org.jboss.soa.esb.actions.ContentBasedRouter">
<property name="propName" value="propValue" />
<property name="propName">
This is some complex..
@@ -110,7 +105,7 @@
</actions>
</service>
- <service category="Test2" name="FTPTest" description="FTP server Test" is-gateway="false">
+ <service category="Test2" name="FTPTest" description="FTP server Test">
<listeners>
<listener name="test-ftp-listener"
@@ -120,7 +115,7 @@
</listener>
</listeners>
<actions>
- <action name="TestFtpRouteAction" process="route" class="org.jboss.soa.esb.actions.CbrProxyAction"/>
+ <action name="TestFtpRouteAction" class="org.jboss.soa.esb.actions.ContentBasedRouter"/>
</actions>
</service>
@@ -134,7 +129,7 @@
</listener>
</listeners>
<actions>
- <action name="TestSqlRouteAction" process="route" class="org.jboss.soa.esb.actions.CbrProxyAction"/>
+ <action name="TestSqlRouteAction" class="org.jboss.soa.esb.actions.ContentBasedRouter"/>
</actions>
</service>
Modified: labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/config/jbossesb_config_03.xml
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/config/jbossesb_config_03.xml 2007-01-26 04:30:23 UTC (rev 9030)
+++ labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/config/jbossesb_config_03.xml 2007-01-26 06:17:00 UTC (rev 9031)
@@ -23,7 +23,7 @@
<services>
- <service category="HelloWorld_ActionESB" name="SimpleListener" description="Hello World" is-gateway="false">
+ <service category="HelloWorld_ActionESB" name="SimpleListener" description="Hello World">
<listeners>
<listener name="JMS-ESBListener"
busidref="quickstartEsbChannel"
Modified: labs/jbossesb/trunk/product/etc/schemas/xml/jbossesb-1.0.xsd
===================================================================
--- labs/jbossesb/trunk/product/etc/schemas/xml/jbossesb-1.0.xsd 2007-01-26 04:30:23 UTC (rev 9030)
+++ labs/jbossesb/trunk/product/etc/schemas/xml/jbossesb-1.0.xsd 2007-01-26 06:17:00 UTC (rev 9031)
@@ -116,27 +116,6 @@
<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:attribute name="target-service-name" use="optional" type="xsd:string">
- <xsd:annotation>
- <xsd:documentation xml:lang="en">Used by gateways only, where it will send it's now esb-aware messages to.</xsd:documentation>
- </xsd:annotation>
- </xsd:attribute>
- <xsd:attribute name="target-service-category" use="optional" type="xsd:string">
- <xsd:annotation>
- <xsd:documentation xml:lang="en">Used by gateways only, where it will send it's now esb-aware messages to.</xsd:documentation>
- </xsd:annotation>
- </xsd:attribute>
- <xsd:attribute name="service-class" use="optional" type="xsd:string">
- <xsd:annotation>
- <xsd:documentation xml:lang="en">Fully qualified class name of the server class.</xsd:documentation>
- </xsd:annotation>
- </xsd:attribute>
</xsd:complexType>
</xsd:element>
@@ -212,6 +191,12 @@
<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:attribute name="is-gateway" use="optional" type="xsd:boolean" default="false">
+ <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" />
Modified: labs/jbossesb/trunk/product/samples/quickstarts/fun_cbr/jbossesb.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/fun_cbr/jbossesb.xml 2007-01-26 04:30:23 UTC (rev 9030)
+++ labs/jbossesb/trunk/product/samples/quickstarts/fun_cbr/jbossesb.xml 2007-01-26 06:17:00 UTC (rev 9031)
@@ -27,31 +27,21 @@
</providers>
<services>
- <!-- Gateway -->
- <service
- category="Fun_CBRServices_GW"
- name="FunCBRService_GW"
- description="This CBR routes messages to different service destinations based on Rules - see .drl"
- is-gateway="true"
- target-service-category="Fun_CBRServices_ESB"
- target-service-name="FunCBRService_ESB">
- <listeners>
- <jms-listener name="TheGateway"
- busidref="quickstartGwChannel"
- maxThreads="1"
- />
- </listeners>
- </service>
<!-- ESB CBR Service -->
<service
category="Fun_CBRServices_ESB"
name="FunCBRService_ESB"
- description="ESB Listener - for the native clients"
- is-gateway="false">
- <listeners>
+ description="ESB Listener - for the native clients">
+ <listeners>
+ <!-- Gateway -->
+ <jms-listener name="TheGateway"
+ busidref="quickstartGwChannel"
+ maxThreads="1"
+ is-gateway="true"
+ />
<jms-listener name="XPathContentBasedRouter"
- busidref="quickstartEsbChannel"
- maxThreads="1">
+ busidref="quickstartEsbChannel"
+ maxThreads="1">
</jms-listener>
</listeners>
<actions>
@@ -72,8 +62,7 @@
<service
category="BlueTeam"
name="GoBlue"
- description="Move to the Blue Team"
- is-gateway="false">
+ description="Move to the Blue Team">
<listeners>
<jms-listener
name="Fun_CBR_ToBlue"
@@ -103,8 +92,7 @@
<service
category="RedTeam"
name="GoRed"
- description="Move to the Red Team"
- is-gateway="false">
+ description="Move to the Red Team">
<listeners>
<jms-listener
name="Fun_CBR_ToRed"
@@ -134,8 +122,7 @@
<service
category="GreenTeam"
name="GoGreen"
- description="First transform then send to the Green Team"
- is-gateway="false">
+ description="First transform then send to the Green Team">
<listeners>
<jms-listener
name="Fun_CBR_ToGreenTransformer"
Modified: labs/jbossesb/trunk/product/samples/quickstarts/helloworld/jbossesb.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/helloworld/jbossesb.xml 2007-01-26 04:30:23 UTC (rev 9030)
+++ labs/jbossesb/trunk/product/samples/quickstarts/helloworld/jbossesb.xml 2007-01-26 06:17:00 UTC (rev 9031)
@@ -23,28 +23,16 @@
</providers>
<services>
- <service
- category="FirstServicesGW"
- name="SimpleJMSGateway"
- description="Hello World(gateway)"
- is-gateway="true"
- target-service-category="FirstServiceESB"
- target-service-name="SimpleListener"
- >
- <listeners>
- <jms-listener name="JMS-Gateway"
- busidref="quickstartGwChannel"
- maxThreads="1"
- />
- </listeners>
- </service>
-
<service
category="FirstServiceESB"
name="SimpleListener"
- description="Hello World"
- is-gateway="false">
+ description="Hello World">
<listeners>
+ <jms-listener name="JMS-Gateway"
+ busidref="quickstartGwChannel"
+ maxThreads="1"
+ is-gateway="true"
+ />
<jms-listener name="helloWorld"
busidref="quickstartEsbChannel"
maxThreads="1"
Modified: labs/jbossesb/trunk/product/samples/quickstarts/helloworld_action/jbossesb.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/helloworld_action/jbossesb.xml 2007-01-26 04:30:23 UTC (rev 9030)
+++ labs/jbossesb/trunk/product/samples/quickstarts/helloworld_action/jbossesb.xml 2007-01-26 06:17:00 UTC (rev 9031)
@@ -26,27 +26,16 @@
</providers>
<services>
- <service category="HelloWorld_ActionGW"
- name="SimpleJMSGateway"
- description="Hello World(gateway)"
- is-gateway="true"
- target-service-category="HelloWorld_ActionESB"
- target-service-name="SimpleListener"
- >
- <listeners>
- <jms-listener name="JMS-Gateway"
- busidref="quickstartGwChannel"
- maxThreads="1"
-
- />
- </listeners>
- </service>
<service category="HelloWorld_ActionESB"
name="SimpleListener"
- description="Hello World"
- is-gateway="false">
+ description="Hello World" >
<listeners>
+ <jms-listener name="JMS-Gateway"
+ busidref="quickstartGwChannel"
+ maxThreads="1"
+ is-gateway="true"
+ />
<jms-listener name="JMS-ESBListener"
busidref="quickstartEsbChannel"
maxThreads="1"
Modified: labs/jbossesb/trunk/product/samples/quickstarts/helloworld_db_registration/jbossesb.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/helloworld_db_registration/jbossesb.xml 2007-01-26 04:30:23 UTC (rev 9030)
+++ labs/jbossesb/trunk/product/samples/quickstarts/helloworld_db_registration/jbossesb.xml 2007-01-26 06:17:00 UTC (rev 9031)
@@ -15,18 +15,11 @@
</providers>
<services>
- <service category="UsingDBRegServices" name="UsingDBRegGateway"
- target-service-category="UsingDBRegServices"
- target-service-name="UsingDBRegJMSService"
- description="Hello World DB JMS Gateway" is-gateway="true">
- <listeners>
- <jms-listener name="helloworldDBGatewayListener"
- busidref="helloworldDBGatewayChannel" maxThreads="1"/>
- </listeners>
- </service>
<service category="UsingDBRegServices" name="UsingDBRegJMSService"
- description="Hello World DB JMS Service" is-gateway="false">
+ description="Hello World DB JMS Service">
<listeners>
+ <jms-listener name="helloworldDBGatewayListener"
+ busidref="helloworldDBGatewayChannel" maxThreads="1" is-gateway="true"/>
<jms-listener name="helloworldDBServiceListener"
busidref="helloworldDBServiceChannel" maxThreads="1"/>
</listeners>
Modified: labs/jbossesb/trunk/product/samples/quickstarts/helloworld_embedded_reg/jbossesb.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/helloworld_embedded_reg/jbossesb.xml 2007-01-26 04:30:23 UTC (rev 9030)
+++ labs/jbossesb/trunk/product/samples/quickstarts/helloworld_embedded_reg/jbossesb.xml 2007-01-26 06:17:00 UTC (rev 9031)
@@ -19,18 +19,11 @@
</providers>
<services>
- <service category="FirstServicesGW" name="SimpleJMSGateway"
- description="Hello World(gateway)" is-gateway="true"
- target-service-category="FirstServiceESB"
- target-service-name="SimpleListener">
- <listeners>
- <jms-listener name="JMS-Gateway" busidref="quickstartGwChannel" maxThreads="1" />
- </listeners>
- </service>
<service category="FirstServiceESB" name="SimpleListener"
- description="Hello World" is-gateway="false">
+ description="Hello World">
<listeners>
+ <jms-listener name="JMS-Gateway" busidref="quickstartGwChannel" maxThreads="1" is-gateway="true"/>
<jms-listener name="quickstart" busidref="quickstartEsbChannel" maxThreads="1" />
</listeners>
<actions>
Modified: labs/jbossesb/trunk/product/samples/quickstarts/helloworld_file_action/jbossesb.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/helloworld_file_action/jbossesb.xml 2007-01-26 04:30:23 UTC (rev 9030)
+++ labs/jbossesb/trunk/product/samples/quickstarts/helloworld_file_action/jbossesb.xml 2007-01-26 06:17:00 UTC (rev 9031)
@@ -36,29 +36,18 @@
</providers>
<services>
- <service
- category="myCategory"
- name="TheFileGateway"
- description="Hello World File Action(gateway)"
- is-gateway="true"
- target-service-category="myCategory"
- target-service-name="myFileListener"
- >
- <listeners>
- <fs-listener name="FileGateway"
- busidref="helloFileChannel"
- maxThreads="1"
- />
- <!-- pollLatencySeconds="10" WHERE DOES THIS GO-->
- </listeners>
- </service>
<service
category="myCategory"
name="myFileListener"
- description="Hello World File Action (esb listener)"
- is-gateway="false">
+ description="Hello World File Action (esb listener)" >
<listeners>
+ <fs-listener name="FileGateway"
+ busidref="helloFileChannel"
+ maxThreads="1"
+ is-gateway="true"
+ poll-frequency-seconds="10"
+ />
<jms-listener name="helloWorldFileAction"
busidref="quickstartEsbChannel"
maxThreads="1"
Modified: labs/jbossesb/trunk/product/samples/quickstarts/helloworld_ftp_action/jbossesb.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/helloworld_ftp_action/jbossesb.xml 2007-01-26 04:30:23 UTC (rev 9030)
+++ labs/jbossesb/trunk/product/samples/quickstarts/helloworld_ftp_action/jbossesb.xml 2007-01-26 06:17:00 UTC (rev 9031)
@@ -36,31 +36,19 @@
</providers>
- <services>
- <service
- category="myCategory"
- name="TheFileGateway"
- description="Hello World File Action(gateway)"
- is-gateway="true"
- target-service-category="myCategory"
- target-service-name="myFileListener"
- >
- <listeners>
- <ftp-listener name="FtpGateway"
- busidref="helloFTPChannel"
- maxThreads="1"
- >
- <property name="pollLatencySeconds" value="5"/>
- </ftp-listener>
- </listeners>
- </service>
-
+ <services>
<service
category="myCategory"
name="myFileListener"
- description="Hello World File Action (esb listener)"
- is-gateway="false">
+ description="Hello World File Action (esb listener)" >
<listeners>
+ <ftp-listener name="FtpGateway"
+ busidref="helloFTPChannel"
+ maxThreads="1"
+ is-gateway="true"
+ >
+ <property name="pollLatencySeconds" value="5"/>
+ </ftp-listener>
<jms-listener name="helloWorldFileAction"
busidref="quickstartEsbChannel"
maxThreads="1"
Modified: labs/jbossesb/trunk/product/samples/quickstarts/helloworld_sql_action/jbossesb.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/helloworld_sql_action/jbossesb.xml 2007-01-26 04:30:23 UTC (rev 9030)
+++ labs/jbossesb/trunk/product/samples/quickstarts/helloworld_sql_action/jbossesb.xml 2007-01-26 06:17:00 UTC (rev 9031)
@@ -35,29 +35,16 @@
</providers>
<services>
- <service
- category="myCategory"
- name="TheSQLGateway"
- description="Hello World SQL Action(gateway)"
- is-gateway="true"
- target-service-category="myCategory"
- target-service-name="myJmsListener"
- >
- <listeners>
- <sql-listener name="SqlGateway"
- busidref="helloSQLChannel"
- maxThreads="1"
- >
- </sql-listener>
- </listeners>
- </service>
-
<service
category="myCategory"
name="myJmsListener"
description="Hello World SQL Action (esb jdbc listener)"
is-gateway="false">
<listeners>
+ <sql-listener name="SqlGateway"
+ busidref="helloSQLChannel"
+ maxThreads="1"
+ is-gateway="true"/>
<jms-listener name="helloWorldJmsAction"
busidref="quickstartEsbChannel"
maxThreads="1"
Modified: labs/jbossesb/trunk/product/samples/quickstarts/more_action/jbossesb.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/more_action/jbossesb.xml 2007-01-26 04:30:23 UTC (rev 9030)
+++ labs/jbossesb/trunk/product/samples/quickstarts/more_action/jbossesb.xml 2007-01-26 06:17:00 UTC (rev 9031)
@@ -23,26 +23,16 @@
</providers>
<services>
- <service category="More_ActionGW"
- name="SimpleJMSGateway"
- description="Hello World(gateway)"
- is-gateway="true"
- target-service-category="ActionServices"
- target-service-name="MoreActionService"
- >
- <listeners>
- <jms-listener name="JMS-Gateway"
- busidref="quickstartGwChannel"
- maxThreads="1"
- />
- </listeners>
- </service>
<service category="ActionServices"
name="MoreActionService"
- description="More Action EPR description"
- is-gateway="false">
+ description="More Action EPR description" >
<listeners>
+ <jms-listener name="JMS-Gateway"
+ busidref="quickstartGwChannel"
+ maxThreads="1"
+ is-gateway="true"
+ />
<jms-listener name="JMS-ESBListener"
busidref="quickstartEsbChannel"
maxThreads="1"
Modified: labs/jbossesb/trunk/product/samples/quickstarts/quickstarts.properties
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/quickstarts.properties 2007-01-26 04:30:23 UTC (rev 9030)
+++ labs/jbossesb/trunk/product/samples/quickstarts/quickstarts.properties 2007-01-26 06:17:00 UTC (rev 9031)
@@ -7,8 +7,8 @@
# If running from source, you'll need to switch this variable to point to
# ../../../build/jbossesb/lib, but DO NOT CHECK THIS IN!
##############################################################################################
-#esb.product.lib.dir=../../../build/jbossesb/lib
-esb.product.lib.dir=../../../lib
+esb.product.lib.dir=../../../build/jbossesb/lib
+#esb.product.lib.dir=../../../lib
# Location of your JBoss Application Server installation.
# NB: Avoid using back slashes '\' in the path - '/' works on all platforms.
Modified: labs/jbossesb/trunk/product/samples/quickstarts/simple_cbr/jbossesb.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/simple_cbr/jbossesb.xml 2007-01-26 04:30:23 UTC (rev 9030)
+++ labs/jbossesb/trunk/product/samples/quickstarts/simple_cbr/jbossesb.xml 2007-01-26 06:17:00 UTC (rev 9031)
@@ -35,29 +35,19 @@
</providers>
<services>
- <!-- Gateway -->
- <service
- category="MyFirstCBRServices"
- name="FirstCBRService"
- description="This CBR routes messages to different service destinations based Order totalAmount"
- is-gateway="true"
- target-service-category="MyFirstCBRServicesESB"
- target-service-name="FirstCBRServiceESB">
- <listeners>
- <jms-listener name="the-gateway"
- busidref="quickstartGwChannel"
- maxThreads="1"
-
- />
- </listeners>
- </service>
+
<!-- ESB CBR Service -->
<service
category="MyFirstCBRServicesESB"
name="FirstCBRServiceESB"
- description="ESB Listener"
- is-gateway="false">
- <listeners>
+ description="ESB Listener" >
+ <listeners>
+ <!-- Gateway -->
+ <jms-listener name="the-gateway"
+ busidref="quickstartGwChannel"
+ maxThreads="1"
+ is-gateway="true"
+ />
<jms-listener name="XPathContentBasedRouter"
busidref="quickstartEsbChannel"
maxThreads="1">
@@ -80,8 +70,7 @@
<service
category="NormalShipping"
name="NormalShippingService"
- description="Normal Shipping Service"
- is-gateway="false">
+ description="Normal Shipping Service">
<listeners>
<jms-listener
name="CBRNormalShipping"
@@ -106,8 +95,7 @@
<service
category="ExpressShipping"
name="ExpressShippingService"
- description="Express Shipping Service"
- is-gateway="false">
+ description="Express Shipping Service">
<listeners>
<jms-listener
name="CBRExpressFreeShipping"
Modified: labs/jbossesb/trunk/product/samples/quickstarts/static_router/jbossesb.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/static_router/jbossesb.xml 2007-01-26 04:30:23 UTC (rev 9030)
+++ labs/jbossesb/trunk/product/samples/quickstarts/static_router/jbossesb.xml 2007-01-26 06:17:00 UTC (rev 9031)
@@ -50,27 +50,17 @@
</providers>
<services>
- <service category="StaticRouterCategoryGW"
- name="Gateway"
- description="Static router(gateway)"
- is-gateway="true"
- target-service-category="StaticRouterCategoryEsb1"
- target-service-name="fileListener"
- >
- <listeners>
- <ftp-listener name="Ftp-Gateway"
- busidref="StaticRouterFtpGW"
- maxThreads="1"
- />
- </listeners>
- </service>
<service
category="StaticRouterCategoryEsb1"
name="fileListener"
- description="Static router(listener)"
- is-gateway="false">
+ description="Static router(listener)">
<listeners>
+ <ftp-listener name="Ftp-Gateway"
+ busidref="StaticRouterFtpGW"
+ maxThreads="1"
+ is-gateway="true"
+ />
<fs-listener name="StaticRouter"
busidref="staticRouter"
maxThreads="1"
Modified: labs/jbossesb/trunk/product/samples/quickstarts/transform_XML2POJO/jbossesb.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/transform_XML2POJO/jbossesb.xml 2007-01-26 04:30:23 UTC (rev 9030)
+++ labs/jbossesb/trunk/product/samples/quickstarts/transform_XML2POJO/jbossesb.xml 2007-01-26 06:17:00 UTC (rev 9031)
@@ -23,28 +23,16 @@
</providers>
<services>
- <service
- category="MyTransformationServicesGW"
- name="MyFirstTransformationServiceGW"
- description="GW: Takes XML in and produces a POJO"
- is-gateway="true"
- target-service-category="MyTransformationServicesESB"
- target-service-name="MyFirstTransformationServiceESB"
- >
- <listeners>
- <jms-listener name="JMS-Gateway"
- busidref="quickstartGwChannel"
- maxThreads="1"
- />
- </listeners>
- </service>
-
<service
category="MyTransformationServicesESB"
name="MyFirstTransformationServiceESB"
- description="ESB: Takes XML in and produces a POJO"
- is-gateway="false">
+ description="ESB: Takes XML in and produces a POJO">
<listeners>
+ <jms-listener name="JMS-Gateway"
+ busidref="quickstartGwChannel"
+ maxThreads="1"
+ is-gateway="true"
+ />
<jms-listener name="jmsTransformer"
busidref="quickstartEsbChannel"
maxThreads="1"
Modified: labs/jbossesb/trunk/product/samples/quickstarts/transform_XML2XML_date_manipulation/jbossesb.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/transform_XML2XML_date_manipulation/jbossesb.xml 2007-01-26 04:30:23 UTC (rev 9030)
+++ labs/jbossesb/trunk/product/samples/quickstarts/transform_XML2XML_date_manipulation/jbossesb.xml 2007-01-26 06:17:00 UTC (rev 9031)
@@ -19,18 +19,10 @@
</providers>
<services>
- <service category="FirstServicesGW" name="SimpleJMSGateway"
- description="Hello World(gateway)" is-gateway="true"
- target-service-category="FirstServiceESB"
- target-service-name="SimpleListener">
- <listeners>
- <jms-listener name="JMS-Gateway" busidref="quickstartGwChannel" maxThreads="1" />
- </listeners>
- </service>
-
<service category="FirstServiceESB" name="SimpleListener"
- description="Hello World" is-gateway="false">
+ description="Hello World">
<listeners>
+ <jms-listener name="JMS-Gateway" busidref="quickstartGwChannel" maxThreads="1" is-gateway="true"/>
<jms-listener name="quickstart" busidref="quickstartEsbChannel" maxThreads="1" />
</listeners>
<actions>
Modified: labs/jbossesb/trunk/product/samples/quickstarts/transform_XML2XML_simple/jbossesb.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/transform_XML2XML_simple/jbossesb.xml 2007-01-26 04:30:23 UTC (rev 9030)
+++ labs/jbossesb/trunk/product/samples/quickstarts/transform_XML2XML_simple/jbossesb.xml 2007-01-26 06:17:00 UTC (rev 9031)
@@ -19,18 +19,11 @@
</providers>
<services>
- <service category="FirstServicesGW" name="SimpleJMSGateway"
- description="Hello World(gateway)" is-gateway="true"
- target-service-category="FirstServiceESB"
- target-service-name="SimpleListener">
- <listeners>
- <jms-listener name="JMS-Gateway" busidref="quickstartGwChannel" maxThreads="1" />
- </listeners>
- </service>
<service category="FirstServiceESB" name="SimpleListener"
- description="Hello World" is-gateway="false">
+ description="Hello World">
<listeners>
+ <jms-listener name="JMS-Gateway" busidref="quickstartGwChannel" maxThreads="1" is-gateway="true"/>
<jms-listener name="quickstart" busidref="quickstartEsbChannel" maxThreads="1" />
</listeners>
<actions>
Modified: labs/jbossesb/trunk/product/samples/trailblazer/esb/conf/jbossesb.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/trailblazer/esb/conf/jbossesb.xml 2007-01-26 04:30:23 UTC (rev 9030)
+++ labs/jbossesb/trunk/product/samples/trailblazer/esb/conf/jbossesb.xml 2007-01-26 06:17:00 UTC (rev 9031)
@@ -19,14 +19,8 @@
</providers>
<services>
- <service category="trailblazer-jmsbank" name="jmsbankreplies" description="Trailblazer Bank Service" is-gateway="true" target-service-name="jmsbankreplies" target-service-category="trailblazer-jmsbank">
- <listeners>
- <jms-listener name="trailblazer-jmsbank"
- busidref="bankResponseGateway"
- maxThreads="1"/>
- </listeners>
- </service>
- <service category="trailblazer" name="creditagency" description="Credit Agency Service" is-gateway="false">
+
+ <service category="trailblazer" name="creditagency" description="Credit Agency Service">
<listeners>
<jms-listener name="trailblazer-jmscreditagency"
busidref="creditAgencyRequest"
@@ -38,8 +32,12 @@
</action>
</actions>
</service>
- <service category="trailblazer-jmsbank" name="jmsbankreplies" description="Trailblazer Bank Reply Service" is-gateway="false">
+ <service category="trailblazer-jmsbank" name="jmsbankreplies" description="Trailblazer Bank Reply Service">
<listeners>
+ <jms-listener name="trailblazer-jmsbank"
+ busidref="bankResponseGateway"
+ maxThreads="1"
+ is-gateway="true"/>
<jms-listener name="trailblazer-jmsbankreplies"
busidref="bankResponseListener"
maxThreads="1"/>
Modified: labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/actions/ContentBasedRouterTest.xml
===================================================================
--- labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/actions/ContentBasedRouterTest.xml 2007-01-26 04:30:23 UTC (rev 9030)
+++ labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/actions/ContentBasedRouterTest.xml 2007-01-26 06:17:00 UTC (rev 9031)
@@ -34,8 +34,7 @@
<service
category="MessageRouting"
name="ContentBasedRoutingService"
- description="CBR Listener"
- is-gateway="false">
+ description="CBR Listener">
<listeners>
<jms-listener name="XPathContentBasedRouter"
busidref="QueueA"
More information about the jboss-svn-commits
mailing list