commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1489361 - in /commons/proper/net/trunk: ./ src/changes/ src/main/java/examples/ftp/ src/main/java/examples/telnet/ src/main/java/org/apache/commons/net/ src/main/java/org/apache/commons/net/bsd/ src/main/java/org/apache/commons/net/daytime...
Date Tue, 04 Jun 2013 09:48:38 GMT
Author: sebb
Date: Tue Jun  4 09:48:36 2013
New Revision: 1489361

URL: http://svn.apache.org/r1489361
Log:
Restore Java 1.5 compatibility
All code changes are marked with Java 1.6 so can easily be found later
@Overrides are commented out rather than removed (easier to do global replace)

Modified:
    commons/proper/net/trunk/pom.xml
    commons/proper/net/trunk/src/changes/changes.xml
    commons/proper/net/trunk/src/main/java/examples/ftp/FTPClientExample.java
    commons/proper/net/trunk/src/main/java/examples/telnet/TelnetClientExample.java
    commons/proper/net/trunk/src/main/java/org/apache/commons/net/DatagramSocketClient.java
    commons/proper/net/trunk/src/main/java/org/apache/commons/net/DefaultDatagramSocketFactory.java
    commons/proper/net/trunk/src/main/java/org/apache/commons/net/PrintCommandListener.java
    commons/proper/net/trunk/src/main/java/org/apache/commons/net/SocketClient.java
    commons/proper/net/trunk/src/main/java/org/apache/commons/net/bsd/RExecClient.java
    commons/proper/net/trunk/src/main/java/org/apache/commons/net/daytime/DaytimeTCPClient.java
    commons/proper/net/trunk/src/main/java/org/apache/commons/net/daytime/DaytimeUDPClient.java
    commons/proper/net/trunk/src/main/java/org/apache/commons/net/finger/FingerClient.java
    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/FTPFileEntryParserImpl.java
    commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPFileFilters.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/FTPSTrustManager.java
    commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/CompositeFileEntryParser.java
    commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/ConfigurableFTPFileEntryParserImpl.java
    commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/DefaultFTPFileEntryParserFactory.java
    commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/EnterpriseUnixFTPEntryParser.java
    commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/FTPTimestampParserImpl.java
    commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/MLSxEntryParser.java
    commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/MVSFTPEntryParser.java
    commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/MacOsPeterFTPEntryParser.java
    commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/NTFTPEntryParser.java
    commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/NetwareFTPEntryParser.java
    commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/OS2FTPEntryParser.java
    commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/OS400FTPEntryParser.java
    commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/UnixFTPEntryParser.java
    commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/VMSFTPEntryParser.java
    commons/proper/net/trunk/src/main/java/org/apache/commons/net/imap/AuthenticatingIMAPClient.java
    commons/proper/net/trunk/src/main/java/org/apache/commons/net/io/CopyStreamAdapter.java
    commons/proper/net/trunk/src/main/java/org/apache/commons/net/nntp/Article.java
    commons/proper/net/trunk/src/main/java/org/apache/commons/net/nntp/ArticleIterator.java
    commons/proper/net/trunk/src/main/java/org/apache/commons/net/nntp/NewsgroupIterator.java
    commons/proper/net/trunk/src/main/java/org/apache/commons/net/nntp/ReplyIterator.java
    commons/proper/net/trunk/src/main/java/org/apache/commons/net/ntp/NtpV3Impl.java
    commons/proper/net/trunk/src/main/java/org/apache/commons/net/ntp/TimeStamp.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/POP3Client.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/telnet/Telnet.java
    commons/proper/net/trunk/src/main/java/org/apache/commons/net/telnet/TelnetInputStream.java
    commons/proper/net/trunk/src/main/java/org/apache/commons/net/util/KeyManagerUtils.java
    commons/proper/net/trunk/src/main/java/org/apache/commons/net/util/ListenerList.java
    commons/proper/net/trunk/src/main/java/org/apache/commons/net/util/TrustManagerUtils.java
    commons/proper/net/trunk/src/test/java/org/apache/commons/net/ftp/FTPClientConfigFunctionalTest.java
    commons/proper/net/trunk/src/test/java/org/apache/commons/net/ftp/parser/MLSDComparison.java
    commons/proper/net/trunk/src/test/java/org/apache/commons/net/io/ToNetASCIIInputStreamTest.java
    commons/proper/net/trunk/src/test/java/org/apache/commons/net/telnet/TelnetClientTest.java
    commons/proper/net/trunk/src/test/java/org/apache/commons/net/telnet/TelnetTestResponder.java
    commons/proper/net/trunk/src/test/java/org/apache/commons/net/telnet/TelnetTestSimpleServer.java
    commons/proper/net/trunk/src/test/java/org/apache/commons/net/tftp/TFTPServer.java
    commons/proper/net/trunk/src/test/java/org/apache/commons/net/time/TimeTestSimpleServer.java

Modified: commons/proper/net/trunk/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/pom.xml?rev=1489361&r1=1489360&r2=1489361&view=diff
==============================================================================
--- commons/proper/net/trunk/pom.xml (original)
+++ commons/proper/net/trunk/pom.xml Tue Jun  4 09:48:36 2013
@@ -129,13 +129,13 @@ Supported protocols include: Echo, Finge
     </distributionManagement>
 
     <properties>
-        <maven.compile.source>1.6</maven.compile.source>
-        <maven.compile.target>1.6</maven.compile.target>
-        <commons.javadoc.java.link>http://download.oracle.com/javase/1.6.0/docs/api/</commons.javadoc.java.link>
+        <maven.compile.source>1.5</maven.compile.source>
+        <maven.compile.target>1.5</maven.compile.target>
+        <commons.javadoc.java.link>http://download.oracle.com/javase/1.5.0/docs/api/</commons.javadoc.java.link>
         <commons.componentid>net</commons.componentid>
         <commons.release.version>3.3</commons.release.version>
         <commons.rc.version>RC1</commons.rc.version>
-        <commons.release.desc>(Requires Java 1.6 or later)</commons.release.desc>
+        <commons.release.desc>(Requires Java 1.5 or later)</commons.release.desc>
         <commons.release.2.version>3.2</commons.release.2.version>
         <commons.release.2.desc>(Requires Java 1.5 or later)</commons.release.2.desc>
         <commons.release.3.version>1.4.1</commons.release.3.version>

Modified: commons/proper/net/trunk/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/changes/changes.xml?rev=1489361&r1=1489360&r2=1489361&view=diff
==============================================================================
--- commons/proper/net/trunk/src/changes/changes.xml (original)
+++ commons/proper/net/trunk/src/changes/changes.xml Tue Jun  4 09:48:36 2013
@@ -94,9 +94,6 @@ The <action> type attribute can be add,u
             <action issue="NET-492" dev="sebb" type="fix">
             FTPClient.printWorkingDirectory() incorrectly parses certain valid PWD command results
             </action>
-            <action dev="ggregory" type="update">
-            Updated code to require Java 1.6
-            </action>
         </release>
         <release version="3.2" date="2012-12-03" description="
 This release fixes bugs and adds some new functionality (see below).

