[workspace-commit] CVS update: MODIFIED: util

[commit at globus.org]

, ExecuteUtil.java ...

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

  Modified:    vm/service/client/java/source/src/org/globus/workspace/cloud/client/util
                        ExecuteUtil.java CloudClientUtil.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.8       +8 -7      workspace/vm/service/client/java/source/src/org/globus/workspace/cloud/client/util/ExecuteUtil.java
  
  http://viewcvs.globus.org/viewcvs.cgi/workspace/vm/service/client/java/source/src/org/globus/workspace/cloud/client/util/ExecuteUtil.java.diff?r1=1.7&r2=1.8
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ExecuteUtil.java
  ===================================================================
  RCS file: /home/globdev/CVS/globus-packages/workspace/vm/service/client/java/source/src/org/globus/workspace/cloud/client/util/ExecuteUtil.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -b -r1.7 -r1.8
  --- ExecuteUtil.java	26 May 2009 22:55:34 -0000	1.7
  +++ ExecuteUtil.java	27 May 2009 16:38:05 -0000	1.8
  @@ -386,7 +386,8 @@
                                         Print print,
                                         String brokerURL,
                                         String brokerIdentityAuthorization,
  -                                      int durationMinutes)
  +                                       String sshKeyPath, int durationMinutes
  +    )
           throws ExecutionProblem, ExitNow {
   
           CloudDeployment[] clouds = new CloudDeployment[deploys.size()];
  @@ -488,7 +489,7 @@
               }
   
               final RunTask[] runTasks = cloud.generateRunTasks(brokerContact,
  -                cloudDirPath, durationMinutes, print);
  +                cloudDirPath, sshKeyPath, durationMinutes, print);
               final FutureTask[] futureTasks = new FutureTask[runTasks.length];
               for (int taskIndex = 0; taskIndex < futureTasks.length; taskIndex++) {
                   futureTasks[taskIndex] = new FutureTask(runTasks[taskIndex]);
  
  
  
  1.5       +20 -0     workspace/vm/service/client/java/source/src/org/globus/workspace/cloud/client/util/CloudClientUtil.java
  
  http://viewcvs.globus.org/viewcvs.cgi/workspace/vm/service/client/java/source/src/org/globus/workspace/cloud/client/util/CloudClientUtil.java.diff?r1=1.4&r2=1.5
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: CloudClientUtil.java
  ===================================================================
  RCS file: /home/globdev/CVS/globus-packages/workspace/vm/service/client/java/source/src/org/globus/workspace/cloud/client/util/CloudClientUtil.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -b -r1.4 -r1.5
  --- CloudClientUtil.java	26 May 2009 21:01:01 -0000	1.4
  +++ CloudClientUtil.java	27 May 2009 16:38:05 -0000	1.5
  @@ -659,6 +659,26 @@
           return imageURL;
       }
   
  +    public static String expandSshPath(String sshfile) 
  +        throws ParameterProblem {
  +
  +        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 " +
  +                        "properties file.");
  +            }
  +            final String result = sshfile.replaceFirst("~", homedir);
  +
  +            sshfile = result;
  +        }
  +        return sshfile;
  +    }
  +
       private static class dirFilter implements FilenameFilter {
           public boolean accept(File dir, String name) {
               final File test = new File(dir, name);