Return-Path: Delivered-To: apmail-ant-dev-archive@www.apache.org Received: (qmail 89987 invoked from network); 26 Sep 2007 06:59:18 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 26 Sep 2007 06:59:18 -0000 Received: (qmail 7747 invoked by uid 500); 26 Sep 2007 06:59:08 -0000 Delivered-To: apmail-ant-dev-archive@ant.apache.org Received: (qmail 7711 invoked by uid 500); 26 Sep 2007 06:59:08 -0000 Mailing-List: contact dev-help@ant.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Help: List-Post: List-Id: "Ant Developers List" Reply-To: "Ant Developers List" Delivered-To: mailing list dev@ant.apache.org Received: (qmail 7700 invoked by uid 99); 26 Sep 2007 06:59:08 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 25 Sep 2007 23:59:08 -0700 X-ASF-Spam-Status: No, hits=-0.0 required=10.0 tests=SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (nike.apache.org: local policy) Received: from [193.109.238.66] (HELO dnsinet.rzf-nrw.de) (193.109.238.66) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 26 Sep 2007 07:01:24 +0000 Received: from z011100.bk.fin.local (z011100.bk.fin.local [172.18.101.140]) by dnsinet.rzf-nrw.de (8.14.0/8.14.0) with ESMTP id l8Q6wi1E006831 for ; Wed, 26 Sep 2007 08:58:44 +0200 Received: from z011034.bk.fin.local ([130.11.7.34]) by z011100.bk.fin.local with Microsoft SMTPSVC(6.0.3790.0); Wed, 26 Sep 2007 08:58:49 +0200 X-MimeOLE: Produced By Microsoft Exchange V6.5.7226.0 Content-class: urn:content-classes:message MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Subject: AW: svn commit: r579266 - in /ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ssh: ScpFromMessage.java ScpFromMessageBySftp.java ScpToMessage.java ScpToMessageBySftp.java Date: Wed, 26 Sep 2007 08:58:44 +0200 Message-ID: X-MS-Has-Attach: X-MS-TNEF-Correlator: Thread-Topic: svn commit: r579266 - in /ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ssh: ScpFromMessage.java ScpFromMessageBySftp.java ScpToMessage.java ScpToMessageBySftp.java Thread-Index: Acf/geCzl+V5fGMORCyj6p4ysXkkogAiKF7g From: To: X-OriginalArrivalTime: 26 Sep 2007 06:58:49.0604 (UTC) FILETIME=[B0CE4440:01C8000A] X-Virus-Checked: Checked by ClamAV on apache.org What about pulling the HUNDRED_KILOBYTES constant to AbstractSshMessage = and make it protected? Or using a utility class holding these constants? Jan >-----Urspr=FCngliche Nachricht----- >Von: peterreilly@apache.org [mailto:peterreilly@apache.org]=20 >Gesendet: Dienstag, 25. September 2007 16:39 >An: ant-cvs@apache.org >Betreff: svn commit: r579266 - in=20 >/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional >/ssh: ScpFromMessage.java ScpFromMessageBySftp.java=20 >ScpToMessage.java ScpToMessageBySftp.java > >Author: peterreilly >Date: Tue Sep 25 07:38:40 2007 >New Revision: 579266 > >URL: http://svn.apache.org/viewvc?rev=3D579266&view=3Drev >Log: >magic number > >Modified: > =20 >ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ >ssh/ScpFromMessage.java > =20 >ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ >ssh/ScpFromMessageBySftp.java > =20 >ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ >ssh/ScpToMessage.java > =20 >ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ >ssh/ScpToMessageBySftp.java > >Modified:=20 >ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ >ssh/ScpFromMessage.java >URL:=20 >http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache >/tools/ant/taskdefs/optional/ssh/ScpFromMessage.java?rev=3D579266 >&r1=3D579265&r2=3D579266&view=3Ddiff >=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D >=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D >---=20 >ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ >ssh/ScpFromMessage.java (original) >+++=20 >ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ >ssh/ScpFromMessage.java Tue Sep 25 07:38:40 2007 >@@ -34,6 +34,7 @@ > */ > public class ScpFromMessage extends AbstractSshMessage { >=20 >+ private static final int HUNDRED_KILOBYTES =3D 102400; > private static final byte LINE_FEED =3D 0x0a; > private static final int BUFFER_SIZE =3D 1024; >=20 >@@ -207,7 +208,7 @@ > long startTime =3D System.currentTimeMillis(); >=20 > // only track progress for files larger than 100kb in=20 >verbose mode >- boolean trackProgress =3D getVerbose() && filesize > 102400; >+ boolean trackProgress =3D getVerbose() && filesize >=20 >HUNDRED_KILOBYTES; > // since filesize keeps on decreasing we have to store the > // initial filesize > long initFilesize =3D filesize; > >Modified:=20 >ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ >ssh/ScpFromMessageBySftp.java >URL:=20 >http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache >/tools/ant/taskdefs/optional/ssh/ScpFromMessageBySftp.java?rev=3D >579266&r1=3D579265&r2=3D579266&view=3Ddiff >=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D >=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D >---=20 >ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ >ssh/ScpFromMessageBySftp.java (original) >+++=20 >ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ >ssh/ScpFromMessageBySftp.java Tue Sep 25 07:38:40 2007 >@@ -33,6 +33,8 @@ > */ > public class ScpFromMessageBySftp extends ScpFromMessage { >=20 >+ private static final int HUNDRED_KILOBYTES =3D 102400; >+ > private String remoteFile; > private File localFile; > private boolean isRecursive =3D false; >@@ -154,7 +156,7 @@ > long totalLength =3D le.getAttrs().getSize(); >=20 > SftpProgressMonitor monitor =3D null; >- boolean trackProgress =3D getVerbose() && totalLength > = 102400; >+ boolean trackProgress =3D getVerbose() && totalLength >=20 >HUNDRED_KILOBYTES; > if (trackProgress) { > monitor =3D getProgressMonitor(); > } > >Modified:=20 >ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ >ssh/ScpToMessage.java >URL:=20 >http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache >/tools/ant/taskdefs/optional/ssh/ScpToMessage.java?rev=3D579266&r >1=3D579265&r2=3D579266&view=3Ddiff >=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D >=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D >---=20 >ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ >ssh/ScpToMessage.java (original) >+++=20 >ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ >ssh/ScpToMessage.java Tue Sep 25 07:38:40 2007 >@@ -34,6 +34,7 @@ > */ > public class ScpToMessage extends AbstractSshMessage { >=20 >+ private static final int HUNDRED_KILOBYTES =3D 102400; > private static final int BUFFER_SIZE =3D 1024; >=20 > private File localFile; >@@ -234,7 +235,7 @@ > long totalLength =3D 0; >=20 > // only track progress for files larger than 100kb in=20 >verbose mode >- boolean trackProgress =3D getVerbose() && filesize > 102400; >+ boolean trackProgress =3D getVerbose() && filesize >=20 >HUNDRED_KILOBYTES; > // since filesize keeps on decreasing we have to store the > // initial filesize > long initFilesize =3D filesize; > >Modified:=20 >ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ >ssh/ScpToMessageBySftp.java >URL:=20 >http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache >/tools/ant/taskdefs/optional/ssh/ScpToMessageBySftp.java?rev=3D57 >9266&r1=3D579265&r2=3D579266&view=3Ddiff >=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D >=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D >---=20 >ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ >ssh/ScpToMessageBySftp.java (original) >+++=20 >ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ >ssh/ScpToMessageBySftp.java Tue Sep 25 07:38:40 2007 >@@ -34,6 +34,8 @@ > */ > public class ScpToMessageBySftp extends=20 >ScpToMessage/*AbstractSshMessage*/ { >=20 >+ private static final int HUNDRED_KILOBYTES =3D 102400; >+ > private File localFile; > private String remotePath; > private List directoryList; >@@ -205,7 +207,7 @@ > long totalLength =3D filesize; >=20 > // only track progress for files larger than 100kb in=20 >verbose mode >- boolean trackProgress =3D getVerbose() && filesize > 102400; >+ boolean trackProgress =3D getVerbose() && filesize >=20 >HUNDRED_KILOBYTES; >=20 > SftpProgressMonitor monitor =3D null; > if (trackProgress) { > > > >--------------------------------------------------------------------- >To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org >For additional commands, e-mail: dev-help@ant.apache.org > > --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org For additional commands, e-mail: dev-help@ant.apache.org