[workspace-commit] CVS update: MODIFIED: client

[commit at globus.org]

, CloudClient.java
 ...

  User: labisso 
  Date: 09/05/27 11:38:05

  Modified:    vm/service/client/java/source/src/org/globus/workspace/cloud/client
                        CloudClient.java
  Log:
  Factored SSH key expansion routine out to CloudClientUtil.
  Made SSH key path part of parameter set instead of cloud config.
  Fixed bugs, got multi-cloud deployment and contextualization to work (but actually only over a single cloud).
  
  Revision  Changes    Path
  1.9       +1 -22     workspace/vm/service/client/java/source/src/org/globus/workspace/cloud/client/CloudClient.java
  
  http://viewcvs.globus.org/viewcvs.cgi/workspace/vm/service/client/java/source/src/org/globus/workspace/cloud/client/CloudClient.java.diff?r1=1.8&r2=1.9
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: CloudClient.java
  ===================================================================
  RCS file: /home/globdev/CVS/globus-packages/workspace/vm/service/client/java/source/src/org/globus/workspace/cloud/client/CloudClient.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -b -r1.8 -r1.9
  --- CloudClient.java	26 May 2009 21:01:01 -0000	1.8
  +++ CloudClient.java	27 May 2009 16:38:05 -0000	1.9
  @@ -780,28 +780,7 @@
   
           if (sshfile != null) {
   
  -            if (sshfile.startsWith("~")) {
  -
  -                final String homedir = System.getProperty("user.home");
  -
  -                if (homedir == null || homedir.trim().length() == 0) {
  -                    throw new ParameterProblem("Need to replace tilde in " +
  -                            "SSH public key file, but cannot determine " +
  -                            "user home directory.  Please hardcode, see '" +
  -                            this.args.getPropertiesPath() + "' file.");
  -                }
  -
  -                this.print.debugln("\n(tilde expansion necessary)");
  -                this.print.debugln("$user.home = " + homedir);
  -
  -                final String result = sshfile.replaceFirst("~", homedir);
  -
  -                this.print.infoln("SSH public keyfile contained tilde:");
  -                this.print.infoln("  - '" + sshfile + "' --> '" +
  -                                 result + "'");
  -
  -                sshfile = result;
  -            }
  +            sshfile = CloudClientUtil.expandSshPath(sshfile);
   
               final File f = new File(sshfile);
               sshfile = f.getAbsolutePath();