Spring/spring-integration
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Missing attribute from schema; more namespace parser tests

Browse Source
This commit is contained in:
Gary Russell
2010-03-06 20:39:04 +00:00
parent 97a36d127d
commit 5d1325ae90
11 changed files with 445 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
org.springframework.integration.ip/src/main/java/org/springframework/integration/ip/AbstractInternetProtocolReceivingChannelAdapter.java
View File

@@ -38,8 +38,6 @@ public abstract class AbstractInternetProtocolReceivingChannelAdapter
protected volatile int soReceiveBufferSize = -1;
protected volatile int soSendBufferSize = -1;
protected volatile int receiveBufferSize = 2048;
protected volatile boolean active;
@@ -72,10 +70,9 @@ public abstract class AbstractInternetProtocolReceivingChannelAdapter
}
/* (non-Javadoc)
* @see org.springframework.integration.ip.SocketOptions#setSoSendBufferSize(int)
* @see org.springframework.integration.ip.CommonSocketOptions#setSoSendBufferSize(int)
*/
public void setSoSendBufferSize(int soSendBufferSize) {
this.soSendBufferSize = soSendBufferSize;
}
public void setReceiveBufferSize(int receiveBufferSize) {

3
org.springframework.integration.ip/src/main/java/org/springframework/integration/ip/AbstractInternetProtocolSendingMessageHandler.java
View File

@@ -41,8 +41,6 @@ public abstract class AbstractInternetProtocolSendingMessageHandler implements M
protected final int port;
protected int soReceiveBufferSize = -1;
protected volatile int soSendBufferSize = -1;
protected volatile int soTimeout = -1;
@@ -71,7 +69,6 @@ public abstract class AbstractInternetProtocolSendingMessageHandler implements M
* @param size
*/
public void setSoReceiveBufferSize(int size) {
this.soReceiveBufferSize = size;
}
/**

2
org.springframework.integration.ip/src/main/java/org/springframework/integration/ip/config/IpAdapterParserUtils.java
View File

@@ -82,7 +82,7 @@ public abstract class IpAdapterParserUtils {
static final String SO_LINGER = "so-linger";
static final String SO_TCP_NODELAY = "so-tcp-nodelay";
static final String SO_TCP_NODELAY = "so-tcp-no-delay";
static final String SO_TRAFFIC_CLASS = "so-traffic-class";

2
org.springframework.integration.ip/src/main/java/org/springframework/integration/ip/tcp/AbstractTcpSendingMessageHandler.java
View File

@@ -17,8 +17,6 @@ package org.springframework.integration.ip.tcp;
import java.net.Socket;
import java.net.SocketException;
import java.util.concurrent.Executors;
import java.util.concurrent.ThreadFactory;
import org.springframework.integration.adapter.MessageMappingException;
import org.springframework.integration.core.Message;

2
org.springframework.integration.ip/src/main/java/org/springframework/integration/ip/tcp/TcpNioSendingMessageHandler.java
View File

@@ -81,7 +81,7 @@ public class TcpNioSendingMessageHandler extends
* @throws ClassNotFoundException
*/
@SuppressWarnings("unchecked")
public void setCustomSocketWriteriClassName(
public void setCustomSocketWriterClassName(
String customSocketWriterClassName) throws ClassNotFoundException {
this.customSocketWriter = (Class<NioSocketWriter>) Class
.forName(customSocketWriterClassName);

6
org.springframework.integration.ip/src/main/java/org/springframework/integration/ip/udp/UnicastReceivingChannelAdapter.java
View File

@@ -51,6 +51,8 @@ public class UnicastReceivingChannelAdapter extends AbstractInternetProtocolRece
protected volatile int poolSize = -1;
protected volatile int soSendBufferSize = -1;
private static Pattern addressPattern = Pattern.compile("([^:]*):([0-9]*)");
@@ -206,4 +208,8 @@ public class UnicastReceivingChannelAdapter extends AbstractInternetProtocolRece
}
}
public void setSoSendBufferSize(int soSendBufferSize) {
this.soSendBufferSize = soSendBufferSize;
}
}

10
org.springframework.integration.ip/src/main/java/org/springframework/integration/ip/udp/UnicastSendingMessageHandler.java
View File

@@ -76,6 +76,8 @@ public class UnicastSendingMessageHandler extends
protected volatile Exception fatalException;
protected int soReceiveBufferSize = -1;
/**
* Basic constructor; no reliability; no acknowledgment.
@@ -295,4 +297,12 @@ public class UnicastSendingMessageHandler extends
}
}
/**
* @see {@link Socket#setReceiveBufferSize(int)} and {@link DatagramSocket#setReceiveBufferSize(int)}
* @param size
*/
public void setSoReceiveBufferSize(int size) {
this.soReceiveBufferSize = size;
}
}

9
org.springframework.integration.ip/src/main/resources/org/springframework/integration/ip/config/spring-integration-ip-2.0.xsd
View File

@@ -65,10 +65,11 @@ the custom message format. See java docs for TcpNetReceivingChannelAdapter and T
<xsd:attribute name="ack-host" type="xsd:string" />
<xsd:attribute name="ack-port" type="xsd:string" />
<xsd:attribute name="ack-timeout" type="xsd:string" />
<xsd:attribute name="min-acks-for-success" type="xsd:string" />
<xsd:attribute name="time-to-live" type="xsd:string" />
<xsd:attribute name="custom-socket-writer-class-name" type="xsd:string" />
<xsd:attribute name="so-linger" type="xsd:string" />
<xsd:attribute name="so-tcp-nodelay" type="xsd:boolean" />
<xsd:attribute name="so-tcp-no-delay" type="xsd:string" />
<xsd:attribute name="so-traffic-class" type="xsd:string" />
</xsd:extension>
</xsd:complexContent>
@@ -97,7 +98,7 @@ the custom message format. See java docs for TcpNetReceivingChannelAdapter and T
<xsd:attribute name="so-timeout" type="xsd:string" />
<xsd:attribute name="check-length" type="xsd:string" />
<xsd:attribute name="multicast" type="xsd:string" />
<xsd:attribute name="using-nio" type="xsd:boolean" />
<xsd:attribute name="using-nio" type="xsd:string" />
<xsd:attribute name="message-format">
<xsd:simpleType>
<xsd:restriction base="xsd:NMTOKEN">
@@ -108,8 +109,8 @@ the custom message format. See java docs for TcpNetReceivingChannelAdapter and T
</xsd:restriction>
</xsd:simpleType>
</xsd:attribute>
<xsd:attribute name="using-direct-buffers" type="xsd:boolean" />
<xsd:attribute name="so-keep-alive" type="xsd:boolean" />
<xsd:attribute name="using-direct-buffers" type="xsd:string" />
<xsd:attribute name="so-keep-alive" type="xsd:string" />
</xsd:complexType>