Author: sebb
Date: Thu Mar 3 13:21:48 2011
New Revision: 1076615
URL: http://svn.apache.org/viewvc?rev=1076615&view=rev
Log:
Add @since markers
Modified:
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPClient.java
commons/proper/net/trunk/src/main/java/org/apache/commons/net/io/CopyStreamEvent.java
commons/proper/net/trunk/src/main/java/org/apache/commons/net/io/Util.java
commons/proper/net/trunk/src/main/java/org/apache/commons/net/pop3/ExtendedPOP3Client.java
commons/proper/net/trunk/src/main/java/org/apache/commons/net/pop3/POP3SClient.java
commons/proper/net/trunk/src/main/java/org/apache/commons/net/pop3/POP3STrustManager.java
commons/proper/net/trunk/src/main/java/org/apache/commons/net/smtp/AuthenticatingSMTPClient.java
commons/proper/net/trunk/src/main/java/org/apache/commons/net/smtp/SMTPSClient.java
commons/proper/net/trunk/src/main/java/org/apache/commons/net/smtp/SMTPSTrustManager.java
commons/proper/net/trunk/src/main/java/org/apache/commons/net/telnet/Telnet.java
commons/proper/net/trunk/src/main/java/org/apache/commons/net/telnet/TelnetClient.java
Modified:
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPClient.java
URL:
http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPClient.java?rev=1076615&r1=1076614&r2=1076615&view=diff
==============================================================================
---
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPClient.java
(original)
+++
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPClient.java
Thu Mar 3 13:21:48 2011
@@ -2907,6 +2907,7 @@ implements Configurable
* when processing file upload or download.
*
* @param controlIdle the wait (in secs) between keepalive messages. Zero
(or less) disables.
+ * @since 3.0
*/
public void setControlKeepAliveTimeout(long controlIdle){
__controlKeepAliveTimeout = controlIdle * 1000;
@@ -2915,6 +2916,7 @@ implements Configurable
/**
* Get the time to wait between sending control connection keepalive
messages.
* @return the number of seconds between keepalive messages.
+ * @since 3.0
*/
public long getControlKeepAliveTimeout() {
return __controlKeepAliveTimeout / 1000;
@@ -2924,6 +2926,7 @@ implements Configurable
* Set how long to wait for control keep-alive message replies.
*
* @param timeout number of milliseconds to wait (defaults to 1000)
+ * @since 3.0
*/
public void setControlKeepAliveReplyTimeout(int timeout) {
__controlKeepAliveReplyTimeout = timeout;
@@ -2931,11 +2934,13 @@ implements Configurable
/**
* Get how long to wait for control keep-alive message replies.
-+ */
+ * @since 3.0
+ */
public int getControlKeepAliveReplyTimeout() {
return __controlKeepAliveReplyTimeout;
}
+ // @since 3.0
private static class CSL implements CopyStreamListener {
private final FTPClient parent;
@@ -2983,6 +2988,7 @@ implements Configurable
*
* @param local the listener used by this class, may be null
* @return a merged listener or a single listener or null
+ * @since 3.0
*/
private CopyStreamListener __mergeListeners(CopyStreamListener local) {
if (local == null) {
Modified:
commons/proper/net/trunk/src/main/java/org/apache/commons/net/io/CopyStreamEvent.java
URL:
http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/io/CopyStreamEvent.java?rev=1076615&r1=1076614&r2=1076615&view=diff
==============================================================================
---
commons/proper/net/trunk/src/main/java/org/apache/commons/net/io/CopyStreamEvent.java
(original)
+++
commons/proper/net/trunk/src/main/java/org/apache/commons/net/io/CopyStreamEvent.java
Thu Mar 3 13:21:48 2011
@@ -95,7 +95,10 @@ public class CopyStreamEvent extends Eve
{
return streamSize;
}
-
+
+ /**
+ * @since 3.0
+ */
@Override
public String toString(){
return getClass().getName() + "[source=" + source
Modified:
commons/proper/net/trunk/src/main/java/org/apache/commons/net/io/Util.java
URL:
http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/io/Util.java?rev=1076615&r1=1076614&r2=1076615&view=diff
==============================================================================
--- commons/proper/net/trunk/src/main/java/org/apache/commons/net/io/Util.java
(original)
+++ commons/proper/net/trunk/src/main/java/org/apache/commons/net/io/Util.java
Thu Mar 3 13:21:48 2011
@@ -338,6 +338,7 @@ public final class Util
* Intended for use from finally blocks.
*
* @param closeable the object to close, may be {@code null}
+ * @since 3.0
*/
public static void closeQuietly(Closeable closeable) {
if (closeable != null) {
@@ -353,6 +354,7 @@ public final class Util
* Intended for use from finally blocks.
*
* @param socket the socket to close, may be {@code null}
+ * @since 3.0
*/
public static void closeQuietly(Socket socket) {
if (socket != null) {
Modified:
commons/proper/net/trunk/src/main/java/org/apache/commons/net/pop3/ExtendedPOP3Client.java
URL:
http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/pop3/ExtendedPOP3Client.java?rev=1076615&r1=1076614&r2=1076615&view=diff
==============================================================================
---
commons/proper/net/trunk/src/main/java/org/apache/commons/net/pop3/ExtendedPOP3Client.java
(original)
+++
commons/proper/net/trunk/src/main/java/org/apache/commons/net/pop3/ExtendedPOP3Client.java
Thu Mar 3 13:21:48 2011
@@ -33,6 +33,7 @@ import org.apache.commons.net.util.Base6
* A POP3 Cilent class with protocol and authentication extensions support
* (RFC2449 and RFC2195).
* @see POP3Client
+ * @since 3.0
*/
public class ExtendedPOP3Client extends POP3SClient
{
Modified:
commons/proper/net/trunk/src/main/java/org/apache/commons/net/pop3/POP3SClient.java
URL:
http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/pop3/POP3SClient.java?rev=1076615&r1=1076614&r2=1076615&view=diff
==============================================================================
---
commons/proper/net/trunk/src/main/java/org/apache/commons/net/pop3/POP3SClient.java
(original)
+++
commons/proper/net/trunk/src/main/java/org/apache/commons/net/pop3/POP3SClient.java
Thu Mar 3 13:21:48 2011
@@ -41,6 +41,7 @@ import javax.net.ssl.TrustManager;
* POP3SClient c = new POP3SClient();
* c.connect("127.0.0.1", 110);
* if (c.execTLS()) { /rest of the commands here/ }
+ * @since 3.0
*/
public class POP3SClient extends POP3Client
{
Modified:
commons/proper/net/trunk/src/main/java/org/apache/commons/net/pop3/POP3STrustManager.java
URL:
http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/pop3/POP3STrustManager.java?rev=1076615&r1=1076614&r2=1076615&view=diff
==============================================================================
---
commons/proper/net/trunk/src/main/java/org/apache/commons/net/pop3/POP3STrustManager.java
(original)
+++
commons/proper/net/trunk/src/main/java/org/apache/commons/net/pop3/POP3STrustManager.java
Thu Mar 3 13:21:48 2011
@@ -25,6 +25,7 @@ import javax.net.ssl.X509TrustManager;
/**
* Custom {@link TrustManager} implementation, taken from FTPSTrustManager.
+ * @since 3.0
*/
public class POP3STrustManager implements X509TrustManager
{
Modified:
commons/proper/net/trunk/src/main/java/org/apache/commons/net/smtp/AuthenticatingSMTPClient.java
URL:
http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/smtp/AuthenticatingSMTPClient.java?rev=1076615&r1=1076614&r2=1076615&view=diff
==============================================================================
---
commons/proper/net/trunk/src/main/java/org/apache/commons/net/smtp/AuthenticatingSMTPClient.java
(original)
+++
commons/proper/net/trunk/src/main/java/org/apache/commons/net/smtp/AuthenticatingSMTPClient.java
Thu Mar 3 13:21:48 2011
@@ -34,6 +34,7 @@ import org.apache.commons.net.util.Base6
* An SMTP Client class with authentication support (RFC4954).
*
* @see SMTPClient
+ * @since 3.0
*/
public class AuthenticatingSMTPClient extends SMTPSClient
{
Modified:
commons/proper/net/trunk/src/main/java/org/apache/commons/net/smtp/SMTPSClient.java
URL:
http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/smtp/SMTPSClient.java?rev=1076615&r1=1076614&r2=1076615&view=diff
==============================================================================
---
commons/proper/net/trunk/src/main/java/org/apache/commons/net/smtp/SMTPSClient.java
(original)
+++
commons/proper/net/trunk/src/main/java/org/apache/commons/net/smtp/SMTPSClient.java
Thu Mar 3 13:21:48 2011
@@ -41,6 +41,7 @@ import javax.net.ssl.TrustManager;
* SMTPSClient c = new SMTPSClient();
* c.connect("127.0.0.1", 25);
* if (c.execTLS()) { /rest of the commands here/ }
+ * @since 3.0
*/
public class SMTPSClient extends SMTPClient
{
Modified:
commons/proper/net/trunk/src/main/java/org/apache/commons/net/smtp/SMTPSTrustManager.java
URL:
http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/smtp/SMTPSTrustManager.java?rev=1076615&r1=1076614&r2=1076615&view=diff
==============================================================================
---
commons/proper/net/trunk/src/main/java/org/apache/commons/net/smtp/SMTPSTrustManager.java
(original)
+++
commons/proper/net/trunk/src/main/java/org/apache/commons/net/smtp/SMTPSTrustManager.java
Thu Mar 3 13:21:48 2011
@@ -25,6 +25,7 @@ import javax.net.ssl.X509TrustManager;
/**
* Custom {@link TrustManager} implementation, taken from FTPSTrustManager.
+ * @since 3.0
*/
public class SMTPSTrustManager implements X509TrustManager
{
Modified:
commons/proper/net/trunk/src/main/java/org/apache/commons/net/telnet/Telnet.java
URL:
http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/telnet/Telnet.java?rev=1076615&r1=1076614&r2=1076615&view=diff
==============================================================================
---
commons/proper/net/trunk/src/main/java/org/apache/commons/net/telnet/Telnet.java
(original)
+++
commons/proper/net/trunk/src/main/java/org/apache/commons/net/telnet/Telnet.java
Thu Mar 3 13:21:48 2011
@@ -813,7 +813,8 @@ class Telnet extends SocketClient
*
* @param cmd - command data to be sent
* @throws IOException - Exception in I/O.
- **/
+ * @since 3.0
+ */
final synchronized void _sendCommand(byte cmd) throws IOException
{
_output_.write(TelnetCommand.IAC);
Modified:
commons/proper/net/trunk/src/main/java/org/apache/commons/net/telnet/TelnetClient.java
URL:
http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/telnet/TelnetClient.java?rev=1076615&r1=1076614&r2=1076615&view=diff
==============================================================================
---
commons/proper/net/trunk/src/main/java/org/apache/commons/net/telnet/TelnetClient.java
(original)
+++
commons/proper/net/trunk/src/main/java/org/apache/commons/net/telnet/TelnetClient.java
Thu Mar 3 13:21:48 2011
@@ -222,6 +222,7 @@ public class TelnetClient extends Telnet
* @param message option code followed by subnegotiation payload
* @throws IllegalArgumentException if {@code message} has length zero
* @throws IOException if an I/O error occurs while writing the message
+ * @since 3.0
***/
public void sendSubnegotiation(int[] message)
throws IOException, IllegalArgumentException
@@ -242,6 +243,7 @@ public class TelnetClient extends Telnet
*
* @param command the code for the command
* @throws IOException if an I/O error occurs while writing the message
+ * @since 3.0
***/
public void sendCommand(byte command)
throws IOException, IllegalArgumentException