[jboss-svn-commits] JBL Code SVN: r8473 - 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
Wed Dec 20 21:34:15 EST 2006
Author: kurt.stam at jboss.com
Date: 2006-12-20 21:34:12 -0500 (Wed, 20 Dec 2006)
New Revision: 8473
Added:
labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/config/mappers/SqlListenerMapper.java
Modified:
labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/config/ESBAwareGenerator.java
labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/config/GatewayGenerator.java
labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/config/mappers/FsListenerMapper.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/etc/schemas/xml/jbossesb-1.0.xsd
Log:
Adding sql validation support to the xsd.
Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/config/ESBAwareGenerator.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/config/ESBAwareGenerator.java 2006-12-21 00:25:53 UTC (rev 8472)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/config/ESBAwareGenerator.java 2006-12-21 02:34:12 UTC (rev 8473)
@@ -29,11 +29,13 @@
import org.jboss.soa.esb.listeners.config.Generator.XMLBeansModel;
import org.jboss.soa.esb.listeners.config.JmsListenerDocument.JmsListener;
import org.jboss.soa.esb.listeners.config.ServiceDocument.Service;
+import org.jboss.soa.esb.listeners.config.SqlListenerDocument.SqlListener;
import org.jboss.soa.esb.listeners.config.mappers.ActionMapper;
import org.jboss.soa.esb.listeners.config.mappers.FsListenerMapper;
import org.jboss.soa.esb.listeners.config.mappers.FtpListenerMapper;
import org.jboss.soa.esb.listeners.config.mappers.JmsListenerMapper;
import org.jboss.soa.esb.listeners.config.mappers.NotificationMapper;
+import org.jboss.soa.esb.listeners.config.mappers.SqlListenerMapper;
import org.jboss.soa.esb.listeners.config.mappers.UntypedListenerMapper;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -100,7 +102,9 @@
listenerConfigTree = FsListenerMapper.map(root, (FsListener)listener, model);
} else if (listener instanceof FtpListener) {
listenerConfigTree = FtpListenerMapper.map(root, (FtpListener)listener, model);
- } else {
+ } else if (listener instanceof SqlListener) {
+ listenerConfigTree = SqlListenerMapper.map(root, (SqlListener)listener, model);
+ } else {
listenerConfigTree = UntypedListenerMapper.map(root, listener, model);
}
Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/config/GatewayGenerator.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/config/GatewayGenerator.java 2006-12-21 00:25:53 UTC (rev 8472)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/config/GatewayGenerator.java 2006-12-21 02:34:12 UTC (rev 8473)
@@ -28,9 +28,11 @@
import org.jboss.soa.esb.listeners.config.FtpListenerDocument.FtpListener;
import org.jboss.soa.esb.listeners.config.Generator.XMLBeansModel;
import org.jboss.soa.esb.listeners.config.JmsListenerDocument.JmsListener;
+import org.jboss.soa.esb.listeners.config.SqlListenerDocument.SqlListener;
import org.jboss.soa.esb.listeners.config.mappers.FsListenerMapper;
import org.jboss.soa.esb.listeners.config.mappers.FtpListenerMapper;
import org.jboss.soa.esb.listeners.config.mappers.JmsListenerMapper;
+import org.jboss.soa.esb.listeners.config.mappers.SqlListenerMapper;
import org.jboss.soa.esb.listeners.config.mappers.UntypedListenerMapper;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -95,6 +97,8 @@
FsListenerMapper.map(root, (FsListener)gateway, model);
} else if (gateway instanceof FtpListener) {
FtpListenerMapper.map(root, (FtpListener)gateway, model);
+ } else if (gateway instanceof SqlListener) {
+ SqlListenerMapper.map(root, (SqlListener)gateway, model);
} else {
UntypedListenerMapper.map(root, gateway, model);
}
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 00:25:53 UTC (rev 8472)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/config/mappers/FsListenerMapper.java 2006-12-21 02:34:12 UTC (rev 8473)
@@ -22,7 +22,6 @@
import org.jboss.soa.esb.ConfigurationException;
import org.jboss.soa.esb.addressing.eprs.FileEpr;
-import org.jboss.soa.esb.addressing.eprs.JMSEpr;
import org.jboss.soa.esb.listeners.ListenerTagNames;
import org.jboss.soa.esb.listeners.config.YADOMUtil;
import org.jboss.soa.esb.listeners.config.FsBusDocument.FsBus;
Added: 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 00:25:53 UTC (rev 8472)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/config/mappers/SqlListenerMapper.java 2006-12-21 02:34:12 UTC (rev 8473)
@@ -0,0 +1,117 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, JBoss Inc., and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ */
+
+package org.jboss.soa.esb.listeners.config.mappers;
+
+import org.jboss.soa.esb.ConfigurationException;
+import org.jboss.soa.esb.addressing.eprs.JDBCEpr;
+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.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.w3c.dom.Element;
+
+/**
+ * Performs the mapping of a <fs-listener> XSD based configuration to the "ConfigTree"
+ * style configuration, adding the "ConfigTree" listener config to the "root" node.
+ *
+ * @author <a href="mailto:kurt.stam at jboss.com">kurt.stam at jboss.com</a>
+ */
+public class SqlListenerMapper {
+
+ /**
+ * Perform the mapping.
+ * @param root The "ConfigTree" configuration root node.
+ * @param listener The Jmslistener to be mapped into the ConfigTree.
+ * @param model The configuration model from which the mapping is being performed.
+ * @return The ConfigTree listener configuration node.
+ * @throws ConfigurationException Invalid listener configuration.
+ */
+ public static Element map(Element root, SqlListener listener, XMLBeansModel model) throws ConfigurationException {
+ Element listenerNode = YADOMUtil.addElement(root, listener.getName());
+ SqlBus bus;
+ SqlProvider provider;
+
+ try {
+ bus = (SqlBus) model.getBus(listener.getBusidref());
+ } catch (ClassCastException e) {
+ throw new ConfigurationException("Invalid busid reference [" + listener.getBusidref() + "] on listener [" + listener.getName() + "]. A <sql-listener> must reference a <sql-bus>.");
+ }
+ try {
+ provider = (SqlProvider) model.getProvider(bus);
+ } catch (ClassCastException e) {
+ throw new ConfigurationException("Invalid bus config [" + listener.getBusidref() + "]. Should be contained within a <sql-provider> instance. Unexpected exception - this should have caused a validation error!");
+ }
+
+ SqlMessageFilter messageFilter = listener.getSqlMessageFilter();
+ if(messageFilter == null) {
+ messageFilter = bus.getSqlMessageFilter();
+ if(messageFilter == null) {
+ throw new ConfigurationException("No <sql-detination> defined on either <sql-listener> [" + listener.getName() + "] or <sql-bus> [" + bus.getBusid() + "].");
+ }
+ }
+
+ // Map the standard listener attributes - common across all listener types...
+ MapperUtil.mapDefaultAttributes(listener, listenerNode, model);
+ // Map the <property> elements targeted at the listener - from the listener itself.
+ MapperUtil.mapProperties(listener.getPropertyArray(), listenerNode);
+
+ 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...
+ 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);
+ // Remove any empty attributes set on the EPR config...
+ YADOMUtil.removeEmptyAttributes(eprNode);
+ }
+
+ // Remove any empty attributes set on the listener config...
+ YADOMUtil.removeEmptyAttributes(listenerNode);
+
+ return listenerNode;
+ }
+
+ private static void mapSqlEprProperties(Element toElement, SqlProvider provider, SqlMessageFilter messageFilter) {
+ toElement.setAttribute(JDBCEpr.URL_TAG, provider.getUrl());
+ toElement.setAttribute(JDBCEpr.DRIVER_TAG, provider.getDriver());
+ toElement.setAttribute(JDBCEpr.USERNAME_TAG, provider.getUsername());
+ toElement.setAttribute(JDBCEpr.PASSWORD_TAG, provider.getPassword());
+ toElement.setAttribute(JDBCEpr.TABLE_NAME_TAG, messageFilter.getTablename());
+ toElement.setAttribute(JDBCEpr.MESSAGE_ID_COLUMN_TAG, messageFilter.getMessageIdColumn());
+ toElement.setAttribute(JDBCEpr.DATA_COLUMN_TAG, messageFilter.getMessageColumn());
+ toElement.setAttribute(JDBCEpr.STATUS_COLUMN_TAG, String.valueOf(messageFilter.getStatusColumn()));
+ toElement.setAttribute(JDBCEpr.TIMESTAMP_COLUMN_TAG, messageFilter.getInsertTimestampColumn());
+ toElement.setAttribute(JDBCEpr.POST_DEL_TAG, String.valueOf(messageFilter.getPostDelete()));
+ toElement.setAttribute(JDBCEpr.ERROR_DEL_TAG, String.valueOf(messageFilter.getErrorDelete()));
+
+
+ }
+}
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-21 00:25:53 UTC (rev 8472)
+++ labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/config/GeneratorUnitTest.java 2006-12-21 02:34:12 UTC (rev 8473)
@@ -120,7 +120,7 @@
assertEquals(1, gatewayListener.getMaxThreads());
List<Listener> awareListeners = model.getESBAwareListeners();
- assertEquals(4, awareListeners.size());
+ assertEquals(5, awareListeners.size());
JmsListener awareListener = (JmsListener)awareListeners.get(0);
assertEquals("Bank-Listener", awareListener.getName());
assertEquals("local-jms", awareListener.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 2006-12-21 00:25:53 UTC (rev 8472)
+++ labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/config/jbossesb_config_01.xml 2006-12-21 02:34:12 UTC (rev 8473)
@@ -26,6 +26,12 @@
<ftp-message-filter directory="/Temp" input-suffix=".txt" username="joe" password="secret"/>
</ftp-bus>
</ftp-provider>
+
+ <sql-provider name="HSQLDB" url="jdbc:postgresql://myhost:5432/testDB" driver="org.postgresql.Driver" username="joe" password="secret">
+ <sql-bus busid="SQL-Test">
+ <sql-message-filter tablename="testtable"/>
+ </sql-bus>
+ </sql-provider>
<provider name="JBossAS">
<property name="my-generic-provider" value="my-generic-provider#someattribvalue" />
@@ -101,7 +107,19 @@
<action name="TestFtpRouteAction" process="route" class="org.jboss.soa.esb.actions.CbrProxyAction"/>
</actions>
- </service>
+ </service>
+ <service category="Test3" name="SQLTest" description="SQL server Test" is-gateway="false">
+
+ <listeners>
+ <sql-listener name="test-sql-listener"
+ busidref="SQL-Test"
+ maxThreads="1"/>
+ </listeners>
+ <actions>
+ <action name="TestSqlRouteAction" process="route" class="org.jboss.soa.esb.actions.CbrProxyAction"/>
+ </actions>
+
+ </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-21 00:25:53 UTC (rev 8472)
+++ labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/config/jbossesb_config_01_esbaware.xml 2006-12-21 02:34:12 UTC (rev 8473)
@@ -38,4 +38,8 @@
<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" 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>
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 00:25:53 UTC (rev 8472)
+++ labs/jbossesb/trunk/product/etc/schemas/xml/jbossesb-1.0.xsd 2006-12-21 02:34:12 UTC (rev 8473)
@@ -436,4 +436,79 @@
</xsd:complexContent>
</xsd:complexType>
</xsd:element>
+
+ <!-- 88888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888
+ SQL Type Implementations.
+ 88888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888-->
+ <xsd:element name="sql-message-filter">
+ <xsd:annotation><xsd:documentation xml:lang="en">A SQL filter.</xsd:documentation></xsd:annotation>
+ <xsd:complexType>
+ <xsd:attribute name="tablename" use="required" type="xsd:string">
+ <xsd:annotation><xsd:documentation xml:lang="en">The table in which esb message are stored.</xsd:documentation></xsd:annotation>
+ </xsd:attribute>
+ <xsd:attribute name="message-id-column" use="optional" type="xsd:string" default="message_id">
+ <xsd:annotation><xsd:documentation xml:lang="en">A unique key (PK) in the table.</xsd:documentation></xsd:annotation>
+ </xsd:attribute>
+ <xsd:attribute name="message-column" use="optional" type="xsd:string" default="message">
+ <xsd:annotation><xsd:documentation xml:lang="en">The field that holds the serialized message.</xsd:documentation></xsd:annotation>
+ </xsd:attribute>
+ <xsd:attribute name="status-column" use="optional" type="xsd:string" default="status">
+ <xsd:annotation><xsd:documentation xml:lang="en">This column contents ('P', 'W', 'E' or 'D') indicates if the row is pending (P), in process (W), in error(E) or done (D) if postDelete and/or errorDelete are 'true' rows might be deleted</xsd:documentation></xsd:annotation>
+ </xsd:attribute>
+ <xsd:attribute name="insert-timestamp-column" use="optional" type="xsd:string" default="insert_timestamp">
+ <xsd:annotation><xsd:documentation xml:lang="en">Holds the timestamp when the record was inserted.</xsd:documentation></xsd:annotation>
+ </xsd:attribute>
+ <xsd:attribute name="post-delete" use="optional" type="xsd:boolean" default="true">
+ <xsd:annotation><xsd:documentation xml:lang="en">If true, records will be deleted after processing.((e.g. no rows with a 'D' for done, in column defined in 'status_column')</xsd:documentation></xsd:annotation>
+ </xsd:attribute>
+ <xsd:attribute name="error-delete" use="optional" type="xsd:boolean" default="true">
+ <xsd:annotation><xsd:documentation xml:lang="en">If true, records in error will be deleted after attempted picked up for processing.(e.g. no rows with a 'E' for error, in column defined in 'status_column')</xsd:documentation></xsd:annotation>
+ </xsd:attribute>
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="sql-bus" substitutionGroup="jesb:bus">
+ <xsd:annotation><xsd:documentation xml:lang="en">A SQL-Bus is a specific instance of a bus using the SQL protocol.</xsd:documentation></xsd:annotation>
+ <xsd:complexType>
+ <xsd:complexContent>
+ <xsd:extension base="jesb:bus">
+ <xsd:sequence>
+ <xsd:element ref="jesb:sql-message-filter" maxOccurs="1" minOccurs="0"/>
+ </xsd:sequence>
+ </xsd:extension>
+ </xsd:complexContent>
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="sql-provider" substitutionGroup="jesb:provider">
+ <xsd:annotation><xsd:documentation xml:lang="en">A specific instance of a provider, providing a db service.</xsd:documentation></xsd:annotation>
+ <xsd:complexType>
+ <xsd:complexContent>
+ <xsd:extension base="jesb:provider">
+ <xsd:attribute name="url" use="required" type="xsd:string">
+ <xsd:annotation><xsd:documentation xml:lang="en">The url needed to connect to the db.</xsd:documentation></xsd:annotation>
+ </xsd:attribute>
+ <xsd:attribute name="driver" use="required" type="xsd:string">
+ <xsd:annotation><xsd:documentation xml:lang="en">The driver needed to connect to the db.</xsd:documentation></xsd:annotation>
+ </xsd:attribute>
+ <xsd:attribute name="username" use="required" type="xsd:string">
+ <xsd:annotation><xsd:documentation xml:lang="en">The username used to access the database.</xsd:documentation></xsd:annotation>
+ </xsd:attribute>
+ <xsd:attribute name="password" use="optional" type="xsd:string">
+ <xsd:annotation><xsd:documentation xml:lang="en">The password used to access the database.</xsd:documentation></xsd:annotation>
+ </xsd:attribute>
+ </xsd:extension>
+ </xsd:complexContent>
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="sql-listener" substitutionGroup="jesb:listener">
+ <xsd:annotation><xsd:documentation xml:lang="en">A specific listener using the ftp protocol.</xsd:documentation></xsd:annotation>
+ <xsd:complexType>
+ <xsd:complexContent>
+ <xsd:extension base="jesb:listener">
+ <xsd:sequence>
+ <xsd:element ref="jesb:sql-message-filter" maxOccurs="1" minOccurs="0"/>
+ </xsd:sequence>
+ </xsd:extension>
+ </xsd:complexContent>
+ </xsd:complexType>
+ </xsd:element>
</xsd:schema>
\ No newline at end of file
More information about the jboss-svn-commits
mailing list