commons-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ima...@apache.org
Subject cvs commit: jakarta-commons-sandbox/vfs/src/java/org/apache/commons/vfs/provider/sftp SftpClientFactory.java
Date Fri, 10 Sep 2004 17:26:58 GMT
imario      2004/09/10 10:26:58

  Modified:    vfs      build.xml project.xml
               vfs/src/java/org/apache/commons/vfs Resources.properties
               vfs/src/java/org/apache/commons/vfs/provider/sftp
                        SftpClientFactory.java
  Log:
  jsch-0.1.17 - slight api change
  
  letz gump again
  
  Revision  Changes    Path
  1.26      +1 -1      jakarta-commons-sandbox/vfs/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/vfs/build.xml,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- build.xml	26 Aug 2004 16:58:36 -0000	1.25
  +++ build.xml	10 Sep 2004 17:26:57 -0000	1.26
  @@ -198,7 +198,7 @@
           </get>
           <get dest="${libdir}/commons-httpclient-2.0.jar" usetimestamp="true" ignoreerrors="true"
src="http://www.ibiblio.org/maven/commons-httpclient/jars/commons-httpclient-2.0.jar">
           </get>
  -        <get dest="${libdir}/jsch-0.1.16.jar" usetimestamp="true" ignoreerrors="true"
src="http://www.ibiblio.org/maven/jsch/jars/jsch-0.1.16.jar">
  +        <get dest="${libdir}/jsch-0.1.17.jar" usetimestamp="true" ignoreerrors="true"
src="http://www.ibiblio.org/maven/jsch/jars/jsch-0.1.17.jar">
           </get>
           <get dest="${libdir}/xml-apis-1.0.b2.jar" usetimestamp="true" ignoreerrors="true"
src="http://www.ibiblio.org/maven/xml-apis/jars/xml-apis-1.0.b2.jar">
           </get>
  
  
  
  1.42      +1 -1      jakarta-commons-sandbox/vfs/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/vfs/project.xml,v
  retrieving revision 1.41
  retrieving revision 1.42
  diff -u -r1.41 -r1.42
  --- project.xml	26 Aug 2004 17:46:27 -0000	1.41
  +++ project.xml	10 Sep 2004 17:26:57 -0000	1.42
  @@ -98,7 +98,7 @@
           <dependency>
               <groupId>jsch</groupId>
               <artifactId>jsch</artifactId>
  -            <version>0.1.16</version>
  +            <version>0.1.17</version>
           </dependency>
   
           <dependency>
  
  
  
  1.42      +1 -1      jakarta-commons-sandbox/vfs/src/java/org/apache/commons/vfs/Resources.properties
  
  Index: Resources.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/vfs/src/java/org/apache/commons/vfs/Resources.properties,v
  retrieving revision 1.41
  retrieving revision 1.42
  diff -u -r1.41 -r1.42
  --- Resources.properties	10 Aug 2004 13:51:21 -0000	1.41
  +++ Resources.properties	10 Sep 2004 17:26:58 -0000	1.42
  @@ -85,7 +85,6 @@
   vfs.provider/notify-listener.warn=Could not notify listener of change to "{0}".
   vfs.provider/replicate-missing-file.error=Could not replicate "{0}" as it does not exist.
   vfs.provider/replicate-file.error=Could not replicate "{0}".
  -vfs.provider/create-file.error=Could not create "{0}".
   
   # RandomAccess
   vfs.provider/random-access-invalid-position.error=Invalid position: "{0}"
  @@ -213,6 +212,7 @@
   vfs.provider.sftp/load-private-key.error=Could not load private key from "{0}".
   vfs.provider.sftp/config-sshdir.error=SSH-Folder "{0}" non existent or not a folder.
   vfs.provider.sftp/unknown-modtime.error=Last modification time not fetched.
  +vfs.provider.sftp/known-hosts.error=Error during processing known-hosts file "{0}".
   
   # Ant tasks
   vfs.tasks/sync.no-destination.error=No destination file or directory specified.
  
  
  
  1.2       +17 -3     jakarta-commons-sandbox/vfs/src/java/org/apache/commons/vfs/provider/sftp/SftpClientFactory.java
  
  Index: SftpClientFactory.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/vfs/src/java/org/apache/commons/vfs/provider/sftp/SftpClientFactory.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- SftpClientFactory.java	27 May 2004 19:09:37 -0000	1.1
  +++ SftpClientFactory.java	10 Sep 2004 17:26:58 -0000	1.2
  @@ -54,7 +54,14 @@
   
           if (knownHostsFile != null)
           {
  -            jsch.setKnownHosts(knownHostsFile.getAbsolutePath());
  +            try
  +            {
  +                jsch.setKnownHosts(knownHostsFile.getAbsolutePath());
  +            }
  +            catch (JSchException e)
  +            {
  +                throw new FileSystemException("vfs.provider.sftp/known-hosts.error", knownHostsFile.getAbsolutePath(),
e);
  +            }
           }
           else
           {
  @@ -66,7 +73,14 @@
               knownHostsFile = new File(sshDir, "known_hosts");
               if (knownHostsFile.isFile() && knownHostsFile.canRead())
               {
  -                jsch.setKnownHosts(knownHostsFile.getAbsolutePath());
  +                try
  +                {
  +                    jsch.setKnownHosts(knownHostsFile.getAbsolutePath());
  +                }
  +                catch (JSchException e)
  +                {
  +                    throw new FileSystemException("vfs.provider.sftp/known-hosts.error",
knownHostsFile.getAbsolutePath(), e);
  +                }
               }
           }
   
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org


Mime
View raw message