Modified: commons/proper/net/trunk/src/main/java/examples/ftp/FTPClientExample.java
URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/examples/ftp/FTPClientExample.java?rev=1489361&r1=1489360&r2=1489361&view=diff
==============================================================================
--- commons/proper/net/trunk/src/main/java/examples/ftp/FTPClientExample.java (original)
+++ commons/proper/net/trunk/src/main/java/examples/ftp/FTPClientExample.java Tue Jun  4 09:48:36 2013
@@ -462,12 +462,12 @@ __main:
     private static CopyStreamListener createListener(){
         return new CopyStreamListener(){
             private long megsTotal = 0;
-            @Override
+//            @Override
             public void bytesTransferred(CopyStreamEvent event) {
                 bytesTransferred(event.getTotalBytesTransferred(), event.getBytesTransferred(), event.getStreamSize());
             }
 
-            @Override
+//            @Override
             public void bytesTransferred(long totalBytesTransferred,
                     int bytesTransferred, long streamSize) {
                 long megs = totalBytesTransferred / 1000000;

Modified: commons/proper/net/trunk/src/main/java/examples/telnet/TelnetClientExample.java
URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/examples/telnet/TelnetClientExample.java?rev=1489361&r1=1489360&r2=1489361&view=diff
==============================================================================
--- commons/proper/net/trunk/src/main/java/examples/telnet/TelnetClientExample.java (original)
+++ commons/proper/net/trunk/src/main/java/examples/telnet/TelnetClientExample.java Tue Jun  4 09:48:36 2013
@@ -267,7 +267,7 @@ public class TelnetClientExample impleme
      * @param option_code - code of the option negotiated
      * <p>
      ***/
-    @Override
+//    @Override
     public void receivedNegotiation(int negotiation_code, int option_code)
     {
         String command = null;
@@ -295,7 +295,7 @@ public class TelnetClientExample impleme
      * Reads lines from the TelnetClient and echoes them
      * on the screen.
      ***/
-    @Override
+//    @Override
     public void run()
     {
         InputStream instr = tc.getInputStream();

Modified: commons/proper/net/trunk/src/main/java/org/apache/commons/net/DatagramSocketClient.java
URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/DatagramSocketClient.java?rev=1489361&r1=1489360&r2=1489361&view=diff
==============================================================================
--- commons/proper/net/trunk/src/main/java/org/apache/commons/net/DatagramSocketClient.java (original)
+++ commons/proper/net/trunk/src/main/java/org/apache/commons/net/DatagramSocketClient.java Tue Jun  4 09:48:36 2013
@@ -282,6 +282,17 @@ public abstract class DatagramSocketClie
     }
 
     /**
+     * Gets the charset name.
+     * 
+     * @return the charset name.
+     * @since 3.3
+     * TODO Will be deprecated once the code requires Java 1.6 as a mininmum
+     */
+    public String getCharsetName() {
+        return charset.name();
+    }
+
+    /**
      * Gets the charset.
      * 
      * @return the charset.

Modified: commons/proper/net/trunk/src/main/java/org/apache/commons/net/DefaultDatagramSocketFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/DefaultDatagramSocketFactory.java?rev=1489361&r1=1489360&r2=1489361&view=diff
==============================================================================
--- commons/proper/net/trunk/src/main/java/org/apache/commons/net/DefaultDatagramSocketFactory.java (original)
+++ commons/proper/net/trunk/src/main/java/org/apache/commons/net/DefaultDatagramSocketFactory.java Tue Jun  4 09:48:36 2013
@@ -42,7 +42,7 @@ public class DefaultDatagramSocketFactor
      * <p>
      * @exception SocketException If the socket could not be created.
      ***/
-    @Override
+//    @Override
     public DatagramSocket createDatagramSocket() throws SocketException
     {
         return new DatagramSocket();
@@ -54,7 +54,7 @@ public class DefaultDatagramSocketFactor
      * @param port The port to use for the socket.
      * @exception SocketException If the socket could not be created.
      ***/
-    @Override
+//    @Override
     public DatagramSocket createDatagramSocket(int port) throws SocketException
     {
         return new DatagramSocket(port);
@@ -68,7 +68,7 @@ public class DefaultDatagramSocketFactor
      * @param laddr  The local address to use.
      * @exception SocketException If the socket could not be created.
      ***/
-    @Override
+//    @Override
     public DatagramSocket createDatagramSocket(int port, InetAddress laddr)
     throws SocketException
     {

Modified: commons/proper/net/trunk/src/main/java/org/apache/commons/net/PrintCommandListener.java
URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/PrintCommandListener.java?rev=1489361&r1=1489360&r2=1489361&view=diff
==============================================================================
--- commons/proper/net/trunk/src/main/java/org/apache/commons/net/PrintCommandListener.java (original)
+++ commons/proper/net/trunk/src/main/java/org/apache/commons/net/PrintCommandListener.java Tue Jun  4 09:48:36 2013
@@ -147,7 +147,7 @@ public class PrintCommandListener implem
         __directionMarker = showDirection;
     }
 
-    @Override
+//    @Override
     public void protocolCommandSent(ProtocolCommandEvent event)
     {
         if (__directionMarker) {
@@ -189,7 +189,7 @@ public class PrintCommandListener implem
         }
         return msg;
     }
-    @Override
+//    @Override
     public void protocolReplyReceived(ProtocolCommandEvent event)
     {
         if (__directionMarker) {

Modified: commons/proper/net/trunk/src/main/java/org/apache/commons/net/SocketClient.java
URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/SocketClient.java?rev=1489361&r1=1489360&r2=1489361&view=diff
==============================================================================
--- commons/proper/net/trunk/src/main/java/org/apache/commons/net/SocketClient.java (original)
+++ commons/proper/net/trunk/src/main/java/org/apache/commons/net/SocketClient.java Tue Jun  4 09:48:36 2013
@@ -833,6 +833,17 @@ public abstract class SocketClient
     }
 
     /**
+     * Gets the charset name.
+     * 
+     * @return the charset.
+     * @since 3.3
+     * TODO Will be deprecated once the code requires Java 1.6 as a mininmum 
+     */
+    public String getCharsetName() {
+        return charset.name();
+    }
+
+    /**
      * Gets the charset.
      * 
      * @return the charset.

Modified: commons/proper/net/trunk/src/main/java/org/apache/commons/net/bsd/RExecClient.java
URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/bsd/RExecClient.java?rev=1489361&r1=1489360&r2=1489361&view=diff
==============================================================================
--- commons/proper/net/trunk/src/main/java/org/apache/commons/net/bsd/RExecClient.java (original)
+++ commons/proper/net/trunk/src/main/java/org/apache/commons/net/bsd/RExecClient.java Tue Jun  4 09:48:36 2013
@@ -215,11 +215,11 @@ public class RExecClient extends SocketC
             _output_.write(NULL_CHAR);
         }
 
-        _output_.write(username.getBytes(this.getCharset()));
+        _output_.write(username.getBytes(this.getCharsetName())); // Java 1.6 can use getCharset()
         _output_.write(NULL_CHAR);
-        _output_.write(password.getBytes(this.getCharset()));
+        _output_.write(password.getBytes(this.getCharsetName())); // Java 1.6 can use getCharset()
         _output_.write(NULL_CHAR);
-        _output_.write(command.getBytes(this.getCharset()));
+        _output_.write(command.getBytes(this.getCharsetName())); // Java 1.6 can use getCharset()
         _output_.write(NULL_CHAR);
         _output_.flush();
 

Modified: commons/proper/net/trunk/src/main/java/org/apache/commons/net/daytime/DaytimeTCPClient.java
URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/daytime/DaytimeTCPClient.java?rev=1489361&r1=1489360&r2=1489361&view=diff
==============================================================================
--- commons/proper/net/trunk/src/main/java/org/apache/commons/net/daytime/DaytimeTCPClient.java (original)
+++ commons/proper/net/trunk/src/main/java/org/apache/commons/net/daytime/DaytimeTCPClient.java Tue Jun  4 09:48:36 2013
@@ -71,7 +71,7 @@ public final class DaytimeTCPClient exte
         StringBuilder result = new StringBuilder(__buffer.length);
         BufferedReader reader;
 
-        reader = new BufferedReader(new InputStreamReader(_input_, this.getCharset()));
+        reader = new BufferedReader(new InputStreamReader(_input_, this.getCharsetName())); // Java 1.6 can use getCharset()
 
         while (true)
         {

Modified: commons/proper/net/trunk/src/main/java/org/apache/commons/net/daytime/DaytimeUDPClient.java
URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/daytime/DaytimeUDPClient.java?rev=1489361&r1=1489360&r2=1489361&view=diff
==============================================================================
--- commons/proper/net/trunk/src/main/java/org/apache/commons/net/daytime/DaytimeUDPClient.java (original)
+++ commons/proper/net/trunk/src/main/java/org/apache/commons/net/daytime/DaytimeUDPClient.java Tue Jun  4 09:48:36 2013
@@ -67,7 +67,7 @@ public final class DaytimeUDPClient exte
         _socket_.send(sendPacket);
         _socket_.receive(receivePacket);
 
-        return new String(receivePacket.getData(), 0, receivePacket.getLength(), this.getCharset());
+        return new String(receivePacket.getData(), 0, receivePacket.getLength(), this.getCharsetName()); // Java 1.6 can use getCharset()
     }
 
     /** Same as <code>getTime(host, DaytimeUDPClient.DEFAULT_PORT);</code> */

Modified: commons/proper/net/trunk/src/main/java/org/apache/commons/net/finger/FingerClient.java
URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/finger/FingerClient.java?rev=1489361&r1=1489360&r2=1489361&view=diff
==============================================================================
--- commons/proper/net/trunk/src/main/java/org/apache/commons/net/finger/FingerClient.java (original)
+++ commons/proper/net/trunk/src/main/java/org/apache/commons/net/finger/FingerClient.java Tue Jun  4 09:48:36 2013
@@ -24,7 +24,7 @@ import java.io.BufferedOutputStream;
 import java.io.DataOutputStream;
 
 import org.apache.commons.net.SocketClient;
-import org.apache.commons.net.util.Charsets;
+//import org.apache.commons.net.util.Charsets;
 
 /***
  * The FingerClient class implements the client side of the Internet Finger
@@ -90,7 +90,7 @@ public class FingerClient extends Socket
 
         input =
             new BufferedReader(new InputStreamReader(getInputStream(longOutput,
-                               username), this.getCharset()));
+                               username), this.getCharsetName())); // Java 1.6 can use getCharset()
 
         try {
             while (true)
@@ -168,7 +168,7 @@ public class FingerClient extends Socket
         buffer.append(username);
         buffer.append(SocketClient.NETASCII_EOL);
 
-        byte[] encodedQuery = buffer.toString().getBytes(Charsets.toCharset(encoding));
+        byte[] encodedQuery = buffer.toString().getBytes(/*Charsets.toCharset*/(encoding)); // Java 1.6 can use charset
 
         output = new DataOutputStream(new BufferedOutputStream(_output_, 1024));
         output.write(encodedQuery, 0, encodedQuery.length);

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=1489361&r1=1489360&r2=1489361&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 Tue Jun  4 09:48:36 2013
@@ -3511,7 +3511,7 @@ implements Configurable
      * provide non-standard configurations to the parser.
      * @since 1.4
      */
-    @Override
+//    @Override
     public void configure(FTPClientConfig config) {
         this.__configuration = config;
     }
@@ -3675,12 +3675,12 @@ implements Configurable
             parent.setSoTimeout(maxWait);
         }
 
-        @Override
+//        @Override
         public void bytesTransferred(CopyStreamEvent event) {
             bytesTransferred(event.getTotalBytesTransferred(), event.getBytesTransferred(), event.getStreamSize());
         }
 
-        @Override
+//        @Override
         public void bytesTransferred(long totalBytesTransferred,
                 int bytesTransferred, long streamSize) {
             long now = System.currentTimeMillis();

Modified: commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPFileEntryParserImpl.java
URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPFileEntryParserImpl.java?rev=1489361&r1=1489360&r2=1489361&view=diff
==============================================================================
--- commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPFileEntryParserImpl.java (original)
+++ commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPFileEntryParserImpl.java Tue Jun  4 09:48:36 2013
@@ -47,7 +47,7 @@ public abstract class FTPFileEntryParser
      * @return A string representing the next ftp entry or null if none found.
      * @exception java.io.IOException thrown on any IO Error reading from the reader.
      */
-    @Override
+//    @Override
     public String readNextEntry(BufferedReader reader) throws IOException
     {
         return reader.readLine();
@@ -64,7 +64,7 @@ public abstract class FTPFileEntryParser
      *
      * @return <code>original</code> unmodified.
      */
-     @Override
+//     @Override
     public List<String> preParse(List<String> original) {
          return original;
      }

Modified: commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPFileFilters.java
URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPFileFilters.java?rev=1489361&r1=1489360&r2=1489361&view=diff
==============================================================================
--- commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPFileFilters.java (original)
+++ commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPFileFilters.java Tue Jun  4 09:48:36 2013
@@ -28,7 +28,7 @@ public class FTPFileFilters {
      * Accepts all FTPFile entries, including null.
      */
     public static final FTPFileFilter ALL = new FTPFileFilter() {
-        @Override
+//        @Override
         public boolean accept(FTPFile file) {
             return true;
         }
@@ -38,7 +38,7 @@ public class FTPFileFilters {
      * Accepts all non-null FTPFile entries.
      */
     public static final FTPFileFilter NON_NULL = new FTPFileFilter() {
-        @Override
+//        @Override
         public boolean accept(FTPFile file) {
             return file != null;
         }
@@ -48,7 +48,7 @@ public class FTPFileFilters {
      * Accepts all (non-null) FTPFile directory entries.
      */
     public static final FTPFileFilter DIRECTORIES = new FTPFileFilter() {
-        @Override
+//        @Override
         public boolean accept(FTPFile file) {
             return file != null && file.isDirectory();
         }

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=1489361&r1=1489360&r2=1489361&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 Tue Jun  4 09:48:36 2013
@@ -163,7 +163,7 @@ public class FTPHTTPClient extends FTPCl
 
         List<String> response = new ArrayList<String>();
         BufferedReader reader = new BufferedReader(
-                new InputStreamReader(input, this.getCharset()));
+                new InputStreamReader(input, this.getCharsetName())); // Java 1.6 can use getCharset()
 
         for (String line = reader.readLine(); line != null
         && line.length() > 0; line = reader.readLine()) {

Modified: commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPSTrustManager.java
URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPSTrustManager.java?rev=1489361&r1=1489360&r2=1489361&view=diff
==============================================================================
--- commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPSTrustManager.java (original)
+++ commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPSTrustManager.java Tue Jun  4 09:48:36 2013
@@ -35,13 +35,13 @@ public class FTPSTrustManager implements
     /**
      * No-op
      */
-    @Override
+//    @Override
     public void checkClientTrusted(X509Certificate[] certificates, String authType)
     {
         return;
     }
 
-    @Override
+//    @Override
     public void checkServerTrusted(X509Certificate[] certificates, String authType) throws CertificateException
     {
         for (X509Certificate certificate : certificates)
@@ -50,7 +50,7 @@ public class FTPSTrustManager implements
         }
     }
 
-    @Override
+//    @Override
     public X509Certificate[] getAcceptedIssuers()
     {
         return EMPTY_X509CERTIFICATE_ARRAY;

Modified: commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/CompositeFileEntryParser.java
URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/CompositeFileEntryParser.java?rev=1489361&r1=1489360&r2=1489361&view=diff
==============================================================================
--- commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/CompositeFileEntryParser.java (original)
+++ commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/CompositeFileEntryParser.java Tue Jun  4 09:48:36 2013
@@ -43,7 +43,7 @@ public class CompositeFileEntryParser ex
         this.ftpFileEntryParsers = ftpFileEntryParsers;
     }
 
-    @Override
+//    @Override
     public FTPFile parseFTPEntry(String listEntry)
     {
         if (cachedFtpFileEntryParser != null)

Modified: commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/ConfigurableFTPFileEntryParserImpl.java
URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/ConfigurableFTPFileEntryParserImpl.java?rev=1489361&r1=1489360&r2=1489361&view=diff
==============================================================================
--- commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/ConfigurableFTPFileEntryParserImpl.java (original)
+++ commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/ConfigurableFTPFileEntryParserImpl.java Tue Jun  4 09:48:36 2013
@@ -87,7 +87,7 @@ implements Configurable
      * If it is null, a default configuration defined by
      * each concrete subclass is used instead.
      */
-    @Override
+//    @Override
     public void configure(FTPClientConfig config)
     {
         if (this.timestampParser instanceof Configurable) {

Modified: commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/DefaultFTPFileEntryParserFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/DefaultFTPFileEntryParserFactory.java?rev=1489361&r1=1489360&r2=1489361&view=diff
==============================================================================
--- commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/DefaultFTPFileEntryParserFactory.java (original)
+++ commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/DefaultFTPFileEntryParserFactory.java Tue Jun  4 09:48:36 2013
@@ -86,7 +86,7 @@ public class DefaultFTPFileEntryParserFa
      *                   the supplied key into an FTPFileEntryParser.
      * @see FTPFileEntryParser
      */
-    @Override
+//    @Override
     public FTPFileEntryParser createFileEntryParser(String key)
     {
         if (key == null) {
@@ -194,7 +194,7 @@ public class DefaultFTPFileEntryParserFa
      * @throws NullPointerException if {@code config} is {@code null}
      * @since 1.4
      */
-    @Override
+//    @Override
     public FTPFileEntryParser createFileEntryParser(FTPClientConfig config)
     throws ParserInitializationException
     {

Modified: commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/EnterpriseUnixFTPEntryParser.java
URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/EnterpriseUnixFTPEntryParser.java?rev=1489361&r1=1489360&r2=1489361&view=diff
==============================================================================
--- commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/EnterpriseUnixFTPEntryParser.java (original)
+++ commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/EnterpriseUnixFTPEntryParser.java Tue Jun  4 09:48:36 2013
@@ -80,7 +80,7 @@ public class EnterpriseUnixFTPEntryParse
      * @param entry A line of text from the file listing
      * @return An FTPFile instance corresponding to the supplied entry
      */
-    @Override
+//    @Override
     public FTPFile parseFTPEntry(String entry)
     {
 

Modified: commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/FTPTimestampParserImpl.java
URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/FTPTimestampParserImpl.java?rev=1489361&r1=1489360&r2=1489361&view=diff
==============================================================================
--- commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/FTPTimestampParserImpl.java (original)
+++ commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/FTPTimestampParserImpl.java Tue Jun  4 09:48:36 2013
@@ -70,7 +70,7 @@ public class FTPTimestampParserImpl impl
      *
      * @param timestampStr The timestamp to be parsed
      */
-    @Override
+//    @Override
     public Calendar parseTimestamp(String timestampStr) throws ParseException {
         Calendar now = Calendar.getInstance();
         return parseTimestamp(timestampStr, now);
@@ -248,7 +248,7 @@ public class FTPTimestampParserImpl impl
      * been configured.
      * </p>
      */
-    @Override
+//    @Override
     public void configure(FTPClientConfig config) {
         DateFormatSymbols dfs = null;
 

Modified: commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/MLSxEntryParser.java
URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/MLSxEntryParser.java?rev=1489361&r1=1489360&r2=1489361&view=diff
==============================================================================
--- commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/MLSxEntryParser.java (original)
+++ commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/MLSxEntryParser.java Tue Jun  4 09:48:36 2013
@@ -91,7 +91,7 @@ public class MLSxEntryParser extends FTP
         super();
     }
 
-    @Override
+//    @Override
     public FTPFile parseFTPEntry(String entry) {
         String parts[] = entry.split(" ",2); // Path may contain space
         if (parts.length != 2) {

Modified: commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/MVSFTPEntryParser.java
URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/MVSFTPEntryParser.java?rev=1489361&r1=1489360&r2=1489361&view=diff
==============================================================================
--- commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/MVSFTPEntryParser.java (original)
+++ commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/MVSFTPEntryParser.java Tue Jun  4 09:48:36 2013
@@ -229,7 +229,7 @@ public class MVSFTPEntryParser extends C
      *            A line of text from the file listing
      * @return An FTPFile instance corresponding to the supplied entry
      */
-    @Override
+//    @Override
     public FTPFile parseFTPEntry(String entry) {
         boolean isParsed = false;
         FTPFile f = new FTPFile();

Modified: commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/MacOsPeterFTPEntryParser.java
URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/MacOsPeterFTPEntryParser.java?rev=1489361&r1=1489360&r2=1489361&view=diff
==============================================================================
--- commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/MacOsPeterFTPEntryParser.java (original)
+++ commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/MacOsPeterFTPEntryParser.java Tue Jun  4 09:48:36 2013
@@ -125,7 +125,7 @@ public class MacOsPeterFTPEntryParser ex
      * @param entry A line of text from the file listing
      * @return An FTPFile instance corresponding to the supplied entry
      */
-    @Override
+//    @Override
     public FTPFile parseFTPEntry(String entry) {
         FTPFile file = new FTPFile();
         file.setRawListing(entry);

Modified: commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/NTFTPEntryParser.java
URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/NTFTPEntryParser.java?rev=1489361&r1=1489360&r2=1489361&view=diff
==============================================================================
--- commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/NTFTPEntryParser.java (original)
+++ commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/NTFTPEntryParser.java Tue Jun  4 09:48:36 2013
@@ -97,7 +97,7 @@ public class NTFTPEntryParser extends Co
      * @param entry A line of text from the file listing
      * @return An FTPFile instance corresponding to the supplied entry
      */
-    @Override
+//    @Override
     public FTPFile parseFTPEntry(String entry)
     {
         FTPFile f = new FTPFile();

Modified: commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/NetwareFTPEntryParser.java
URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/NetwareFTPEntryParser.java?rev=1489361&r1=1489360&r2=1489361&view=diff
==============================================================================
--- commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/NetwareFTPEntryParser.java (original)
+++ commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/NetwareFTPEntryParser.java Tue Jun  4 09:48:36 2013
@@ -110,7 +110,7 @@ public class NetwareFTPEntryParser exten
      * @param entry A line of text from the file listing
      * @return An FTPFile instance corresponding to the supplied entry
      */
-    @Override
+//    @Override
     public FTPFile parseFTPEntry(String entry) {
 
         FTPFile f = new FTPFile();

Modified: commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/OS2FTPEntryParser.java
URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/OS2FTPEntryParser.java?rev=1489361&r1=1489360&r2=1489361&view=diff
==============================================================================
--- commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/OS2FTPEntryParser.java (original)
+++ commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/OS2FTPEntryParser.java Tue Jun  4 09:48:36 2013
@@ -86,7 +86,7 @@ public class OS2FTPEntryParser extends C
      * @param entry A line of text from the file listing
      * @return An FTPFile instance corresponding to the supplied entry
      */
-    @Override
+//    @Override
     public FTPFile parseFTPEntry(String entry)
     {
 

Modified: commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/OS400FTPEntryParser.java
URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/OS400FTPEntryParser.java?rev=1489361&r1=1489360&r2=1489361&view=diff
==============================================================================
--- commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/OS400FTPEntryParser.java (original)
+++ commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/OS400FTPEntryParser.java Tue Jun  4 09:48:36 2013
@@ -73,7 +73,7 @@ public class OS400FTPEntryParser extends
     }
 
 
-    @Override
+//    @Override
     public FTPFile parseFTPEntry(String entry)
     {
 

Modified: commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/UnixFTPEntryParser.java
URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/UnixFTPEntryParser.java?rev=1489361&r1=1489360&r2=1489361&view=diff
==============================================================================
--- commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/UnixFTPEntryParser.java (original)
+++ commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/UnixFTPEntryParser.java Tue Jun  4 09:48:36 2013
@@ -164,7 +164,7 @@ public class UnixFTPEntryParser extends 
      * @param entry A line of text from the file listing
      * @return An FTPFile instance corresponding to the supplied entry
      */
-    @Override
+//    @Override
     public FTPFile parseFTPEntry(String entry) {
         FTPFile file = new FTPFile();
         file.setRawListing(entry);

Modified: commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/VMSFTPEntryParser.java
URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/VMSFTPEntryParser.java?rev=1489361&r1=1489360&r2=1489361&view=diff
==============================================================================
--- commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/VMSFTPEntryParser.java (original)
+++ commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/VMSFTPEntryParser.java Tue Jun  4 09:48:36 2013
@@ -106,7 +106,7 @@ public class VMSFTPEntryParser extends C
      * @param entry A line of text from the file listing
      * @return An FTPFile instance corresponding to the supplied entry
      */
-    @Override
+//    @Override
     public FTPFile parseFTPEntry(String entry)
     {
         //one block in VMS equals 512 bytes

Modified: commons/proper/net/trunk/src/main/java/org/apache/commons/net/imap/AuthenticatingIMAPClient.java
URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/imap/AuthenticatingIMAPClient.java?rev=1489361&r1=1489360&r2=1489361&view=diff
==============================================================================
--- commons/proper/net/trunk/src/main/java/org/apache/commons/net/imap/AuthenticatingIMAPClient.java (original)
+++ commons/proper/net/trunk/src/main/java/org/apache/commons/net/imap/AuthenticatingIMAPClient.java Tue Jun  4 09:48:36 2013
@@ -150,8 +150,8 @@ public class AuthenticatingIMAPClient ex
             {
                 // the server sends an empty response ("+ "), so we don't have to read it.
                 int result = sendData(
-                    Base64.encodeBase64StringUnChunked(("\000" + username + "\000" + password).getBytes(this.getCharset()))
-                    );
+                    Base64.encodeBase64StringUnChunked(("\000" + username + "\000" + password)
+                            .getBytes(this.getCharsetName())));  // Java 1.6 can use getCharset()
                 if (result == IMAPReply.OK)
                 {
                     setState(IMAP.IMAPState.AUTH_STATE);
@@ -164,11 +164,11 @@ public class AuthenticatingIMAPClient ex
                 byte[] serverChallenge = Base64.decodeBase64(getReplyString().substring(2).trim());
                 // get the Mac instance
                 Mac hmac_md5 = Mac.getInstance("HmacMD5");
-                hmac_md5.init(new SecretKeySpec(password.getBytes(this.getCharset()), "HmacMD5"));
+                hmac_md5.init(new SecretKeySpec(password.getBytes(this.getCharsetName()), "HmacMD5")); // Java 1.6 can use getCharset()
                 // compute the result:
-                byte[] hmacResult = _convertToHexString(hmac_md5.doFinal(serverChallenge)).getBytes(this.getCharset());
+                byte[] hmacResult = _convertToHexString(hmac_md5.doFinal(serverChallenge)).getBytes(this.getCharsetName()); // Java 1.6 can use getCharset()
                 // join the byte arrays to form the reply
-                byte[] usernameBytes = username.getBytes(this.getCharset());
+                byte[] usernameBytes = username.getBytes(this.getCharsetName()); // Java 1.6 can use getCharset()
                 byte[] toEncode = new byte[usernameBytes.length + 1 /* the space */ + hmacResult.length];
                 System.arraycopy(usernameBytes, 0, toEncode, 0, usernameBytes.length);
                 toEncode[usernameBytes.length] = ' ';
@@ -186,11 +186,11 @@ public class AuthenticatingIMAPClient ex
                 // the server sends fixed responses (base64("Username") and
                 // base64("Password")), so we don't have to read them.
                 if (sendData(
-                    Base64.encodeBase64StringUnChunked(username.getBytes(this.getCharset()))) != IMAPReply.CONT)
+                    Base64.encodeBase64StringUnChunked(username.getBytes(this.getCharsetName()))) != IMAPReply.CONT) // Java 1.6 can use getCharset()
                 {
                     return false;
                 }
-                int result = sendData(Base64.encodeBase64StringUnChunked(password.getBytes(this.getCharset())));
+                int result = sendData(Base64.encodeBase64StringUnChunked(password.getBytes(this.getCharsetName()))); // Java 1.6 can use getCharset()
                 if (result == IMAPReply.OK)
                 {
                     setState(IMAP.IMAPState.AUTH_STATE);

Modified: commons/proper/net/trunk/src/main/java/org/apache/commons/net/io/CopyStreamAdapter.java
URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/io/CopyStreamAdapter.java?rev=1489361&r1=1489360&r2=1489361&view=diff
==============================================================================
--- commons/proper/net/trunk/src/main/java/org/apache/commons/net/io/CopyStreamAdapter.java (original)
+++ commons/proper/net/trunk/src/main/java/org/apache/commons/net/io/CopyStreamAdapter.java Tue Jun  4 09:48:36 2013
@@ -60,7 +60,7 @@ public class CopyStreamAdapter implement
      * @param event The CopyStreamEvent fired by the copying of a block of
      *              bytes.
      */
-    @Override
+//    @Override
     public void bytesTransferred(CopyStreamEvent event)
     {
         for (EventListener listener : internalListeners)
@@ -84,7 +84,7 @@ public class CopyStreamAdapter implement
      *        This may be equal to CopyStreamEvent.UNKNOWN_STREAM_SIZE if
      *        the size is unknown.
      */
-    @Override
+//    @Override
     public void bytesTransferred(long totalBytesTransferred,
                                  int bytesTransferred, long streamSize)
     {

Modified: commons/proper/net/trunk/src/main/java/org/apache/commons/net/nntp/Article.java
URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/nntp/Article.java?rev=1489361&r1=1489360&r2=1489361&view=diff
==============================================================================
--- commons/proper/net/trunk/src/main/java/org/apache/commons/net/nntp/Article.java (original)
+++ commons/proper/net/trunk/src/main/java/org/apache/commons/net/nntp/Article.java Tue Jun  4 09:48:36 2013
@@ -194,22 +194,22 @@ public class Article implements Threadab
     }
 
 
-    @Override
+//    @Override
     public boolean isDummy() {
         return (articleNumber == -1);
     }
 
-    @Override
+//    @Override
     public String messageThreadId() {
         return articleId;
     }
 
-    @Override
+//    @Override
     public String[] messageThreadReferences() {
         return getReferences();
     }
 
-    @Override
+//    @Override
     public String simplifiedSubject() {
         if(simplifiedSubject == null) {
             simplifySubject();
@@ -218,13 +218,13 @@ public class Article implements Threadab
     }
 
 
-    @Override
+//    @Override
     public boolean subjectIsReply() {
         return isReply;
     }
 
 
-    @Override
+//    @Override
     public void setChild(Threadable child) {
         this.kid = (Article) child;
         flushSubjectCache();
@@ -235,14 +235,14 @@ public class Article implements Threadab
     }
 
 
-    @Override
+//    @Override
     public void setNext(Threadable next) {
         this.next = (Article)next;
         flushSubjectCache();
     }
 
 
-    @Override
+//    @Override
     public Threadable makeDummy() {
         return new Article();
     }

Modified: commons/proper/net/trunk/src/main/java/org/apache/commons/net/nntp/ArticleIterator.java
URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/nntp/ArticleIterator.java?rev=1489361&r1=1489360&r2=1489361&view=diff
==============================================================================
--- commons/proper/net/trunk/src/main/java/org/apache/commons/net/nntp/ArticleIterator.java (original)
+++ commons/proper/net/trunk/src/main/java/org/apache/commons/net/nntp/ArticleIterator.java Tue Jun  4 09:48:36 2013
@@ -32,7 +32,7 @@ class ArticleIterator implements Iterato
         stringIterator = iterableString.iterator();
     }
 
-    @Override
+//    @Override
     public boolean hasNext() {
         return stringIterator.hasNext();
     }
@@ -42,17 +42,17 @@ class ArticleIterator implements Iterato
      * @return the next {@link Article}, never {@code null}, if unparseable then isDummy()
      * will be true, and the subject will contain the raw info.
      */
-    @Override
+//    @Override
     public Article next() {
         String line = stringIterator.next();
         return NNTPClient.__parseArticleEntry(line);
     }
 
-    @Override
+//    @Override
     public void remove() {
         stringIterator.remove();
     }
-    @Override
+//    @Override
     public Iterator<Article> iterator() {
         return this;
     }

Modified: commons/proper/net/trunk/src/main/java/org/apache/commons/net/nntp/NewsgroupIterator.java
URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/nntp/NewsgroupIterator.java?rev=1489361&r1=1489360&r2=1489361&view=diff
==============================================================================
--- commons/proper/net/trunk/src/main/java/org/apache/commons/net/nntp/NewsgroupIterator.java (original)
+++ commons/proper/net/trunk/src/main/java/org/apache/commons/net/nntp/NewsgroupIterator.java Tue Jun  4 09:48:36 2013
@@ -32,23 +32,23 @@ class NewsgroupIterator implements Itera
         stringIterator = iterableString.iterator();
     }
 
-    @Override
+//    @Override
     public boolean hasNext() {
         return stringIterator.hasNext();
     }
 
-    @Override
+//    @Override
     public NewsgroupInfo next() {
         String line = stringIterator.next();
         return NNTPClient.__parseNewsgroupListEntry(line);
     }
 
-    @Override
+//    @Override
     public void remove() {
         stringIterator.remove();
     }
 
-    @Override
+//    @Override
     public Iterator<NewsgroupInfo> iterator() {
         return this;
     }

Modified: commons/proper/net/trunk/src/main/java/org/apache/commons/net/nntp/ReplyIterator.java
URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/nntp/ReplyIterator.java?rev=1489361&r1=1489360&r2=1489361&view=diff
==============================================================================
--- commons/proper/net/trunk/src/main/java/org/apache/commons/net/nntp/ReplyIterator.java (original)
+++ commons/proper/net/trunk/src/main/java/org/apache/commons/net/nntp/ReplyIterator.java Tue Jun  4 09:48:36 2013
@@ -57,7 +57,7 @@ class ReplyIterator implements Iterator<
         this(_reader, true);
     }
 
-    @Override
+//    @Override
     public boolean hasNext() {
         if (savedException != null){
             throw new NoSuchElementException(savedException.toString());
@@ -65,7 +65,7 @@ class ReplyIterator implements Iterator<
         return line != null;
     }
 
-    @Override
+//    @Override
     public String next() throws NoSuchElementException {
         if (savedException != null){
             throw new NoSuchElementException(savedException.toString());
@@ -86,12 +86,12 @@ class ReplyIterator implements Iterator<
         return prev;
     }
 
-    @Override
+//    @Override
     public void remove() {
         throw new UnsupportedOperationException();
     }
 
-    @Override
+//    @Override
     public Iterator<String> iterator() {
         return this;
     }

Modified: commons/proper/net/trunk/src/main/java/org/apache/commons/net/ntp/NtpV3Impl.java
URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/ntp/NtpV3Impl.java?rev=1489361&r1=1489360&r2=1489361&view=diff
==============================================================================
--- commons/proper/net/trunk/src/main/java/org/apache/commons/net/ntp/NtpV3Impl.java (original)
+++ commons/proper/net/trunk/src/main/java/org/apache/commons/net/ntp/NtpV3Impl.java Tue Jun  4 09:48:36 2013
@@ -70,7 +70,7 @@ public class NtpV3Impl implements NtpV3P
      *
      * @return mode as defined in RFC-1305.
      */
-    @Override
+//    @Override
     public int getMode()
     {
         return (ui(buf[MODE_INDEX]) >> MODE_SHIFT) & 0x7;
@@ -81,7 +81,7 @@ public class NtpV3Impl implements NtpV3P
      * RFC 1305.
      * @return mode name as string.
      */
-    @Override
+//    @Override
     public String getModeName()
     {
         return NtpUtils.getModeName(getMode());
@@ -91,7 +91,7 @@ public class NtpV3Impl implements NtpV3P
      * Set mode as defined in RFC-1305.
      * @param mode
      */
-    @Override
+//    @Override
     public void setMode(int mode)
     {
         buf[MODE_INDEX] = (byte) (buf[MODE_INDEX] & 0xF8 | mode & 0x7);
@@ -106,7 +106,7 @@ public class NtpV3Impl implements NtpV3P
      *
      * @return leap indicator as defined in RFC-1305.
      */
-    @Override
+//    @Override
     public int getLeapIndicator()
     {
         return (ui(buf[LI_INDEX]) >> LI_SHIFT) & 0x3;
@@ -116,7 +116,7 @@ public class NtpV3Impl implements NtpV3P
      * Set leap indicator as defined in RFC-1305.
      * @param li leap indicator.
      */
-    @Override
+//    @Override
     public void setLeapIndicator(int li)
     {
         buf[LI_INDEX] = (byte) (buf[LI_INDEX] & 0x3F | ((li & 0x3) << LI_SHIFT));
@@ -131,7 +131,7 @@ public class NtpV3Impl implements NtpV3P
      *
      * @return poll interval as defined in RFC-1305.
      */
-    @Override
+//    @Override
     public int getPoll()
     {
         return buf[POLL_INDEX];
@@ -142,7 +142,7 @@ public class NtpV3Impl implements NtpV3P
      *
      * @param poll poll interval.
      */
-    @Override
+//    @Override
     public void setPoll(int poll)
     {
         buf[POLL_INDEX] = (byte) (poll & 0xFF);
@@ -155,7 +155,7 @@ public class NtpV3Impl implements NtpV3P
      *
      * @return precision as defined in RFC-1305.
      */
-    @Override
+//    @Override
     public int getPrecision()
     {
         return buf[PRECISION_INDEX];
@@ -175,7 +175,7 @@ public class NtpV3Impl implements NtpV3P
      *
      * @return NTP version number.
      */
-    @Override
+//    @Override
     public int getVersion()
     {
         return (ui(buf[VERSION_INDEX]) >> VERSION_SHIFT) & 0x7;
@@ -186,7 +186,7 @@ public class NtpV3Impl implements NtpV3P
      *
      * @param version NTP version.
      */
-    @Override
+//    @Override
     public void setVersion(int version)
     {
         buf[VERSION_INDEX] = (byte) (buf[VERSION_INDEX] & 0xC7 | ((version & 0x7) << VERSION_SHIFT));
@@ -199,7 +199,7 @@ public class NtpV3Impl implements NtpV3P
      *
      * @return Stratum level as defined in RFC-1305.
      */
-    @Override
+//    @Override
     public int getStratum()
     {
         return ui(buf[STRATUM_INDEX]);
@@ -210,7 +210,7 @@ public class NtpV3Impl implements NtpV3P
      *
      * @param stratum stratum level.
      */
-    @Override
+//    @Override
     public void setStratum(int stratum)
     {
         buf[STRATUM_INDEX] = (byte) (stratum & 0xFF);
@@ -223,7 +223,7 @@ public class NtpV3Impl implements NtpV3P
      *
      * @return root delay as defined in RFC-1305.
      */
-    @Override
+//    @Override
     public int getRootDelay()
     {
         return getInt(ROOT_DELAY_INDEX);
@@ -237,7 +237,7 @@ public class NtpV3Impl implements NtpV3P
      *
      * @return root delay in milliseconds
      */
-    @Override
+//    @Override
     public double getRootDelayInMillisDouble()
     {
         double l = getRootDelay();
@@ -248,7 +248,7 @@ public class NtpV3Impl implements NtpV3P
      * Returns root dispersion as defined in RFC-1305.
      * @return root dispersion.
      */
-    @Override
+//    @Override
     public int getRootDispersion()
     {
         return getInt(ROOT_DISPERSION_INDEX);
@@ -259,7 +259,7 @@ public class NtpV3Impl implements NtpV3P
      *
      * @return root dispersion in milliseconds
      */
-    @Override
+//    @Override
     public long getRootDispersionInMillis()
     {
         long l = getRootDispersion();
@@ -272,7 +272,7 @@ public class NtpV3Impl implements NtpV3P
      *
      * @return root dispersion in milliseconds
      */
-    @Override
+//    @Override
     public double getRootDispersionInMillisDouble()
     {
         double l = getRootDispersion();
@@ -285,7 +285,7 @@ public class NtpV3Impl implements NtpV3P
      *
      * @param refId reference clock identifier.
      */
-    @Override
+//    @Override
     public void setReferenceId(int refId)
     {
         for (int i = 3; i >= 0; i--) {
@@ -300,7 +300,7 @@ public class NtpV3Impl implements NtpV3P
      *
      * @return the reference id as defined in RFC-1305.
      */
-    @Override
+//    @Override
     public int getReferenceId()
     {
         return getInt(REFERENCE_ID_INDEX);
@@ -314,7 +314,7 @@ public class NtpV3Impl implements NtpV3P
      *
      * @return the reference id string.
      */
-    @Override
+//    @Override
     public String getReferenceIdString()
     {
         int version = getVersion();
@@ -373,7 +373,7 @@ public class NtpV3Impl implements NtpV3P
      * @return the transmit timestamp as defined in RFC-1305.
      * Never returns a null object.
      */
-    @Override
+//    @Override
     public TimeStamp getTransmitTimeStamp()
     {
         return getTimestamp(TRANSMIT_TIMESTAMP_INDEX);
@@ -385,7 +385,7 @@ public class NtpV3Impl implements NtpV3P
      *
      * @param ts NTP timestamp
      */
-    @Override
+//    @Override
     public void setTransmitTime(TimeStamp ts)
     {
         setTimestamp(TRANSMIT_TIMESTAMP_INDEX, ts);
@@ -397,7 +397,7 @@ public class NtpV3Impl implements NtpV3P
      *
      * @param ts NTP timestamp
      */
-    @Override
+//    @Override
     public void setOriginateTimeStamp(TimeStamp ts)
     {
         setTimestamp(ORIGINATE_TIMESTAMP_INDEX, ts);
@@ -409,7 +409,7 @@ public class NtpV3Impl implements NtpV3P
      * @return the originate time.
      * Never returns null.
      */
-    @Override
+//    @Override
     public TimeStamp getOriginateTimeStamp()
     {
         return getTimestamp(ORIGINATE_TIMESTAMP_INDEX);
@@ -421,7 +421,7 @@ public class NtpV3Impl implements NtpV3P
      * @return the reference time as <code>TimeStamp</code> object.
      * Never returns null.
      */
-    @Override
+//    @Override
     public TimeStamp getReferenceTimeStamp()
     {
         return getTimestamp(REFERENCE_TIMESTAMP_INDEX);
@@ -433,7 +433,7 @@ public class NtpV3Impl implements NtpV3P
      *
      * @param ts NTP timestamp
      */
-    @Override
+//    @Override
     public void setReferenceTime(TimeStamp ts)
     {
         setTimestamp(REFERENCE_TIMESTAMP_INDEX, ts);
@@ -445,7 +445,7 @@ public class NtpV3Impl implements NtpV3P
      * @return the receive time.
      * Never returns null.
      */
-    @Override
+//    @Override
     public TimeStamp getReceiveTimeStamp()
     {
         return getTimestamp(RECEIVE_TIMESTAMP_INDEX);
@@ -457,7 +457,7 @@ public class NtpV3Impl implements NtpV3P
      *
      * @param ts timestamp
      */
-    @Override
+//    @Override
     public void setReceiveTimeStamp(TimeStamp ts)
     {
         setTimestamp(RECEIVE_TIMESTAMP_INDEX, ts);
@@ -469,7 +469,7 @@ public class NtpV3Impl implements NtpV3P
      *
      * @return packet type string identifier which in this case is "NTP".
      */
-    @Override
+//    @Override
     public String getType()
     {
         return "NTP";
@@ -540,7 +540,7 @@ public class NtpV3Impl implements NtpV3P
      *
      * @return a datagram packet.
      */
-    @Override
+//    @Override
     public synchronized DatagramPacket getDatagramPacket()
     {
         if (dp == null) {
@@ -555,7 +555,7 @@ public class NtpV3Impl implements NtpV3P
      *
      * @param srcDp source DatagramPacket to copy contents from.
      */
-    @Override
+//    @Override
     public void setDatagramPacket(DatagramPacket srcDp)
     {
         byte[] incomingBuf = srcDp.getData();

Modified: commons/proper/net/trunk/src/main/java/org/apache/commons/net/ntp/TimeStamp.java
URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/ntp/TimeStamp.java?rev=1489361&r1=1489360&r2=1489361&view=diff
==============================================================================
--- commons/proper/net/trunk/src/main/java/org/apache/commons/net/ntp/TimeStamp.java (original)
+++ commons/proper/net/trunk/src/main/java/org/apache/commons/net/ntp/TimeStamp.java Tue Jun  4 09:48:36 2013
@@ -441,7 +441,7 @@ public class TimeStamp implements java.i
      *          numerically greater than the TimeStamp argument
      *          (signed comparison).
      */
-    @Override
+//    @Override
     public int compareTo(TimeStamp anotherTimeStamp)
     {
         long thisVal = this.ntpTime;

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=1489361&r1=1489360&r2=1489361&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 Tue Jun  4 09:48:36 2013
@@ -77,19 +77,19 @@ public class ExtendedPOP3Client extends 
                 // the server sends an empty response ("+ "), so we don't have to read it.
                 return sendCommand(
                     new String(
-                        Base64.encodeBase64(("\000" + username + "\000" + password).getBytes(this.getCharset())),
-                        this.getCharset())
+                        Base64.encodeBase64(("\000" + username + "\000" + password).getBytes(this.getCharsetName())),
+                        this.getCharsetName()) // Java 1.6 can use getCharset()
                     ) == POP3Reply.OK;
             case CRAM_MD5:
                 // get the CRAM challenge
                 byte[] serverChallenge = Base64.decodeBase64(getReplyString().substring(2).trim());
                 // get the Mac instance
                 Mac hmac_md5 = Mac.getInstance("HmacMD5");
-                hmac_md5.init(new SecretKeySpec(password.getBytes(this.getCharset()), "HmacMD5"));
+                hmac_md5.init(new SecretKeySpec(password.getBytes(this.getCharsetName()), "HmacMD5")); // Java 1.6 can use getCharset()
                 // compute the result:
-                byte[] hmacResult = _convertToHexString(hmac_md5.doFinal(serverChallenge)).getBytes(this.getCharset());
+                byte[] hmacResult = _convertToHexString(hmac_md5.doFinal(serverChallenge)).getBytes(this.getCharsetName()); // Java 1.6 can use getCharset()
                 // join the byte arrays to form the reply
-                byte[] usernameBytes = username.getBytes(this.getCharset());
+                byte[] usernameBytes = username.getBytes(this.getCharsetName()); // Java 1.6 can use getCharset()
                 byte[] toEncode = new byte[usernameBytes.length + 1 /* the space */ + hmacResult.length];
                 System.arraycopy(usernameBytes, 0, toEncode, 0, usernameBytes.length);
                 toEncode[usernameBytes.length] = ' ';

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=1489361&r1=1489360&r2=1489361&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 Tue Jun  4 09:48:36 2013
@@ -214,7 +214,7 @@ public class POP3Client extends POP3
 
         md5 = MessageDigest.getInstance("MD5");
         timestamp += secret;
-        digest = md5.digest(timestamp.getBytes(this.getCharset()));
+        digest = md5.digest(timestamp.getBytes(this.getCharsetName())); // Java 1.6 can use getCharset()
         digestBuffer = new StringBuilder(128);
 
         for (i = 0; i < digest.length; i++) {

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=1489361&r1=1489360&r2=1489361&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 Tue Jun  4 09:48:36 2013
@@ -192,7 +192,7 @@ public class AuthenticatingSMTPClient ex
         {
             // the server sends an empty response ("334 "), so we don't have to read it.
             return SMTPReply.isPositiveCompletion(sendCommand(
-                    Base64.encodeBase64StringUnChunked(("\000" + username + "\000" + password).getBytes(this.getCharset()))
+                    Base64.encodeBase64StringUnChunked(("\000" + username + "\000" + password).getBytes(this.getCharsetName())) // Java 1.6 can use getCharset()
                 ));
         }
         else if (method.equals(AUTH_METHOD.CRAM_MD5))
@@ -201,11 +201,11 @@ public class AuthenticatingSMTPClient ex
             byte[] serverChallenge = Base64.decodeBase64(getReplyString().substring(4).trim());
             // get the Mac instance
             Mac hmac_md5 = Mac.getInstance("HmacMD5");
-            hmac_md5.init(new SecretKeySpec(password.getBytes(this.getCharset()), "HmacMD5"));
+            hmac_md5.init(new SecretKeySpec(password.getBytes(this.getCharsetName()), "HmacMD5")); // Java 1.6 can use getCharset()
             // compute the result:
-            byte[] hmacResult = _convertToHexString(hmac_md5.doFinal(serverChallenge)).getBytes(this.getCharset());
+            byte[] hmacResult = _convertToHexString(hmac_md5.doFinal(serverChallenge)).getBytes(this.getCharsetName()); // Java 1.6 can use getCharset()
             // join the byte arrays to form the reply
-            byte[] usernameBytes = username.getBytes(this.getCharset());
+            byte[] usernameBytes = username.getBytes(this.getCharsetName()); // Java 1.6 can use getCharset()
             byte[] toEncode = new byte[usernameBytes.length + 1 /* the space */ + hmacResult.length];
             System.arraycopy(usernameBytes, 0, toEncode, 0, usernameBytes.length);
             toEncode[usernameBytes.length] = ' ';
@@ -219,16 +219,16 @@ public class AuthenticatingSMTPClient ex
             // the server sends fixed responses (base64("Username") and
             // base64("Password")), so we don't have to read them.
             if (!SMTPReply.isPositiveIntermediate(sendCommand(
-                Base64.encodeBase64StringUnChunked(username.getBytes(this.getCharset()))))) {
+                Base64.encodeBase64StringUnChunked(username.getBytes(this.getCharsetName()))))) { // Java 1.6 can use getCharset()
                 return false;
             }
             return SMTPReply.isPositiveCompletion(sendCommand(
-                Base64.encodeBase64StringUnChunked(password.getBytes(this.getCharset()))));
+                Base64.encodeBase64StringUnChunked(password.getBytes(this.getCharsetName())))); // Java 1.6 can use getCharset()
         }
         else if (method.equals(AUTH_METHOD.XOAUTH))
         {
             return SMTPReply.isPositiveIntermediate(sendCommand(
-                    Base64.encodeBase64StringUnChunked(username.getBytes(this.getCharset()))
+                    Base64.encodeBase64StringUnChunked(username.getBytes(this.getCharsetName())) // Java 1.6 can use getCharset()
             ));
         } else {
             return false; // safety check

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=1489361&r1=1489360&r2=1489361&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 Tue Jun  4 09:48:36 2013
@@ -745,7 +745,7 @@ class Telnet extends SocketClient
         {
             _output_.write(_COMMAND_SB);
             _output_.write(_COMMAND_IS);
-            _output_.write(terminalType.getBytes(this.getCharset()));
+            _output_.write(terminalType.getBytes(this.getCharsetName())); // Java 1.6 can use getCharset()
             _output_.write(_COMMAND_SE);
             _output_.flush();
         }

Modified: commons/proper/net/trunk/src/main/java/org/apache/commons/net/telnet/TelnetInputStream.java
URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/telnet/TelnetInputStream.java?rev=1489361&r1=1489360&r2=1489361&view=diff
==============================================================================
--- commons/proper/net/trunk/src/main/java/org/apache/commons/net/telnet/TelnetInputStream.java (original)
+++ commons/proper/net/trunk/src/main/java/org/apache/commons/net/telnet/TelnetInputStream.java Tue Jun  4 09:48:36 2013
@@ -597,7 +597,7 @@ final class TelnetInputStream extends Bu
         __threaded = false;
     }
 
-    @Override
+//    @Override
     public void run()
     {
         int ch;

Modified: commons/proper/net/trunk/src/main/java/org/apache/commons/net/util/KeyManagerUtils.java
URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/util/KeyManagerUtils.java?rev=1489361&r1=1489360&r2=1489361&view=diff
==============================================================================
--- commons/proper/net/trunk/src/main/java/org/apache/commons/net/util/KeyManagerUtils.java (original)
+++ commons/proper/net/trunk/src/main/java/org/apache/commons/net/util/KeyManagerUtils.java Tue Jun  4 09:48:36 2013
@@ -200,35 +200,35 @@ public final class KeyManagerUtils {
         }
 
         // Call sequence: 1
-        @Override
+//        @Override
         public String chooseClientAlias(String[] keyType, Principal[] issuers,
                 Socket socket) {
             return keyStore.getAlias();
         }
 
         // Call sequence: 2
-        @Override
+//        @Override
         public X509Certificate[] getCertificateChain(String alias) {
             return keyStore.getCertificateChain();
         }
 
-        @Override
+//        @Override
         public String[] getClientAliases(String keyType, Principal[] issuers) {
             return new String[]{ keyStore.getAlias()};
         }
 
         // Call sequence: 3
-        @Override
+//        @Override
         public PrivateKey getPrivateKey(String alias) {
             return keyStore.getPrivateKey();
         }
 
-        @Override
+//        @Override
         public String[] getServerAliases(String keyType, Principal[] issuers) {
             return null;
         }
 
-        @Override
+//        @Override
         public String chooseServerAlias(String keyType, Principal[] issuers, Socket socket) {
             return null;
         }

Modified: commons/proper/net/trunk/src/main/java/org/apache/commons/net/util/ListenerList.java
URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/util/ListenerList.java?rev=1489361&r1=1489360&r2=1489361&view=diff
==============================================================================
--- commons/proper/net/trunk/src/main/java/org/apache/commons/net/util/ListenerList.java (original)
+++ commons/proper/net/trunk/src/main/java/org/apache/commons/net/util/ListenerList.java Tue Jun  4 09:48:36 2013
@@ -58,7 +58,7 @@ public class ListenerList implements Ser
      * @since 2.0
      * TODO Check that this is a good defensive strategy
      */
-    @Override
+//    @Override
     public Iterator<EventListener> iterator() {
             return __listeners.iterator();
     }

Modified: commons/proper/net/trunk/src/main/java/org/apache/commons/net/util/TrustManagerUtils.java
URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/util/TrustManagerUtils.java?rev=1489361&r1=1489360&r2=1489361&view=diff
==============================================================================
--- commons/proper/net/trunk/src/main/java/org/apache/commons/net/util/TrustManagerUtils.java (original)
+++ commons/proper/net/trunk/src/main/java/org/apache/commons/net/util/TrustManagerUtils.java Tue Jun  4 09:48:36 2013
@@ -45,13 +45,13 @@ public final class TrustManagerUtils
         /**
          * Never generates a CertificateException.
          */
-        @Override
+//        @Override
         public void checkClientTrusted(X509Certificate[] certificates, String authType)
         {
             return;
         }
 
-        @Override
+//        @Override
         public void checkServerTrusted(X509Certificate[] certificates, String authType)
             throws CertificateException
         {
@@ -66,7 +66,7 @@ public final class TrustManagerUtils
         /**
          * @return an empty array of certificates
          */
-        @Override
+//        @Override
         public X509Certificate[] getAcceptedIssuers()
         {
             return EMPTY_X509CERTIFICATE_ARRAY;

Modified: commons/proper/net/trunk/src/test/java/org/apache/commons/net/ftp/FTPClientConfigFunctionalTest.java
URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/test/java/org/apache/commons/net/ftp/FTPClientConfigFunctionalTest.java?rev=1489361&r1=1489360&r2=1489361&view=diff
==============================================================================
--- commons/proper/net/trunk/src/test/java/org/apache/commons/net/ftp/FTPClientConfigFunctionalTest.java (original)
+++ commons/proper/net/trunk/src/test/java/org/apache/commons/net/ftp/FTPClientConfigFunctionalTest.java Tue Jun  4 09:48:36 2013
@@ -101,7 +101,7 @@ public class FTPClientConfigFunctionalTe
         // as it is added.
         TreeSet<FTPFile> sorted = new TreeSet<FTPFile>(new Comparator<Object>() {
 
-            @Override
+//            @Override
             public int compare(Object o1, Object o2) {
                 FTPFile f1 = (FTPFile) o1;
                 FTPFile f2 = (FTPFile) o2;

Modified: commons/proper/net/trunk/src/test/java/org/apache/commons/net/ftp/parser/MLSDComparison.java
URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/test/java/org/apache/commons/net/ftp/parser/MLSDComparison.java?rev=1489361&r1=1489360&r2=1489361&view=diff
==============================================================================
--- commons/proper/net/trunk/src/test/java/org/apache/commons/net/ftp/parser/MLSDComparison.java (original)
+++ commons/proper/net/trunk/src/test/java/org/apache/commons/net/ftp/parser/MLSDComparison.java Tue Jun  4 09:48:36 2013
@@ -43,7 +43,7 @@ import org.junit.Test;
 public class MLSDComparison {
 
     private final Comparator<FTPFile> cmp = new Comparator<FTPFile>() {
-        @Override
+//        @Override
         public int compare(FTPFile o1, FTPFile o2) {
                 String n1 = o1.getName();
                 String n2 = o2.getName();
@@ -55,7 +55,7 @@ public class MLSDComparison {
     public void testFile() throws Exception{
         File path = new File(DownloadListings.DOWNLOAD_DIR);
         FilenameFilter filter = new FilenameFilter(){
-            @Override
+//            @Override
             public boolean accept(File dir, String name) {
                 return name.endsWith("_mlsd.txt");
             }

Modified: commons/proper/net/trunk/src/test/java/org/apache/commons/net/io/ToNetASCIIInputStreamTest.java
URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/test/java/org/apache/commons/net/io/ToNetASCIIInputStreamTest.java?rev=1489361&r1=1489360&r2=1489361&view=diff
==============================================================================
--- commons/proper/net/trunk/src/test/java/org/apache/commons/net/io/ToNetASCIIInputStreamTest.java (original)
+++ commons/proper/net/trunk/src/test/java/org/apache/commons/net/io/ToNetASCIIInputStreamTest.java Tue Jun  4 09:48:36 2013
@@ -21,13 +21,13 @@ package org.apache.commons.net.io;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.nio.charset.Charset;
+//import java.nio.charset.Charset;
 import org.junit.Assert;
 import org.junit.Test;
 
 public class ToNetASCIIInputStreamTest {
 
-    private static final Charset ASCII = Charset.forName("ASCII");
+    private static final String ASCII = /*Charset.forName*/("ASCII");
 
     @Test
     public void testToNetASCIIInputStream1() throws Exception

Modified: commons/proper/net/trunk/src/test/java/org/apache/commons/net/telnet/TelnetClientTest.java
URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/test/java/org/apache/commons/net/telnet/TelnetClientTest.java?rev=1489361&r1=1489360&r2=1489361&view=diff
==============================================================================
--- commons/proper/net/trunk/src/test/java/org/apache/commons/net/telnet/TelnetClientTest.java (original)
+++ commons/proper/net/trunk/src/test/java/org/apache/commons/net/telnet/TelnetClientTest.java Tue Jun  4 09:48:36 2013
@@ -880,7 +880,7 @@ extends TestCase implements TelnetNotifi
      * @param option_code - code of the option negotiated
      * <p>
      ***/
-    @Override
+//    @Override
     public void receivedNegotiation(int negotiation_code, int option_code)
     {
         if(negotiation_code == TelnetNotificationHandler.RECEIVED_DO)

Modified: commons/proper/net/trunk/src/test/java/org/apache/commons/net/telnet/TelnetTestResponder.java
URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/test/java/org/apache/commons/net/telnet/TelnetTestResponder.java?rev=1489361&r1=1489360&r2=1489361&view=diff
==============================================================================
--- commons/proper/net/trunk/src/test/java/org/apache/commons/net/telnet/TelnetTestResponder.java (original)
+++ commons/proper/net/trunk/src/test/java/org/apache/commons/net/telnet/TelnetTestResponder.java Tue Jun  4 09:48:36 2013
@@ -60,7 +60,7 @@ public class TelnetTestResponder impleme
     /***
      * Runs the responder
      ***/
-    @Override
+//    @Override
     public void run()
     {
         boolean result = false;

Modified: commons/proper/net/trunk/src/test/java/org/apache/commons/net/telnet/TelnetTestSimpleServer.java
URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/test/java/org/apache/commons/net/telnet/TelnetTestSimpleServer.java?rev=1489361&r1=1489360&r2=1489361&view=diff
==============================================================================
--- commons/proper/net/trunk/src/test/java/org/apache/commons/net/telnet/TelnetTestSimpleServer.java (original)
+++ commons/proper/net/trunk/src/test/java/org/apache/commons/net/telnet/TelnetTestSimpleServer.java Tue Jun  4 09:48:36 2013
@@ -51,7 +51,7 @@ public class TelnetTestSimpleServer impl
     /***
      * Run for the thread. Waits for new connections
      ***/
-    @Override
+//    @Override
     public void run()
     {
         boolean bError = false;

Modified: commons/proper/net/trunk/src/test/java/org/apache/commons/net/tftp/TFTPServer.java
URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/test/java/org/apache/commons/net/tftp/TFTPServer.java?rev=1489361&r1=1489360&r2=1489361&view=diff
==============================================================================
--- commons/proper/net/trunk/src/test/java/org/apache/commons/net/tftp/TFTPServer.java (original)
+++ commons/proper/net/trunk/src/test/java/org/apache/commons/net/tftp/TFTPServer.java Tue Jun  4 09:48:36 2013
@@ -269,7 +269,7 @@ public class TFTPServer implements Runna
         return !shutdownServer;
     }
 
-    @Override
+//    @Override
     public void run()
     {
         try
@@ -371,7 +371,7 @@ public class TFTPServer implements Runna
             }
         }
 
-        @Override
+//        @Override
         public void run()
         {
             try

Modified: commons/proper/net/trunk/src/test/java/org/apache/commons/net/time/TimeTestSimpleServer.java
URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/test/java/org/apache/commons/net/time/TimeTestSimpleServer.java?rev=1489361&r1=1489360&r2=1489361&view=diff
==============================================================================
--- commons/proper/net/trunk/src/test/java/org/apache/commons/net/time/TimeTestSimpleServer.java (original)
+++ commons/proper/net/trunk/src/test/java/org/apache/commons/net/time/TimeTestSimpleServer.java Tue Jun  4 09:48:36 2013
@@ -105,7 +105,7 @@ public class TimeTestSimpleServer implem
     }
     }
 
-    @Override
+//    @Override
     public void run()
     {
         Socket socket = null;



Mime
View raw message