fixed various javadoc warnings; downgraded maven-javadoc-plugin to 2.5, as that's the version that gets forced when using Maven 2.1.0 anyway.

spring-integration-ip/src/main/java/org/springframework/integration/ip/CommonSocketOptions.java

@@ -16,6 +16,9 @@
 
 package org.springframework.integration.ip;
 
+import java.net.DatagramSocket;
+import java.net.Socket;
+
 /**
  * @author Gary Russell
  * @since 2.0
@@ -25,21 +28,18 @@ public interface CommonSocketOptions {
 	/**
 	 * @see Socket#setSoTimeout(int)
 	 * @see DatagramSocket#setSoTimeout(int)
-	 * @param timeout
 	 */
 	public void setSoTimeout(int soTimeout);
 
 	/**
 	 * @see Socket#setReceiveBufferSize(int)
 	 * @see DatagramSocket#setReceiveBufferSize(int)
-	 * @param size
 	 */
 	public void setSoReceiveBufferSize(int soReceiveBufferSize);
 
 	/**
 	 * @see Socket#setSendBufferSize(int)
 	 * @see DatagramSocket#setSendBufferSize(int)
-	 * @param size
 	 */
 	public void setSoSendBufferSize(int soSendBufferSize);
 	

spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/AbstractSocketWriter.java

@@ -32,7 +32,7 @@ import org.apache.commons.logging.LogFactory;
  * {@link java.nio.channels.SocketChannel} implementations are provided for
  * the standard formats. Users requiring other formats should subclass the
  * appropriate implementation, and provide an implementation for 
- * {@link #writeCustomFormat(byte[])} which is invoked by {@link #write(byte[])}
+ * {@link #writeCustomFormat(Object)} which is invoked by {@link #write(Object)}
  * when the format is {@link MessageFormats#FORMAT_CUSTOM}. 
  * 
  * @author Gary Russell
@@ -46,7 +46,7 @@ public abstract class AbstractSocketWriter implements SocketWriter, MessageForma
     protected final Log logger = LogFactory.getLog(this.getClass());
 
     /*
-	 * @see org.springframework.integration.ip.tcp.SocketWriter#write(byte[])
+	 * @see org.springframework.integration.ip.tcp.SocketWriter#write(Object)
 	 */
 	public synchronized void write(Object object) throws IOException {
 		try {
@@ -100,19 +100,16 @@ public abstract class AbstractSocketWriter implements SocketWriter, MessageForma
 
 	/**
 	 * Write the data, followed by carriage return, line feed ('\r\n').
-	 * @param bytes
 	 */
 	protected abstract void writeCrLfFormat(byte[] bytes) throws IOException;
 
 	/**
 	 * Write the data, followed by carriage return, line feed ('\r\n').
-	 * @param bytes
 	 */
 	protected abstract void writeSerializedFormat(Object object) throws IOException;
 
 	/**
 	 * Write the data using some custom protocol.
-	 * @param bytes
 	 */
 	protected abstract void writeCustomFormat(Object object) throws IOException;
 

spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/NetSocketReader.java

@@ -159,7 +159,7 @@ public class NetSocketReader extends AbstractSocketReader {
 	 * Throws {@link UnsupportedOperationException}; custom implementations can
 	 * subclass this class and provide an implementation for this method.
 	 * @throws IOException 
-	 * @see org.springframework.integration.ip.tcp.AbstractSocketReader#assembleDataCustomFormat().
+	 * @see org.springframework.integration.ip.tcp.AbstractSocketReader#assembleDataCustomFormat
 	 * 
 	 */
 	@Override

spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/NioSocketReader.java

@@ -240,7 +240,7 @@ public class NioSocketReader extends AbstractSocketReader {
 	 * Throws {@link UnsupportedOperationException}; Java serialization is currently only
 	 * supported using the NetSocketReader.
 	 * @throws IOException 
-	 * @see org.springframework.integration.ip.tcp.AbstractSocketReader#assembleDataCustomFormat().
+	 * @see org.springframework.integration.ip.tcp.AbstractSocketReader#assembleDataCustomFormat
 	 * 
 	 */
 	protected int assembleDataSerializedFormat() throws IOException {
@@ -252,7 +252,7 @@ public class NioSocketReader extends AbstractSocketReader {
 	 * Throws {@link UnsupportedOperationException}; custom implementations can
 	 * subclass this class and provide an implementation.
 	 * @throws IOException 
-	 * @see org.springframework.integration.ip.tcp.AbstractSocketReader#assembleDataCustomFormat().
+	 * @see org.springframework.integration.ip.tcp.AbstractSocketReader#assembleDataCustomFormat
 	 * 
 	 */
 	@Override

spring-integration-ip/src/main/java/org/springframework/integration/ip/udp/MulticastSendingMessageHandler.java

@@ -22,7 +22,6 @@ import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.net.MulticastSocket;
 import java.net.NetworkInterface;
-import java.net.SocketAddress;
 
 import org.springframework.integration.message.MessageHandler;