[jboss-svn-commits] JBL Code SVN: r8510 - in labs/jbossesb/trunk/product: core/listeners/src/org/jboss/soa/esb/listeners/config/mappers etc/schemas/xml
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Dec 21 12:52:55 EST 2006
Author: kurt.stam at jboss.com
Date: 2006-12-21 12:52:52 -0500 (Thu, 21 Dec 2006)
New Revision: 8510
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/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/etc/schemas/xml/jbossesb-1.0.xsd
Log:
changing gateway class to service-class.
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 2006-12-21 17:32:27 UTC (rev 8509)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/config/mappers/FsListenerMapper.java 2006-12-21 17:52:52 UTC (rev 8510)
@@ -29,7 +29,8 @@
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.gateway.JmsGatewayListener;
+import org.jboss.soa.esb.listeners.config.ServiceDocument.Service;
+import org.jboss.soa.esb.listeners.gateway.FileGatewayListener;
import org.w3c.dom.Element;
/**
@@ -76,9 +77,11 @@
MapperUtil.mapDefaultAttributes(listener, listenerNode, model);
// Map the <property> elements targeted at the listener - from the listener itself.
MapperUtil.mapProperties(listener.getPropertyArray(), listenerNode);
-
+ Service service = model.getService(listener);
if(model.getService(listener).getIsGateway()) {
- listenerNode.setAttribute("gatewayClass", JmsGatewayListener.class.getName());
+ if (service.getServiceClass()==null) {
+ 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 2006-12-21 17:32:27 UTC (rev 8509)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/config/mappers/FtpListenerMapper.java 2006-12-21 17:52:52 UTC (rev 8510)
@@ -29,7 +29,8 @@
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.gateway.JmsGatewayListener;
+import org.jboss.soa.esb.listeners.config.ServiceDocument.Service;
+import org.jboss.soa.esb.listeners.gateway.RemoteGatewayListener;
import org.w3c.dom.Element;
/**
@@ -76,9 +77,11 @@
MapperUtil.mapDefaultAttributes(listener, listenerNode, model);
// Map the <property> elements targeted at the listener - from the listener itself.
MapperUtil.mapProperties(listener.getPropertyArray(), listenerNode);
-
+ Service service = model.getService(listener);
if(model.getService(listener).getIsGateway()) {
- listenerNode.setAttribute("gatewayClass", JmsGatewayListener.class.getName());
+ if (service.getServiceClass()==null) {
+ 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 2006-12-21 17:32:27 UTC (rev 8509)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/config/mappers/JmsListenerMapper.java 2006-12-21 17:52:52 UTC (rev 8510)
@@ -30,6 +30,7 @@
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;
@@ -77,9 +78,11 @@
MapperUtil.mapDefaultAttributes(listener, listenerNode, model);
// Map the <property> elements targeted at the listener - from the listener itself.
MapperUtil.mapProperties(listener.getPropertyArray(), listenerNode);
-
+ Service service = model.getService(listener);
if(model.getService(listener).getIsGateway()) {
- listenerNode.setAttribute("gatewayClass", JmsGatewayListener.class.getName());
+ if (service.getServiceClass()==null) {
+ 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 2006-12-21 17:32:27 UTC (rev 8509)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/config/mappers/MapperUtil.java 2006-12-21 17:52:52 UTC (rev 8510)
@@ -57,12 +57,13 @@
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.getGatewayClass());
+ 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());
} else {
- target.setAttribute(ListenerTagNames.LISTENER_CLASS_TAG, MessageAwareListener.class.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 2006-12-21 17:32:27 UTC (rev 8509)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/config/mappers/SqlListenerMapper.java 2006-12-21 17:52:52 UTC (rev 8510)
@@ -25,11 +25,12 @@
import org.jboss.soa.esb.listeners.ListenerTagNames;
import org.jboss.soa.esb.listeners.config.YADOMUtil;
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;
import org.jboss.soa.esb.listeners.config.SqlProviderDocument.SqlProvider;
-import org.jboss.soa.esb.listeners.gateway.JmsGatewayListener;
+import org.jboss.soa.esb.listeners.gateway.SqlTableGatewayListener;
import org.w3c.dom.Element;
/**
@@ -76,16 +77,17 @@
MapperUtil.mapDefaultAttributes(listener, listenerNode, model);
// Map the <property> elements targeted at the listener - from the listener itself.
MapperUtil.mapProperties(listener.getPropertyArray(), listenerNode);
-
+ Service service = model.getService(listener);
if(model.getService(listener).getIsGateway()) {
- listenerNode.setAttribute("gatewayClass", JmsGatewayListener.class.getName());
+ if (service.getServiceClass()==null) {
+ 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);
MapperUtil.mapEPRProperties(listener, listenerNode, model);
} else {
Element eprNode = YADOMUtil.addElement(listenerNode, ListenerTagNames.EPR_TAG);
-
// Map EPR related attributes onto the EPR - from the bus and provider and listener...
mapSqlEprProperties(eprNode, provider, messageFilter);
MapperUtil.mapEPRProperties(listener, eprNode, model);
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-21 17:32:27 UTC (rev 8509)
+++ labs/jbossesb/trunk/product/etc/schemas/xml/jbossesb-1.0.xsd 2006-12-21 17:52:52 UTC (rev 8510)
@@ -132,9 +132,9 @@
<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:attribute name="service-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:documentation xml:lang="en">Fully qualified class name of the server class.</xsd:documentation>
</xsd:annotation>
</xsd:attribute>
</xsd:complexType>
More information about the jboss-svn-commits
mailing list