Return-Path: 
 <ant-dev-return-41072-qmlist-jakarta-archive-ant-dev=jakarta.apache.org@jakarta.apache.org>
Delivered-To: apmail-jakarta-ant-dev-archive@apache.org
Received: (qmail 54802 invoked from network); 13 Jan 2003 12:39:26 -0000
Received: from exchange.sun.com (192.18.33.10)
  by daedalus.apache.org with SMTP; 13 Jan 2003 12:39:26 -0000
Received: (qmail 3955 invoked by uid 97); 13 Jan 2003 12:40:42 -0000
Delivered-To: qmlist-jakarta-archive-ant-dev@jakarta.apache.org
Received: (qmail 3898 invoked by uid 97); 13 Jan 2003 12:40:41 -0000
Mailing-List: contact ant-dev-help@jakarta.apache.org; run by ezmlm
Precedence: bulk
List-Unsubscribe: <mailto:ant-dev-unsubscribe@jakarta.apache.org>
List-Subscribe: <mailto:ant-dev-subscribe@jakarta.apache.org>
List-Help: <mailto:ant-dev-help@jakarta.apache.org>
List-Post: <mailto:ant-dev@jakarta.apache.org>
List-Id: "Ant Developers List" <ant-dev.jakarta.apache.org>
Reply-To: "Ant Developers List" <ant-dev@jakarta.apache.org>
Delivered-To: mailing list ant-dev@jakarta.apache.org
Received: (qmail 3843 invoked by uid 97); 13 Jan 2003 12:40:40 -0000
X-Antivirus: nagoya (v4218 created Aug 14 2002)
Date: 13 Jan 2003 12:39:17 -0000
Message-ID: <20030113123917.26793.qmail@icarus.apache.org>
From: bodewig@apache.org
To: jakarta-ant-cvs@apache.org
Subject: cvs commit: jakarta-ant/src/main/org/apache/tools/ant/taskdefs
 Get.java
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N

bodewig     2003/01/13 04:39:17

  Modified:    .        Tag: ANT_15_BRANCH WHATSNEW build.xml
               src/main/org/apache/tools/ant/taskdefs Tag: ANT_15_BRANCH
                        Get.java
  Log:
  Move <get> task back to ant.jar.
  PR: 11216
  
  Merge patch for 16006 from HEAD.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.263.2.107 +3 -0      jakarta-ant/WHATSNEW
  
  Index: WHATSNEW
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/WHATSNEW,v
  retrieving revision 1.263.2.106
  retrieving revision 1.263.2.107
  diff -u -r1.263.2.106 -r1.263.2.107
  --- WHATSNEW	6 Jan 2003 14:11:52 -0000	1.263.2.106
  +++ WHATSNEW	13 Jan 2003 12:39:17 -0000	1.263.2.107
  @@ -51,6 +51,9 @@
     elements in Ant and the refid attribute didn't point to an existing
     project reference.
   
  +* The <get> task can now be compiled (and Ant thus bootstrapped) using
  +  Kaffee.
  +
   Other changes:
   --------------
   
  
  
  
  1.304.2.38 +1 -5      jakarta-ant/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/build.xml,v
  retrieving revision 1.304.2.37
  retrieving revision 1.304.2.38
  diff -u -r1.304.2.37 -r1.304.2.38
  --- build.xml	21 Nov 2002 09:49:08 -0000	1.304.2.37
  +++ build.xml	13 Jan 2003 12:39:17 -0000	1.304.2.38
  @@ -4,7 +4,7 @@
     =======================================================================
      Apache Ant own build file
   
  -   Copyright (c) 2000-2002 The Apache Software Foundation.  All rights
  +   Copyright (c) 2000-2003 The Apache Software Foundation.  All rights
      reserved.
   
     =======================================================================
  @@ -173,8 +173,6 @@
                unless="sunuue.present"/>
     </patternset>
     <patternset id="needs.sun.b64">
  -    <exclude name="${ant.package}/taskdefs/Get.java"
  -             unless="base64.present"/>
       <exclude name="${optional.package}/splash/SplashTask.java"
                unless="base64.present"/>
     </patternset>
  @@ -670,7 +668,6 @@
         <exclude name="${ant.package}/listener/CommonsLoggingListener.class"/>
         <exclude name="${ant.package}/taskdefs/email/UUMailer.class"/>
         <exclude name="${ant.package}/taskdefs/email/MimeMailer.class"/>
  -      <exclude name="${ant.package}/taskdefs/Get.class"/>
         <metainf dir="${build.dir}" includes="LICENSE.txt"/>
   
         <manifest>
  @@ -710,7 +707,6 @@
         <include name="${ant.package}/listener/CommonsLoggingListener.class"/>
         <include name="${ant.package}/taskdefs/email/UUMailer.class"/>
         <include name="${ant.package}/taskdefs/email/MimeMailer.class"/>
  -      <include name="${ant.package}/taskdefs/Get.class"/>
         <metainf dir="${build.dir}" includes="LICENSE.txt"/>
   
         <manifest>
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.25.2.4  +6 -5      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Get.java
  
  Index: Get.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Get.java,v
  retrieving revision 1.25.2.3
  retrieving revision 1.25.2.4
  diff -u -r1.25.2.3 -r1.25.2.4
  --- Get.java	24 Jun 2002 02:28:08 -0000	1.25.2.3
  +++ Get.java	13 Jan 2003 12:39:17 -0000	1.25.2.4
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2000-2002 The Apache Software Foundation.  All rights
  + * Copyright (c) 2000-2003 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  @@ -146,10 +146,11 @@
                   String encoding;
                   // check to see if sun's Base64 encoder is available.
                   try {
  -                    sun.misc.BASE64Encoder encoder =
  -                        (sun.misc.BASE64Encoder)
  -                        Class.forName("sun.misc.BASE64Encoder").newInstance();
  -                    encoding = encoder.encode (up.getBytes());
  +                    Object encoder =
  +                            Class.forName("sun.misc.BASE64Encoder").newInstance();
  +                    encoding = (String) 
  +                            encoder.getClass().getMethod("encode", new Class[] {byte[].class})
  +                            .invoke(encoder, new Object[] {up.getBytes()});
   
                   } catch (Exception ex) { // sun's base64 encoder isn't available
                       Base64Converter encoder = new Base64Converter();
  
  
  

--
To unsubscribe, e-mail:   <mailto:ant-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:ant-dev-help@jakarta.apache.org>