bodewig 2003/03/11 06:42:43
Modified: . build.xml
src/main/org/apache/tools/ant/taskdefs/optional/ssh
ScpFromMessage.java ScpToMessage.java
Log:
remove JDK 1.4 dependency
Revision Changes Path
1.356 +1 -1 ant/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/ant/build.xml,v
retrieving revision 1.355
retrieving revision 1.356
diff -u -r1.355 -r1.356
--- build.xml 11 Mar 2003 08:41:35 -0000 1.355
+++ build.xml 11 Mar 2003 14:42:42 -0000 1.356
@@ -144,6 +144,7 @@
<filename name="${optional.package}/sitraka/**"/>
<filename name="${optional.package}/ide/VAJ*"/>
<filename name="${optional.package}/starteam/*"/>
+ <filename name="${optional.package}/ssh/*"/>
<!-- uses JDK 1.2 classloading facilities -->
<filename name="${ant.package}/loader/AntClassLoader2.java"/>
</or>
@@ -157,7 +158,6 @@
<selector id="needs.jdk1.4+">
<or>
<filename name="${regexp.package}/Jdk14Regexp*"/>
- <filename name="${optional.package}/ssh/*"/>
</or>
</selector>
1.3 +1 -3 ant/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpFromMessage.java
Index: ScpFromMessage.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpFromMessage.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ScpFromMessage.java 10 Mar 2003 10:05:43 -0000 1.2
+++ ScpFromMessage.java 11 Mar 2003 14:42:43 -0000 1.3
@@ -58,7 +58,6 @@
import java.io.*;
import java.util.StringTokenizer;
-import java.text.NumberFormat;
public class ScpFromMessage extends AbstractSshMessage {
@@ -154,8 +153,7 @@
String command = token.nextToken();
int filesize = Integer.parseInt( token.nextToken() );
String filename = token.nextToken();
- NumberFormat formatter = NumberFormat.getIntegerInstance();
- log( "Receiving: " + filename + " : " + formatter.format( filesize ) );
+ log( "Receiving: " + filename + " : " + filesize);
File transferFile = ( localFile.isDirectory() )
? new File( localFile, filename )
: localFile;
1.3 +2 -4 ant/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpToMessage.java
Index: ScpToMessage.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpToMessage.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ScpToMessage.java 10 Mar 2003 10:05:43 -0000 1.2
+++ ScpToMessage.java 11 Mar 2003 14:42:43 -0000 1.3
@@ -60,7 +60,6 @@
import java.io.*;
import java.util.*;
-import java.text.NumberFormat;
public class ScpToMessage extends AbstractSshMessage {
@@ -182,9 +181,8 @@
long startTime = System.currentTimeMillis();
int totalLength = 0;
try {
- NumberFormat formatter = NumberFormat.getIntegerInstance();
- log( "Sending: " + localFile.getName() + " : " +
- formatter.format( localFile.length() ) );
+ log( "Sending: " + localFile.getName() + " : " +
+ localFile.length());
while (true) {
int len = fis.read(buf, 0, buf.length);
if (len <= 0) break;
|