Removed deprecated functions and module

9 files changed, 11 insertions, 424 deletions

diff --git a/lib/ssh/doc/src/notes.xml b/lib/ssh/doc/src/notes.xml
index 0ce83fa5d1..67a226f726 100644
--- a/lib/ssh/doc/src/notes.xml
+++ b/lib/ssh/doc/src/notes.xml
@@ -29,7 +29,7 @@
     <file>notes.xml</file>
   </header>
 
- <section><title>Ssh 1.1.9</title>
+ <section><title>Ssh 2.0</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
       <list>
@@ -46,6 +46,8 @@
           <p>The configuration parameter ip_v6_disabled is now available,
              which makes it possible for the user to alter the IP version
              SSH shall use.</p>
+          <p>
+            *** POTENTIAL INCOMPATIBILITY ***</p>
           <p>Own Id: OTP-8535 Aux Id:</p>
         </item>
         <item>
@@ -57,6 +59,13 @@
              message is not handled correctly.</p>
           <p>Own Id: OTP-8524 Aux Id:</p>
         </item>
+        <item>
+          <p>Removed deprecated modules (ssh_ssh, ssh_sshd and ssh_cm) and
+             functions (ssh_sftp:connect and ssh_sftp:stop).</p>
+          <p>
+            *** POTENTIAL INCOMPATIBILITY ***</p>
+          <p>Own Id: OTP-8596 Aux Id:</p>
+        </item>
       </list>
     </section>
 
diff --git a/lib/ssh/src/Makefile b/lib/ssh/src/Makefile
index 48473804d1..42880fa80b 100644
--- a/lib/ssh/src/Makefile
+++ b/lib/ssh/src/Makefile
@@ -56,7 +56,6 @@ MODULES= \
 	ssh_auth\
 	ssh_bits \
 	ssh_cli \
-	ssh_cm \
 	ssh_dsa \
 	ssh_file \
 	ssh_io \
@@ -67,8 +66,6 @@ MODULES= \
 	ssh_sftpd \
 	ssh_sftpd_file\
 	ssh_sftpd_file_api \
-	ssh_ssh \
-	ssh_sshd \
 	ssh_transport \
 	ssh_userreg \
 	ssh_xfer
diff --git a/lib/ssh/src/ssh.app.src b/lib/ssh/src/ssh.app.src
index 9319f39591..8a3e15841f 100644
--- a/lib/ssh/src/ssh.app.src
+++ b/lib/ssh/src/ssh.app.src
@@ -14,7 +14,6 @@
 	     ssh_cli,
 	     ssh_channel,
 	     ssh_channel_sup,
-	     ssh_cm,
 	     ssh_connection,
 	     ssh_connection_handler,
 	     ssh_connection_manager,
@@ -32,8 +31,6 @@
 	     ssh_sftpd,
 	     ssh_sftpd_file,
 	     ssh_sftpd_file_api,
-	     ssh_ssh,
-	     ssh_sshd,
 	     ssh_subsystem_sup,
 	     ssh_sup,
 	     ssh_system_sup,
diff --git a/lib/ssh/src/ssh.appup.src b/lib/ssh/src/ssh.appup.src
index 8f4b46051d..21f7508555 100644
--- a/lib/ssh/src/ssh.appup.src
+++ b/lib/ssh/src/ssh.appup.src
@@ -19,36 +19,8 @@
 
 {"%VSN%",	
  [
-  {"1.1.8", [{load_module, ssh_connection_manager, soft_purge, soft_purge, []},
-             {load_module, ssh, soft_purge, soft_purge, []},
-             {load_module, ssh_cli, soft_purge, soft_purge, []},
-             {load_module, ssh_connection, soft_purge, soft_purge, []}]},
-  {"1.1.7", [{load_module, ssh_connection_handler, soft_purge, soft_purge, []},
-             {load_module, ssh_connection, soft_purge, soft_purge, []},
-             {load_module, ssh, soft_purge, soft_purge, []},
-             {load_module, ssh_cli, soft_purge, soft_purge, []},
-             {load_module, ssh_connection_manager, soft_purge, soft_purge, []}]},
-  {"1.1.6", [{restart_application, ssh}]},
-  {"1.1.5", [{restart_application, ssh}]},
-  {"1.1.4", [{restart_application, ssh}]},
-  {"1.1.3", [{restart_application, ssh}]},
-  {"1.1.2", [{restart_application, ssh}]}
  ],
  [
-  {"1.1.8", [{load_module, ssh_connection_manager, soft_purge, soft_purge, []},
-             {load_module, ssh, soft_purge, soft_purge, []},
-             {load_module, ssh_cli, soft_purge, soft_purge, []},
-             {load_module, ssh_connection, soft_purge, soft_purge, []}]},
-  {"1.1.7", [{load_module, ssh_connection_handler, soft_purge, soft_purge, []},
-             {load_module, ssh_connection, soft_purge, soft_purge, []},
-             {load_module, ssh, soft_purge, soft_purge, []},
-             {load_module, ssh_cli, soft_purge, soft_purge, []},
-             {load_module, ssh_connection_manager, soft_purge, soft_purge, []}]},
-  {"1.1.6", [{restart_application, ssh}]},
-  {"1.1.5", [{restart_application, ssh}]},
-  {"1.1.4", [{restart_application, ssh}]},
-  {"1.1.3", [{restart_application, ssh}]},
-  {"1.1.2", [{restart_application, ssh}]}
  ] 
 }.
 
