Author: sebb
Date: Wed Mar 30 22:21:24 2011
New Revision: 1087107
URL: http://svn.apache.org/viewvc?rev=1087107&view=rev
Log:
Restore binary compatibility.
It seems fields cannot be pulled up to a super class without breaking binary
compat.
Modified:
commons/proper/net/trunk/src/main/java/org/apache/commons/net/SocketClient.java
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTP.java
commons/proper/net/trunk/src/main/java/org/apache/commons/net/nntp/NNTP.java
commons/proper/net/trunk/src/main/java/org/apache/commons/net/pop3/POP3.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/SocketClient.java
URL:
http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/SocketClient.java?rev=1087107&r1=1087106&r2=1087107&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
Wed Mar 30 22:21:24 2011
@@ -725,6 +725,11 @@ public abstract class SocketClient
}
}
+ // Provide read-only access (mainly for use in restoring binary
compatibility)
+ protected ProtocolCommandSupport getCommandSupport() {
+ return _commandSupport_;
+ }
+
}
Modified:
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTP.java
URL:
http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTP.java?rev=1087107&r1=1087106&r2=1087107&view=diff
==============================================================================
--- commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTP.java
(original)
+++ commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTP.java
Wed Mar 30 22:21:24 2011
@@ -29,6 +29,7 @@ import java.net.SocketTimeoutException;
import java.util.ArrayList;
import org.apache.commons.net.MalformedServerReplyException;
+import org.apache.commons.net.ProtocolCommandSupport;
import org.apache.commons.net.SocketClient;
/***
@@ -1709,6 +1710,14 @@ public class FTP extends SocketClient
public void setStrictMultilineParsing(boolean strictMultilineParsing) {
this.strictMultilineParsing = strictMultilineParsing;
}
+
+ /**
+ * Copy of commandSupport needed to maintain binary compatibility.
+ * Do not use.
+ * @deprecated 3.0 use {@link #getCommandSupport()} instead
+ */
+ @Deprecated
+ protected ProtocolCommandSupport _commandSupport_= getCommandSupport();
}
/* Emacs configuration
Modified:
commons/proper/net/trunk/src/main/java/org/apache/commons/net/nntp/NNTP.java
URL:
http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/nntp/NNTP.java?rev=1087107&r1=1087106&r2=1087107&view=diff
==============================================================================
---
commons/proper/net/trunk/src/main/java/org/apache/commons/net/nntp/NNTP.java
(original)
+++
commons/proper/net/trunk/src/main/java/org/apache/commons/net/nntp/NNTP.java
Wed Mar 30 22:21:24 2011
@@ -24,6 +24,7 @@ import java.io.InputStreamReader;
import java.io.OutputStreamWriter;
import org.apache.commons.net.MalformedServerReplyException;
+import org.apache.commons.net.ProtocolCommandSupport;
import org.apache.commons.net.SocketClient;
/***
@@ -1000,6 +1001,13 @@ public class NNTP extends SocketClient
return stat((long) a);
}
+ /**
+ * Copy of commandSupport needed to maintain binary compatibility.
+ * Do not use.
+ * @deprecated 3.0 use {@link #getCommandSupport()} instead
+ */
+ @Deprecated
+ protected ProtocolCommandSupport _commandSupport_= getCommandSupport();
}
/* Emacs configuration
Modified:
commons/proper/net/trunk/src/main/java/org/apache/commons/net/pop3/POP3.java
URL:
http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/pop3/POP3.java?rev=1087107&r1=1087106&r2=1087107&view=diff
==============================================================================
---
commons/proper/net/trunk/src/main/java/org/apache/commons/net/pop3/POP3.java
(original)
+++
commons/proper/net/trunk/src/main/java/org/apache/commons/net/pop3/POP3.java
Wed Mar 30 22:21:24 2011
@@ -27,6 +27,7 @@ import java.util.ArrayList;
import java.util.List;
import org.apache.commons.net.MalformedServerReplyException;
+import org.apache.commons.net.ProtocolCommandSupport;
import org.apache.commons.net.SocketClient;
/***
@@ -329,5 +330,13 @@ public class POP3 extends SocketClient
public void
removeProtocolCommandistener(org.apache.commons.net.ProtocolCommandListener
listener){
removeProtocolCommandListener(listener);
}
+
+ /**
+ * Copy of commandSupport needed to maintain binary compatibility.
+ * Do not use.
+ * @deprecated 3.0 use {@link #getCommandSupport()} instead
+ */
+ @Deprecated
+ protected ProtocolCommandSupport _commandSupport_= getCommandSupport();
}
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=1087107&r1=1087106&r2=1087107&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
Wed Mar 30 22:21:24 2011
@@ -25,6 +25,7 @@ import java.io.OutputStreamWriter;
import java.util.ArrayList;
import org.apache.commons.net.MalformedServerReplyException;
+import org.apache.commons.net.ProtocolCommandSupport;
import org.apache.commons.net.SocketClient;
/***
@@ -751,6 +752,14 @@ public class SMTP extends SocketClient
public void
removeProtocolCommandistener(org.apache.commons.net.ProtocolCommandListener
listener){
removeProtocolCommandListener(listener);
}
+
+ /**
+ * Copy of commandSupport needed to maintain binary compatibility.
+ * Do not use.
+ * @deprecated 3.0 use {@link #getCommandSupport()} instead
+ */
+ @Deprecated
+ protected ProtocolCommandSupport _commandSupport_= getCommandSupport();
}
/* Emacs configuration
