[Saga-devel] saga SVN commit 3269: /trunk/adaptors/ssh/

[amerzky at cct.lsu.edu]

User: amerzky
Date: 2009/01/14 07:24 AM

Modified:
 /trunk/adaptors/ssh/config/
  saga_ssh.m4
 /trunk/adaptors/ssh/ssh_context/
  ssh_context_adaptor.cpp, ssh_context_adaptor.hpp
 /trunk/adaptors/ssh/ssh_job/
  ssh_job.cpp, ssh_job_service.cpp

Log:
 avoid symbol duplication with globus adaptors

File Changes:

Directory: /trunk/adaptors/ssh/config/
======================================

File [modified]: saga_ssh.m4
Delta lines: +0 -4
===================================================================
--- trunk/adaptors/ssh/config/saga_ssh.m4	2009-01-14 10:36:41 UTC (rev 3268)
+++ trunk/adaptors/ssh/config/saga_ssh.m4	2009-01-14 13:23:57 UTC (rev 3269)
@@ -8,10 +8,6 @@
 #
 #   Test for the ssh command line tools.
 #
-#   If no path to the installed aws tools is given,
-#   the macro searchs under /usr, /usr/local, /opt and
-#   /usr/local/package/aws-*
-#
 #   This macro calls:
 #
 #     AC_SUBST(HAVE_SSH)

Directory: /trunk/adaptors/ssh/ssh_context/
===========================================

File [modified]: ssh_context_adaptor.cpp
Delta lines: +1 -11
===================================================================
--- trunk/adaptors/ssh/ssh_context/ssh_context_adaptor.cpp	2009-01-14 10:36:41 UTC (rev 3268)
+++ trunk/adaptors/ssh/ssh_context/ssh_context_adaptor.cpp	2009-01-14 13:23:57 UTC (rev 3269)
@@ -18,16 +18,6 @@
 
 #define ADAPTORS_SSH_CONTEXT_TYPE "ssh"
 
-struct cert_info_t {
-    bool         success;
-    std::string  errormessage;
-    std::string  private_key;
-    std::string  public_key;
-    std::string  userid;
-};
-
-cert_info_t get_cert_info (std::string proxy_path = "");
-
 SAGA_ADAPTOR_REGISTER (context_adaptor);
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -159,7 +149,7 @@
 //
 // init a cert, either from a given path, or from a default location
 //
-cert_info_t get_cert_info (std::string path)
+context_cpi_impl::cert_info_t context_cpi_impl::get_cert_info (std::string path)
 {
   cert_info_t ci;
 

File [modified]: ssh_context_adaptor.hpp
Delta lines: +10 -0
===================================================================
--- trunk/adaptors/ssh/ssh_context/ssh_context_adaptor.hpp	2009-01-14 10:36:41 UTC (rev 3268)
+++ trunk/adaptors/ssh/ssh_context/ssh_context_adaptor.hpp	2009-01-14 13:23:57 UTC (rev 3269)
@@ -55,6 +55,16 @@
     private:
       typedef saga::adaptors::v1_0::context_cpi <context_cpi_impl> base_cpi;
 
+      struct cert_info_t {
+        bool         success;
+        std::string  errormessage;
+        std::string  private_key;
+        std::string  public_key;
+        std::string  userid;
+      };
+
+      cert_info_t get_cert_info (std::string proxy_path = "");
+
     public:    
       typedef base_cpi::mutex_type mutex_type;
 

Directory: /trunk/adaptors/ssh/ssh_job/
=======================================

File [modified]: ssh_job.cpp
Delta lines: +2 -2
===================================================================
--- trunk/adaptors/ssh/ssh_job/ssh_job.cpp	2009-01-14 10:36:41 UTC (rev 3268)
+++ trunk/adaptors/ssh/ssh_job/ssh_job.cpp	2009-01-14 13:23:57 UTC (rev 3269)
@@ -61,8 +61,8 @@
     ssh_bin_ = ini_["ssh_bin"];
     scp_bin_ = ini_["scp_bin"];
 
-    ssh_opt_ = saga::adaptors::utils::split (ini_["ssh_opt"]);
-    scp_opt_ = saga::adaptors::utils::split (ini_["scp_opt"]);
+    ssh_opt_ = saga::adaptors::utils::split (ini_["ssh_opt"], ' ');
+    scp_opt_ = saga::adaptors::utils::split (ini_["scp_opt"], ' ');
 
     if ( rm_.get_scheme () != "ssh" &&
          rm_.get_scheme () != "any" &&

File [modified]: ssh_job_service.cpp
Delta lines: +2 -2
===================================================================
--- trunk/adaptors/ssh/ssh_job/ssh_job_service.cpp	2009-01-14 10:36:41 UTC (rev 3268)
+++ trunk/adaptors/ssh/ssh_job/ssh_job_service.cpp	2009-01-14 13:23:57 UTC (rev 3269)
@@ -55,8 +55,8 @@
     ssh_bin_ = ini_["ssh_bin"];
     scp_bin_ = ini_["scp_bin"];
 
-    ssh_opt_ = saga::adaptors::utils::split (ini_["ssh_opt"]);
-    scp_opt_ = saga::adaptors::utils::split (ini_["scp_opt"]);
+    ssh_opt_ = saga::adaptors::utils::split (ini_["ssh_opt"], ' ');
+    scp_opt_ = saga::adaptors::utils::split (ini_["scp_opt"], ' ');
 
     if ( rm_.get_scheme () != "ssh" &&
          rm_.get_scheme () != "any" &&