diff --git a/lib/ssh/src/ssh_cm.erl b/lib/ssh/src/ssh_cm.erl
deleted file mode 100755
index e582fedf50..0000000000
--- a/lib/ssh/src/ssh_cm.erl
+++ /dev/null
@@ -1,237 +0,0 @@
-%%
-%% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 2005-2010. All Rights Reserved.
-%%
-%% The contents of this file are subject to the Erlang Public License,
-%% Version 1.1, (the "License"); you may not use this file except in
-%% compliance with the License. You should have received a copy of the
-%% Erlang Public License along with this software. If not, it can be
-%% retrieved online at http://www.erlang.org/.
-%%
-%% Software distributed under the License is distributed on an "AS IS"
-%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-%% the License for the specific language governing rights and limitations
-%% under the License.
-%%
-%% %CopyrightEnd%
-%%
-
-%%
-
-%%% Description : Backwards compatibility wrapper
-
--module(ssh_cm).
-
--include("ssh.hrl").
--include("ssh_connect.hrl").
-
-%% -define(DEFAULT_PACKET_SIZE, 32768).
-%% -define(DEFAULT_WINDOW_SIZE, 2*?DEFAULT_PACKET_SIZE).
-%%-define(DEFAULT_TIMEOUT, 5000).
-
--export([connect/1, connect/2, connect/3]).
--export([listen/2, listen/3, listen/4, stop_listener/1]).
--export([stop/1]).
-
--deprecated({connect, 1, next_major_release}).
--deprecated({connect, 2, next_major_release}).
--deprecated({connect, 3, next_major_release}).
--deprecated({listen, 2, next_major_release}).
--deprecated({listen, 3, next_major_release}).
--deprecated({listen, 4, next_major_release}).
--deprecated({stop_listener, 1, next_major_release}).
--deprecated({stop, 1, next_major_release}).
-
--export([adjust_window/3, attach/2, attach/3, detach/2,
-	 tcpip_forward/3, cancel_tcpip_forward/3, direct_tcpip/6,
-	 direct_tcpip/8, close/2, shell/2, exec/4,
-	 send/3, send/4,
-	 send_ack/3, send_ack/4, send_ack/5, send_eof/2,
-	 session_open/2, session_open/4, subsystem/4,
-	 open_pty/3, open_pty/7, open_pty/9,
-	 set_user_ack/4, 
-	 setenv/5, signal/3, winch/4]).
-
--deprecated({adjust_window, 3, next_major_release}).
--deprecated({attach, 2, next_major_release}).
--deprecated({attach, 3, next_major_release}).
--deprecated({detach, 2, next_major_release}).
--deprecated({tcpip_forward, 3, next_major_release}).
--deprecated({cancel_tcpip_forward, 3, next_major_release}).
--deprecated({direct_tcpip, 6, next_major_release}).
--deprecated({direct_tcpip, 8, next_major_release}).
--deprecated({close, 2, next_major_release}).
--deprecated({shell, 2, next_major_release}).
--deprecated({exec, 4, next_major_release}).
--deprecated({send, 3, next_major_release}).
--deprecated({send, 4, next_major_release}).
--deprecated({send_ack, 3, next_major_release}).
--deprecated({send_ack, 4, next_major_release}).
--deprecated({send_ack, 5, next_major_release}).
--deprecated({send_eof, 2, next_major_release}).
--deprecated({session_open, 2, next_major_release}).
--deprecated({session_open, 4, next_major_release}).
--deprecated({subsystem, 4, next_major_release}).
--deprecated({open_pty, 3, next_major_release}).
--deprecated({open_pty, 7, next_major_release}).
--deprecated({open_pty, 9, next_major_release}).
--deprecated({set_user_ack, 4, next_major_release}).
--deprecated({setenv, 5, next_major_release}).
--deprecated({signal, 3, next_major_release}).
--deprecated({winch, 4, next_major_release}).
-
--export([info/1, info/2, recv_window/3,
-	 send_window/3, renegotiate/1, renegotiate/2,
-	 get_peer_addr/1]). 
-
-%%====================================================================
-%% API
-%%====================================================================
-connect(Host) ->
-    connect(Host, []).
-connect(Host, Opts) ->
-    connect(Host, ?SSH_DEFAULT_PORT, Opts).
-connect(Host, Port, Opts) ->
-    ssh:connect(Host, Port, Opts).
-
-listen(ChannelSpec, Port) ->
-    listen(ChannelSpec, Port, []).
-listen(ChannelSpec, Port, Opts) ->
-    listen(ChannelSpec, any, Port, Opts).
-listen(ChannelSpec, "localhost", Port, Opts) ->
-    listen(ChannelSpec, any, Port, Opts);
-listen(_ChannelSpec, Host, Port, Opts) ->
-    ssh:daemon(Host, Port, Opts).
-
-stop_listener(SysSup) ->
-    ssh_system_sup:stop_listener(SysSup).
-stop(Cm) ->
-    ssh:close(Cm).
-
-%% CM Client commands
-session_open(Cm, Timeout) ->
-    session_open(Cm, ?DEFAULT_WINDOW_SIZE, ?DEFAULT_PACKET_SIZE, Timeout).
-
-session_open(Cm, InitialWindowSize, MaxPacketSize, Timeout) ->
-    ssh_connection:session_channel(Cm, InitialWindowSize, MaxPacketSize,
-				   Timeout).
-
-
-setenv(Cm, Channel, Var, Value, Timeout) ->
-    ssh_connection:setenv(Cm, Channel, Var, Value, Timeout).
-
-shell(Cm, Channel) ->
-    ssh_connection:shell(Cm, Channel).
-
-exec(Cm, Channel, Command, Timeout) ->
-    ssh_connection:exec(Cm, Channel, Command, Timeout).
-
-subsystem(Cm, Channel, SubSystem, Timeout) ->
-    ssh_connection:subsystem(Cm, Channel, SubSystem, Timeout).
-
-%% Not needed for backwards compatibility for now
-attach(_Cm, _Timeout) ->
-    ok.
-
-attach(_Cm, _ChannelPid, _Timeout) ->
-    ok.
-
-detach(_Cm, _Timeout) ->
-    ok.
-
-%% Not needed, send_ack is now call! Temp backwardcompability
-set_user_ack(_, _, _, _) ->
-    ok.
-
-adjust_window(Cm, Channel, Bytes) ->
-    ssh_connection:adjust_window(Cm, Channel, Bytes).
-
-close(Cm, Channel) ->
-    ssh_connection:close(Cm, Channel).
-
-send_eof(Cm, Channel) ->
-    ssh_connection:send_eof(Cm, Channel).
-
-send(Cm, Channel, Data) ->
-    ssh_connection:send(Cm, Channel, 0, Data).
-
-send(Cm, Channel, Type, Data) ->
-    ssh_connection:send(Cm, Channel, Type, Data).
-
-%% Send ack is not needed 
-send_ack(Cm, Channel, Data) ->
-    send_ack(Cm, Channel, 0, Data, infinity).
-
-send_ack(Cm, Channel, Type, Data) ->
-    send_ack(Cm, Channel, Type, Data, infinity).
-
-send_ack(Cm, Channel, Type, Data, Timeout) ->
-    ssh_connection:send(Cm, Channel, Type, Data, Timeout).
-
-%% ----------------------------------------------------------------------
-%% These functions replacers are not officially supported but proably will be
-%% when we had time to test them.
-%% ----------------------------------------------------------------------
-direct_tcpip(Cm, RemoteHost, RemotePort, OrigIP, OrigPort, Timeout) ->
-    direct_tcpip(Cm, RemoteHost, RemotePort, OrigIP, OrigPort,
-		 ?DEFAULT_WINDOW_SIZE, ?DEFAULT_PACKET_SIZE, Timeout).
-
-direct_tcpip(Cm, RemoteIP, RemotePort, OrigIP, OrigPort,
-	     InitialWindowSize, MaxPacketSize, Timeout) ->
-    ssh_connection:direct_tcpip(Cm, RemoteIP, RemotePort,
-				OrigIP, OrigPort,
-				InitialWindowSize, 
-				MaxPacketSize, Timeout).
-
-tcpip_forward(Cm, BindIP, BindPort) ->
-    ssh_connection:tcpip_forward(Cm, BindIP, BindPort).
-
-cancel_tcpip_forward(Cm, BindIP, Port) ->
-    ssh_connection:cancel_tcpip_forward(Cm, BindIP, Port).
-
-open_pty(Cm, Channel, Timeout) ->
-    open_pty(Cm, Channel, os:getenv("TERM"), 80, 24, [], Timeout).
-
-open_pty(Cm, Channel, Term, Width, Height, PtyOpts, Timeout) ->
-    open_pty(Cm, Channel, Term, Width, Height, 0, 0, PtyOpts, Timeout).
-
-open_pty(Cm, Channel, Term, Width, Height, PixWidth, PixHeight, 
-	 PtyOpts, Timeout) ->
-    ssh_connection:open_pty(Cm, Channel, Term, 
-				     Width, Height, PixWidth, 
-				     PixHeight, PtyOpts, Timeout).
-winch(Cm, Channel, Width, Height) ->
-    winch(Cm, Channel, Width, Height, 0, 0).
-winch(Cm, Channel, Width, Height, PixWidth, PixHeight) ->
-    ssh_connection:window_change(Cm, Channel, Width,
-					  Height, PixWidth, PixHeight).
-signal(Cm, Channel, Sig) ->
-    ssh_connection:signal(Cm, Channel, Sig).
-    
-%% ----------------------------------------------------------------------
-%% These functions replacers are not officially supported and
-%% the format of them will proably change when and
-%% if they get supported.
-%% ----------------------------------------------------------------------
-info(Cm) ->
-    info(Cm, all).
-
-info(Cm, ChannelPid) ->
-    ssh_connection_manager:info(Cm, ChannelPid).
-
-send_window(Cm, Channel, Timeout) ->
-    ssh_connection_manager:send_window(Cm, Channel, Timeout).
-
-recv_window(Cm, Channel, Timeout) ->
-    ssh_connection_manager:recv_window(Cm, Channel, Timeout).
-
-renegotiate(Cm) ->
-    renegotiate(Cm, []).
-renegotiate(Cm, _Opts) ->
-    %%TODO: How should this work, backwards compat?
-   ssh_connection_manager:renegotiate(Cm).
-
-get_peer_addr(Cm) ->
-    ssh_connection_manager:peer_addr(Cm).
-    
diff --git a/lib/ssh/src/ssh_sftp.erl b/lib/ssh/src/ssh_sftp.erl
index 43323a1562..59e09fdd0f 100755
--- a/lib/ssh/src/ssh_sftp.erl
+++ b/lib/ssh/src/ssh_sftp.erl
@@ -46,14 +46,6 @@
 	 recv_window/1, list_dir/2, read_file/2, write_file/3,
 	 recv_window/2, list_dir/3, read_file/3, write_file/4]).
 
