[jboss-svn-commits] JBL Code SVN: r8777 - in labs/jbossesb/trunk/product: core/listeners/tests/src/org/jboss/soa/esb/listeners/config and 1 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Jan 9 13:39:32 EST 2007
Author: kurt.stam at jboss.com
Date: 2007-01-09 13:39:28 -0500 (Tue, 09 Jan 2007)
New Revision: 8777
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/SqlListenerMapper.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_02.xml
labs/jbossesb/trunk/product/etc/schemas/xml/jbossesb-1.0.xsd
Log:
jira JBESB-350 Adding pollLatencySeconds.
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-09 17:27:51 UTC (rev 8776)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/config/mappers/FsListenerMapper.java 2007-01-09 18:39:28 UTC (rev 8777)
@@ -72,7 +72,7 @@
throw new ConfigurationException("No <fs-detination> defined on either <fs-listener> [" + listener.getName() + "] or <fs-bus> [" + bus.getBusid() + "].");
}
}
-
+ listenerNode.setAttribute("pollLatencySeconds", String.valueOf(listener.getPollFrequencySeconds()));
// 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.
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-09 17:27:51 UTC (rev 8776)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/config/mappers/FtpListenerMapper.java 2007-01-09 18:39:28 UTC (rev 8777)
@@ -22,6 +22,7 @@
import org.jboss.soa.esb.ConfigurationException;
import org.jboss.soa.esb.addressing.eprs.FTPEpr;
+import org.jboss.soa.esb.addressing.eprs.SFTPEpr;
import org.jboss.soa.esb.listeners.ListenerTagNames;
import org.jboss.soa.esb.listeners.config.YADOMUtil;
import org.jboss.soa.esb.listeners.config.FtpBusDocument.FtpBus;
@@ -72,7 +73,7 @@
throw new ConfigurationException("No <ftp-detination> defined on either <ftp-listener> [" + listener.getName() + "] or <ftp-bus> [" + bus.getBusid() + "].");
}
}
-
+ listenerNode.setAttribute("pollLatencySeconds", String.valueOf(listener.getPollFrequencySeconds()));
// 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.
@@ -102,8 +103,9 @@
return listenerNode;
}
- private static void mapFtpEprProperties(Element toElement, FtpProvider provider, FtpMessageFilter messageFilter) {
- toElement.setAttribute(ListenerTagNames.URL_TAG, "ftp://" + messageFilter.getUsername() + ":"
+ private static void mapFtpEprProperties(Element toElement, FtpProvider provider, FtpMessageFilter messageFilter)
+ {
+ toElement.setAttribute(ListenerTagNames.URL_TAG, messageFilter.getProtocol() + "://" + messageFilter.getUsername() + ":"
+ messageFilter.getPassword() + "@" + provider.getHostname() + ":" + messageFilter.getDirectory());
toElement.setAttribute(FTPEpr.INPUT_SUFFIX_TAG, messageFilter.getInputSuffix());
toElement.setAttribute(FTPEpr.WORK_SUFFIX_TAG, messageFilter.getWorkSuffix());
@@ -118,5 +120,8 @@
toElement.setAttribute(FTPEpr.ERROR_SUFFIX_TAG, messageFilter.getErrorSuffix());
}
toElement.setAttribute(FTPEpr.PASSIVE_TAG, String.valueOf(messageFilter.getPassive()));
+ if ("sftp".equals(messageFilter.getProtocol()) || "ftps".equals(messageFilter.getProtocol())) {
+ toElement.setAttribute(SFTPEpr.CERTIFICATE_TAG, messageFilter.getCertificateUrl());
+ }
}
}
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-09 17:27:51 UTC (rev 8776)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/config/mappers/SqlListenerMapper.java 2007-01-09 18:39:28 UTC (rev 8777)
@@ -72,7 +72,7 @@
throw new ConfigurationException("No <sql-detination> defined on either <sql-listener> [" + listener.getName() + "] or <sql-bus> [" + bus.getBusid() + "].");
}
}
-
+ listenerNode.setAttribute("pollLatencySeconds", String.valueOf(listener.getPollFrequencySeconds()));
// 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.
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-09 17:27:51 UTC (rev 8776)
+++ labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/config/GeneratorUnitTest.java 2007-01-09 18:39:28 UTC (rev 8777)
@@ -88,7 +88,10 @@
assertTrue(awareConfig.exists());
actualESBAwareConfig = FileUtil.readTextFile(awareConfig);
System.out.println("[" + actualESBAwareConfig + "]");
- assertEquals(expectedESBAwareConfig, removeEOL(actualESBAwareConfig));
+ actualESBAwareConfig = removeEOL(actualESBAwareConfig);
+ boolean isIndentical = expectedESBAwareConfig.equals(actualESBAwareConfig);
+ System.out.println("Strings identical=" + isIndentical);
+ assertEquals(expectedESBAwareConfig, actualESBAwareConfig);
}
public void test_bad_base_listener_busref() throws ConfigurationException, IOException {
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-09 17:27:51 UTC (rev 8776)
+++ labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/config/jbossesb_config_01.xml 2007-01-09 18:39:28 UTC (rev 8777)
@@ -89,7 +89,8 @@
<listeners>
<fs-listener name="test-fs-listener"
busidref="SambaFS-Temp"
- maxThreads="1"/>
+ maxThreads="1"
+ poll-frequency-seconds="10"/>
</listeners>
<actions>
<action name="TestDefaultRouteAction" process="route" class="org.jboss.soa.esb.actions.CbrProxyAction"/>
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-09 17:27:51 UTC (rev 8776)
+++ labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/config/jbossesb_config_01_esbaware.xml 2007-01-09 18:39:28 UTC (rev 8777)
@@ -30,15 +30,15 @@
Some CDATA data...
</action>
</Bank-Listener-Generic>
-<test-fs-listener listenerClass="org.jboss.soa.esb.listeners.message.MessageAwareListener" maxThreads="1" service-category="Test1" service-description="File System Test" service-name="FSTest">
+<test-fs-listener listenerClass="org.jboss.soa.esb.listeners.message.MessageAwareListener" maxThreads="1" pollLatencySeconds="10" service-category="Test1" service-description="File System Test" service-name="FSTest">
<EPR URL="file:///C:/Temp" errorDelete="true" inputSuffix=".txt" postDelete="true" workSuffix=".esbInProcess"/>
<action action="TestDefaultRouteAction" class="org.jboss.soa.esb.actions.CbrProxyAction" process="route"/>
</test-fs-listener>
-<test-ftp-listener listenerClass="org.jboss.soa.esb.listeners.message.MessageAwareListener" maxThreads="1" service-category="Test2" service-description="FTP server Test" service-name="FTPTest">
+<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" service-category="Test3" service-description="SQL server Test" service-name="SQLTest">
+<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>
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-09 17:27:51 UTC (rev 8776)
+++ labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/config/jbossesb_config_02.xml 2007-01-09 18:39:28 UTC (rev 8777)
@@ -125,7 +125,9 @@
<listeners>
<listener name="test-fs-listener"
busidref="SambaFS-Temp"
- maxThreads="1"/>
+ maxThreads="1">
+ <property name="pollLatencySeconds" value="10" />
+ </listener>
</listeners>
<actions>
<action name="TestDefaultRouteAction" process="route" class="org.jboss.soa.esb.actions.CbrProxyAction"/>
@@ -137,7 +139,9 @@
<listeners>
<listener name="test-ftp-listener"
busidref="Ftp-ServerTest"
- maxThreads="1"/>
+ maxThreads="1">
+ <property name="pollLatencySeconds" value="10" />
+ </listener>
</listeners>
<actions>
<action name="TestFtpRouteAction" process="route" class="org.jboss.soa.esb.actions.CbrProxyAction"/>
@@ -149,7 +153,9 @@
<listeners>
<listener name="test-sql-listener"
busidref="SQL-Test"
- maxThreads="1"/>
+ maxThreads="1">
+ <property name="pollLatencySeconds" value="10" />
+ </listener>
</listeners>
<actions>
<action name="TestSqlRouteAction" process="route" class="org.jboss.soa.esb.actions.CbrProxyAction"/>
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-09 17:27:51 UTC (rev 8776)
+++ labs/jbossesb/trunk/product/etc/schemas/xml/jbossesb-1.0.xsd 2007-01-09 18:39:28 UTC (rev 8777)
@@ -351,6 +351,16 @@
<xsd:sequence>
<xsd:element ref="jesb:fs-message-filter" maxOccurs="1" minOccurs="0"/>
</xsd:sequence>
+ <xsd:attribute name="poll-frequency-seconds" use="optional" default="10">
+ <xsd:annotation>
+ <xsd:documentation xml:lang="en">The frequency with which this listener polls fs in seconds. Defaults to 10 seconds.</xsd:documentation>
+ </xsd:annotation>
+ <xsd:simpleType>
+ <xsd:restriction base="xsd:integer">
+ <xsd:minExclusive value="0"/>
+ </xsd:restriction>
+ </xsd:simpleType>
+ </xsd:attribute>
</xsd:extension>
</xsd:complexContent>
</xsd:complexType>
@@ -398,6 +408,19 @@
<xsd:attribute name="passive" use="optional" type="xsd:boolean">
<xsd:annotation><xsd:documentation xml:lang="en">This is an ftp server setting which may vary per session.</xsd:documentation></xsd:annotation>
</xsd:attribute>
+ <xsd:attribute name="protocol" use="optional" default="ftp">
+ <xsd:annotation><xsd:documentation xml:lang="en">The protocol, can be sftp (SSH File Transfer Protocol), ftps (FTP over SLL) and ftp (to which it defaults).</xsd:documentation></xsd:annotation>
+ <xsd:simpleType>
+ <xsd:restriction base = "xsd:NMTOKEN">
+ <xsd:enumeration value = "ftp"/>
+ <xsd:enumeration value = "ftps"/>
+ <xsd:enumeration value = "sftp"/>
+ </xsd:restriction>
+ </xsd:simpleType>
+ </xsd:attribute>
+ <xsd:attribute name="certificate-url" use="optional" type="xsd:string">
+ <xsd:annotation><xsd:documentation xml:lang="en">The url to a certificate, which can be needed for secure protocols (sftp and ftps).</xsd:documentation></xsd:annotation>
+ </xsd:attribute>
</xsd:complexType>
</xsd:element>
<xsd:element name="ftp-bus" substitutionGroup="jesb:bus">
@@ -432,6 +455,16 @@
<xsd:sequence>
<xsd:element ref="jesb:ftp-message-filter" maxOccurs="1" minOccurs="0"/>
</xsd:sequence>
+ <xsd:attribute name="poll-frequency-seconds" use="optional" default="10">
+ <xsd:annotation>
+ <xsd:documentation xml:lang="en">The frequency with which this listener polls ftp server in seconds. Defaults to 10 seconds.</xsd:documentation>
+ </xsd:annotation>
+ <xsd:simpleType>
+ <xsd:restriction base="xsd:integer">
+ <xsd:minExclusive value="0"/>
+ </xsd:restriction>
+ </xsd:simpleType>
+ </xsd:attribute>
</xsd:extension>
</xsd:complexContent>
</xsd:complexType>
@@ -507,6 +540,16 @@
<xsd:sequence>
<xsd:element ref="jesb:sql-message-filter" maxOccurs="1" minOccurs="0"/>
</xsd:sequence>
+ <xsd:attribute name="poll-frequency-seconds" use="optional" default="10">
+ <xsd:annotation>
+ <xsd:documentation xml:lang="en">The frequency with which this listener polls the db in seconds. Defaults to 10 seconds.</xsd:documentation>
+ </xsd:annotation>
+ <xsd:simpleType>
+ <xsd:restriction base="xsd:integer">
+ <xsd:minExclusive value="0"/>
+ </xsd:restriction>
+ </xsd:simpleType>
+ </xsd:attribute>
</xsd:extension>
</xsd:complexContent>
</xsd:complexType>
More information about the jboss-svn-commits
mailing list