[jboss-svn-commits] JBL Code SVN: r8446 - in labs/jbossesb/trunk/product: core/listeners/src/org/jboss/soa/esb/listeners 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
Wed Dec 20 12:13:19 EST 2006
Author: kurt.stam at jboss.com
Date: 2006-12-20 12:13:16 -0500 (Wed, 20 Dec 2006)
New Revision: 8446
Modified:
labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/ListenerTagNames.java
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/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_gateways.xml
labs/jbossesb/trunk/product/etc/schemas/xml/jbossesb-1.0.xsd
Log:
Adding target-service-name, target-service-category and gateway-class
Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/ListenerTagNames.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/ListenerTagNames.java 2006-12-20 16:38:12 UTC (rev 8445)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/ListenerTagNames.java 2006-12-20 17:13:16 UTC (rev 8446)
@@ -46,6 +46,10 @@
/** Gateways */
public static final String TARGET_SERVICE_CATEGORY_TAG = "target-service-category";
public static final String TARGET_SERVICE_NAME_TAG = "target-service-name";
+ public static final String GATEWAY_CLASS_TAG = "gatewayClass";
+
+ /** Listeners */
+ public static final String LISTENER_CLASS_TAG = "listenerClass";
/** ActionProcessingPipeline */
public static final String ACTION_ELEMENT_TAG = "action";
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-20 16:38:12 UTC (rev 8445)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/config/Generator.java 2006-12-20 17:13:16 UTC (rev 8446)
@@ -113,14 +113,14 @@
GatewayGenerator gatewayGenerator = new GatewayGenerator(model);
Document gatewayConfig = gatewayGenerator.generate();
- logger.info("Serialising ESB Aware Listener 'ConfigTree' configuration to [" + (new File(outdir, ESB_CONFIG_GATEWAY_XML_FILE)).getAbsolutePath() + "].");
+ logger.info("Serializing ESB Gateway 'ConfigTree' configuration to [" + (new File(outdir, ESB_CONFIG_GATEWAY_XML_FILE)).getAbsolutePath() + "].");
YADOMUtil.serialize(gatewayConfig, outdir, ESB_CONFIG_GATEWAY_XML_FILE);
// Generate and serialise the configuration for the ESB Aware listeners...
ESBAwareGenerator awareGenerator = new ESBAwareGenerator(model);
Document awareConfig = awareGenerator.generate();
- logger.info("Serialising ESB Gateway Listener 'ConfigTree' configuration to [" + (new File(outdir, ESB_CONFIG_GATEWAY_XML_FILE)).getAbsolutePath() + "].");
+ logger.info("Serializing ESB Aware Listener 'ConfigTree' configuration to [" + (new File(outdir, ESB_CONFIG_XML_FILE)).getAbsolutePath() + "].");
YADOMUtil.serialize(awareConfig, outdir, ESB_CONFIG_XML_FILE);
}
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 16:38:12 UTC (rev 8445)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/config/mappers/MapperUtil.java 2006-12-20 17:13:16 UTC (rev 8446)
@@ -51,14 +51,16 @@
protected static void mapDefaultAttributes(Listener listener, Element target, XMLBeansModel model) {
Service service = model.getService(listener);
+ 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.TARGET_SERVICE_CATEGORY_TAG, service.getCategory());
- target.setAttribute(ListenerTagNames.TARGET_SERVICE_NAME_TAG, service.getName());
+ target.setAttribute(ListenerTagNames.GATEWAY_CLASS_TAG, service.getGatewayClass());
+ target.setAttribute(ListenerTagNames.TARGET_SERVICE_CATEGORY_TAG, service.getTargetServiceCategory());
+ target.setAttribute(ListenerTagNames.TARGET_SERVICE_NAME_TAG, service.getTargetServiceName());
} else {
- target.setAttribute("listenerClass", MessageAwareListener.class.getName());
- 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());
+ target.setAttribute(ListenerTagNames.LISTENER_CLASS_TAG, MessageAwareListener.class.getName());
+
}
}
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 16:38:12 UTC (rev 8445)
+++ labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/config/jbossesb_config_01.xml 2006-12-20 17:13:16 UTC (rev 8446)
@@ -25,7 +25,7 @@
</providers>
<services>
- <service category="Bank" name="Reconciliation" description="Bank Reconciliation Service" is-gateway="true">
+ <service category="Bank" name="Reconciliation" description="Bank Reconciliation Service" is-gateway="true" target-service-category="Bank" target-service-name="Reconciliation">
<listeners>
<jms-listener name="Bank-JMS-Gateway"
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 16:38:12 UTC (rev 8445)
+++ labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/config/jbossesb_config_01_gateways.xml 2006-12-20 17:13:16 UTC (rev 8446)
@@ -4,5 +4,5 @@
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"/>
+<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
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 16:38:12 UTC (rev 8445)
+++ labs/jbossesb/trunk/product/etc/schemas/xml/jbossesb-1.0.xsd 2006-12-20 17:13:16 UTC (rev 8446)
@@ -132,6 +132,11 @@
<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="gateway-class" use="optional" type="xsd:string">
+ <xsd:annotation>
+ <xsd:documentation xml:lang="en">Used by gateways only, fully qualified class name of the Gateway class.</xsd:documentation>
+ </xsd:annotation>
+ </xsd:attribute>
</xsd:complexType>
</xsd:element>
More information about the jboss-svn-commits
mailing list