-%% Deprecated
--export([connect/1, connect/2, connect/3, stop/1]).
-
--deprecated({connect, 1, next_major_release}).
--deprecated({connect, 2, next_major_release}).
--deprecated({connect, 3, next_major_release}).
--deprecated({stop, 1, next_major_release}).
-
 %% ssh_channel callbacks
 -export([init/1, handle_call/3, handle_msg/2, handle_ssh_msg/2, terminate/2]).
 %% TODO: Should be placed elsewhere ssh_sftpd should not call functions in ssh_sftp!
@@ -1116,33 +1108,3 @@ lseek_pos(_, _, _) ->
     {error, einval}. 
  
 
-%%%%%% Deprecated %%%%
-connect(Cm) when is_pid(Cm) ->
-    connect(Cm, []);
-connect(Host) when is_list(Host) ->
-    connect(Host, []).					 
-connect(Cm, Opts) when is_pid(Cm) ->
-    Timeout = proplists:get_value(timeout, Opts, infinity),
-    case ssh_xfer:attach(Cm, []) of
-	{ok, ChannelId, Cm} -> 
-	    ssh_channel:start(Cm, ChannelId, ?MODULE, [Cm, ChannelId,
-						       Timeout]);
-	Error ->
-	    Error
-    end;
-connect(Host, Opts) ->
-    connect(Host, 22, Opts).
-connect(Host, Port, Opts) ->
-    Timeout = proplists:get_value(timeout, Opts, infinity),
-    case ssh_xfer:connect(Host, Port, proplists:delete(timeout, Opts)) of
-	{ok, ChannelId, Cm} ->
-	    ssh_channel:start(Cm, ChannelId, ?MODULE, [Cm, 
-						       ChannelId, Timeout]);
-	Error ->
-	    Error	    
-    end.
-
-
-stop(Pid) ->
-    call(Pid, stop, infinity).
-
diff --git a/lib/ssh/src/ssh_ssh.erl b/lib/ssh/src/ssh_ssh.erl
deleted file mode 100644
index b1ad90731d..0000000000
--- a/lib/ssh/src/ssh_ssh.erl
+++ /dev/null
@@ -1,65 +0,0 @@
-%%
-%% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 2005-2010. All Rights Reserved.
-%%
-%% The contents of this file are subject to the Erlang Public License,
-%% Version 1.1, (the "License"); you may not use this file except in
-%% compliance with the License. You should have received a copy of the
-%% Erlang Public License along with this software. If not, it can be
-%% retrieved online at http://www.erlang.org/.
-%%
-%% Software distributed under the License is distributed on an "AS IS"
-%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-%% the License for the specific language governing rights and limitations
-%% under the License.
-%%
-%% %CopyrightEnd%
-%%
-
-%%
-
-%%% Description: THIS MODULE IS DEPRECATD AND SHOULD BE REMOVED IN R14
-
--module(ssh_ssh).
-
--export([connect/1, connect/2, connect/3]).
--deprecated({connect, 1, next_major_release}).
--deprecated({connect, 2, next_major_release}).
--deprecated({connect, 3, next_major_release}).
-
--include("ssh.hrl").
--include("ssh_connect.hrl").
-
--define(default_timeout, 10000).
-
-%%% Backwards compatibility
-connect(A) -> 
-    connect(A, []).
-
-connect(Host, Opts) when is_list(Host) ->
-    connect(Host, 22, Opts);
-connect(CM, Opts) ->
-    Timeout = proplists:get_value(connect_timeout, Opts, ?default_timeout),
-    session(CM, Timeout).
-
-connect(Host, Port, Opts) ->
-    case ssh:connect(Host, Port, Opts) of
-	{ok, CM} ->
-	    session(CM, proplists:get_value(connect_timeout,
-					    Opts, ?default_timeout));
-	Error ->
-	    Error
-    end.
-
-session(CM, Timeout) ->
-    case ssh_connection:session_channel(CM, Timeout) of
-	{ok, ChannelId}  ->
-	    Args = [{channel_cb, ssh_shell}, 
-		    {init_args,[CM, ChannelId]},
-		    {cm, CM}, {channel_id, ChannelId}],
-	    {ok, State} = ssh_channel:init([Args]),
-	    ssh_channel:enter_loop(State);
-	Error ->
-	    Error
-    end.
diff --git a/lib/ssh/src/ssh_sshd.erl b/lib/ssh/src/ssh_sshd.erl
deleted file mode 100644
index ab997765e9..0000000000
--- a/lib/ssh/src/ssh_sshd.erl
+++ /dev/null
@@ -1,48 +0,0 @@
-%%
-%% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 2005-2010. All Rights Reserved.
-%%
-%% The contents of this file are subject to the Erlang Public License,
-%% Version 1.1, (the "License"); you may not use this file except in
-%% compliance with the License. You should have received a copy of the
-%% Erlang Public License along with this software. If not, it can be
-%% retrieved online at http://www.erlang.org/.
-%%
-%% Software distributed under the License is distributed on an "AS IS"
-%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-%% the License for the specific language governing rights and limitations
-%% under the License.
-%%
-%% %CopyrightEnd%
-%%
-
-%%
-%% Description: This module uses the erlang shell and
-%% ssh_cli to make an erlang sshd
-
--module(ssh_sshd).
-
-%% API
--export([listen/0, listen/1, listen/2, listen/3, stop/1]).
-
--deprecated({listen, 0, next_major_release}).
--deprecated({listen, 1, next_major_release}).
--deprecated({listen, 2, next_major_release}).
--deprecated({listen, 3, next_major_release}).
--deprecated({stop, 1, next_major_release}).
-
-listen() ->
-    listen(22).
-
-listen(Port) ->
-    listen(Port, []).
-
-listen(Port, Opts) ->
-    listen(any, Port, Opts).
-
-listen(Addr, Port, Opts) ->
-    ssh:daemon(Addr, Port, Opts).
-
-stop(Pid) ->
-    ssh:stop_daemon(Pid).
diff --git a/lib/ssh/vsn.mk b/lib/ssh/vsn.mk
index 074826cafd..fabe83d1b3 100644
--- a/lib/ssh/vsn.mk
+++ b/lib/ssh/vsn.mk
@@ -1,6 +1,6 @@
 #-*-makefile-*-   ; force emacs to enter makefile-mode
 
-SSH_VSN = 1.1.9
+SSH_VSN = 2.0
 APP_VSN    = "ssh-$(SSH_VSN)"
 
 TICKETS = OTP-8524 \