[jboss-svn-commits] JBL Code SVN: r10696 - labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/config.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Apr 2 12:49:48 EDT 2007
Author: tfennelly
Date: 2007-04-02 12:49:48 -0400 (Mon, 02 Apr 2007)
New Revision: 10696
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/jbossesb_config_01.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
Log:
added JBR config generation tests
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-04-02 15:59:40 UTC (rev 10695)
+++ labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/config/GeneratorUnitTest.java 2007-04-02 16:49:48 UTC (rev 10696)
@@ -68,8 +68,8 @@
public void test_generate_files(String filename) throws ConfigurationException, IOException {
Generator generator = new Generator(getClass().getResourceAsStream(filename));
- String expectedGatewayConfig = new String(StreamUtils.readStream(getClass().getResourceAsStream("jbossesb_config_01_gateways.xml")));
- String expectedESBAwareConfig = new String(StreamUtils.readStream(getClass().getResourceAsStream("jbossesb_config_01_esbaware.xml")));
+ String expectedGatewayConfig = new String(StreamUtils.readStream(getClass().getResourceAsStream("jbossesb_config_01_gateways.xml"))).trim();
+ String expectedESBAwareConfig = new String(StreamUtils.readStream(getClass().getResourceAsStream("jbossesb_config_01_esbaware.xml"))).trim();
String actualGatewayConfig;
String actualESBAwareConfig;
@@ -139,7 +139,7 @@
assertEquals("service='Reconciliation'", busDestination.getSelector());
List<Listener> gateways = model.getGatewayListeners();
- assertEquals(1, gateways.size());
+ assertEquals(2, gateways.size());
JmsListener gatewayListener = (JmsListener)gateways.get(0);
assertEquals("Bank-JMS-Gateway", gatewayListener.getName());
assertEquals("server1-jms", gatewayListener.getBusidref());
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-04-02 15:59:40 UTC (rev 10695)
+++ labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/config/jbossesb_config_01.xml 2007-04-02 16:49:48 UTC (rev 10696)
@@ -27,7 +27,10 @@
</sql-bus>
</sql-provider>
-
+ <jbr-provider name="JBR" host="192.168.1.111" protocol="http">
+ <jbr-bus busid="HTTP-1" port="8765" />
+ <jbr-bus busid="HTTP-2" port="8766" />
+ </jbr-provider>
<provider name="JBossAS">
<property name="my-generic-provider" value="my-generic-provider#someattribvalue" />
@@ -46,7 +49,11 @@
busidref="server1-jms"
maxThreads="1"
is-gateway="true"/>
- <jms-listener name="Bank-Listener"
+ <jbr-listener name="Bank-HTTP-Gateway"
+ busidref="HTTP-1"
+ maxThreads="1"
+ is-gateway="true"/>
+ <jms-listener name="Bank-Listener"
busidref="local-jms"
maxThreads="2">
<jms-message-filter dest-type="TOPIC" dest-name="queue/B" selector="service='Reconciliation'" />
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-04-02 15:59:40 UTC (rev 10695)
+++ labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/config/jbossesb_config_01_gateways.xml 2007-04-02 16:49:48 UTC (rev 10696)
@@ -1 +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-description="Bank Reconciliation Service" target-service-category="Bank" target-service-name="Reconciliation"/></jbossesb-gateways>
\ No newline at end of file
+<?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"/><Bank-HTTP-Gateway gatewayClass="org.jboss.soa.esb.listeners.gateway.JBossRemotingGatewayListener" jbr-serverBindAddress="192.168.1.111" jbr-serverBindPort="8765" jbr-serverProtocol="http" maxThreads="1" 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-04-02 15:59:40 UTC (rev 10695)
+++ labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/config/jbossesb_config_02.xml 2007-04-02 16:49:48 UTC (rev 10696)
@@ -58,7 +58,19 @@
</bus>
</provider>
- <provider name="JBossAS">
+ <provider name="JBR">
+ <property name="jbr-serverBindAddress" value="192.168.1.111" />
+ <property name="jbr-serverProtocol" value="http" />
+
+ <bus busid="HTTP-1">
+ <property name="jbr-serverBindPort" value="8765" />
+ </bus>
+ <bus busid="HTTP-2">
+ <property name="jbr-serverBindPort" value="8766" />
+ </bus>
+ </provider>
+
+ <provider name="JBossAS">
<property name="my-generic-provider" value="my-generic-provider#someattribvalue" />
<bus busid="my-generic-bus">
@@ -77,7 +89,13 @@
is-gateway="true">
<property name="gatewayClass" value="org.jboss.soa.esb.listeners.gateway.JmsGatewayListener" />
</listener>
- <listener name="Bank-Listener"
+ <listener name="Bank-HTTP-Gateway"
+ busidref="HTTP-1"
+ maxThreads="1"
+ is-gateway="true">
+ <property name="gatewayClass" value="org.jboss.soa.esb.listeners.gateway.JBossRemotingGatewayListener" />
+ </listener>
+ <listener name="Bank-Listener"
busidref="local-jms"
maxThreads="2">
</listener>
More information about the jboss-svn-commits
mailing list