Author: sebb
Date: Sat Aug 18 01:00:22 2012
New Revision: 1374488
URL: http://svn.apache.org/viewvc?rev=1374488&view=rev
Log:
Add @since 3.1 markers that were forgotten
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/ftp/FTPHTTPClient.java
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPSClient.java
commons/proper/net/trunk/src/main/java/org/apache/commons/net/pop3/POP3Client.java
commons/proper/net/trunk/src/main/java/org/apache/commons/net/smtp/SMTP.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=1374488&r1=1374487&r2=1374488&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
Sat Aug 18 01:00:22 2012
@@ -504,6 +504,9 @@ implements Configurable
return reply.substring(REPLY_CODE_LEN + 1);
}
+ /**
+ * @since 3.1
+ */
protected void _parsePassiveModeReply(String reply)
throws MalformedServerReplyException
{
@@ -583,6 +586,9 @@ implements Configurable
return _storeFile(FTPCommand.getCommand(command), remote, local);
}
+ /**
+ * @since 3.1
+ */
protected boolean _storeFile(String command, String remote, InputStream
local)
throws IOException
{
@@ -632,6 +638,9 @@ implements Configurable
return _storeFileStream(FTPCommand.getCommand(command), remote);
}
+ /**
+ * @since 3.1
+ */
protected OutputStream _storeFileStream(String command, String remote)
throws IOException
{
@@ -700,6 +709,7 @@ implements Configurable
* the connection.
* @exception IOException If an I/O error occurs while either sending a
* command to the server or receiving a reply from the server.
+ * @since 3.1
*/
protected Socket _openDataConnection_(String command, String arg)
throws IOException
@@ -1739,6 +1749,9 @@ implements Configurable
return _retrieveFile(FTPCommand.getCommand(FTPCommand.RETR), remote,
local);
}
+ /**
+ * @since 3.1
+ */
protected boolean _retrieveFile(String command, String remote,
OutputStream local)
throws IOException
{
@@ -1809,6 +1822,9 @@ implements Configurable
return _retrieveFileStream(FTPCommand.getCommand(FTPCommand.RETR),
remote);
}
+ /**
+ * @since 3.1
+ */
protected InputStream _retrieveFileStream(String command, String remote)
throws IOException
{
@@ -2385,6 +2401,7 @@ implements Configurable
* as an IOException or independently as itself.
* @exception IOException If an I/O error occurs while either sending a
* command to the server or receiving a reply from the server.
+ * @since 3.1 (changed from private to protected)
*/
protected boolean restart(long offset) throws IOException
{
Modified:
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPHTTPClient.java
URL:
http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPHTTPClient.java?rev=1374488&r1=1374487&r2=1374488&view=diff
==============================================================================
---
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPHTTPClient.java
(original)
+++
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPHTTPClient.java
Sat Aug 18 01:00:22 2012
@@ -74,6 +74,7 @@ public class FTPHTTPClient extends FTPCl
* {@inheritDoc}
*
* @throws IllegalStateException if connection mode is not passive
+ * @since 3.1
*/
@Override
protected Socket _openDataConnection_(String command, String arg)
Modified:
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPSClient.java
URL:
http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPSClient.java?rev=1374488&r1=1374487&r2=1374488&view=diff
==============================================================================
---
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPSClient.java
(original)
+++
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPSClient.java
Sat Aug 18 01:00:22 2012
@@ -604,6 +604,7 @@ public class FTPSClient extends FTPClien
* after creating the socket.
* The default implementation is a no-op
* @throws IOException
+ * @since 3.1
*/
protected void _prepareDataSocket_(Socket socket)
throws IOException {
Modified:
commons/proper/net/trunk/src/main/java/org/apache/commons/net/pop3/POP3Client.java
URL:
http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/pop3/POP3Client.java?rev=1374488&r1=1374487&r2=1374488&view=diff
==============================================================================
---
commons/proper/net/trunk/src/main/java/org/apache/commons/net/pop3/POP3Client.java
(original)
+++
commons/proper/net/trunk/src/main/java/org/apache/commons/net/pop3/POP3Client.java
Sat Aug 18 01:00:22 2012
@@ -118,6 +118,7 @@ public class POP3Client extends POP3
* @return True if the command was successful, false if not.
* @exception IOException If a network I/O error occurs in the process of
* sending the CAPA command.
+ * @since 3.1 (was previously in ExtendedPOP3Client)
***/
public boolean capa() throws IOException
{
Modified:
commons/proper/net/trunk/src/main/java/org/apache/commons/net/smtp/SMTP.java
URL:
http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/smtp/SMTP.java?rev=1374488&r1=1374487&r2=1374488&view=diff
==============================================================================
---
commons/proper/net/trunk/src/main/java/org/apache/commons/net/smtp/SMTP.java
(original)
+++
commons/proper/net/trunk/src/main/java/org/apache/commons/net/smtp/SMTP.java
Sat Aug 18 01:00:22 2012
@@ -92,7 +92,11 @@ public class SMTP extends SocketClient
// the wire.
private static final String __DEFAULT_ENCODING = "ISO-8859-1";
- /** The encoding to use (user-settable) */
+ /**
+ * The encoding to use (user-settable).
+ *
+ * @since 3.1 (changed from private to protected)
+ */
protected final String encoding;
/**
