ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bode...@apache.org
Subject cvs commit: ant/src/main/org/apache/tools/ant/taskdefs/optional/splash SplashTask.java
Date Mon, 22 Sep 2003 15:05:21 GMT
bodewig     2003/09/22 08:05:21

  Modified:    .        WHATSNEW build.xml
               docs/manual cover.html
               src/main/org/apache/tools/ant/taskdefs/optional/splash
                        SplashTask.java
  Log:
  Merge fix for 23320 from 1.6 branch
  
  Revision  Changes    Path
  1.504     +3 -0      ant/WHATSNEW
  
  Index: WHATSNEW
  ===================================================================
  RCS file: /home/cvs/ant/WHATSNEW,v
  retrieving revision 1.503
  retrieving revision 1.504
  diff -u -r1.503 -r1.504
  --- WHATSNEW	19 Sep 2003 09:18:16 -0000	1.503
  +++ WHATSNEW	22 Sep 2003 15:05:21 -0000	1.504
  @@ -245,6 +245,9 @@
   * <junit includeantruntime="true" fork="true"> replaced the CLASSPATH instead
     of adding to it.  Bugzilla Report 14971.
   
  +* <splash> could fail on JVMs that use null to indicate the system classloader.
  +  Bugzilla Report 23320.
  +
   Other changes:
   --------------
   * All tasks can be used outside of <target>s.  Note that some tasks
  
  
  
  1.393     +2 -2      ant/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/ant/build.xml,v
  retrieving revision 1.392
  retrieving revision 1.393
  diff -u -r1.392 -r1.393
  --- build.xml	3 Sep 2003 10:01:29 -0000	1.392
  +++ build.xml	22 Sep 2003 15:05:21 -0000	1.393
  @@ -25,8 +25,8 @@
     -->
     <property name="Name" value="Apache Ant"/>
     <property name="name" value="ant"/>
  -  <property name="version" value="1.6alpha"/>
  -  <property name="manifest-version" value="1.6"/>
  +  <property name="version" value="1.7alpha"/>
  +  <property name="manifest-version" value="1.7"/>
     <property name="bootstrap.jar" value="ant-bootstrap.jar"/>
   
     <property name="ant.package" value="org/apache/tools/ant"/>
  
  
  
  1.7       +3 -3      ant/docs/manual/cover.html
  
  Index: cover.html
  ===================================================================
  RCS file: /home/cvs/ant/docs/manual/cover.html,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- cover.html	24 Jan 2003 08:55:05 -0000	1.6
  +++ cover.html	22 Sep 2003 15:05:21 -0000	1.7
  @@ -2,14 +2,14 @@
   
   <head>
   <meta http-equiv="Content-Language" content="en-us">
  -<title>Apache Ant 1.6 User Manual</title>
  +<title>Apache Ant 1.7 User Manual</title>
   </head>
   
   <body bgcolor="#FFFFFF">
   <div align="center"> 
     <h1><img src="../images/ant_logo_large.gif" width="190" height="120"></h1>
  -  <h1>Apache Ant 1.6 Manual</h1>
  -  <p align="left">This is the manual for version 1.6alpha of 
  +  <h1>Apache Ant 1.7 Manual</h1>
  +  <p align="left">This is the manual for version 1.7alpha of 
     <a href="http://ant.apache.org/index.html">Apache Ant</a>. 
       If your version 
       of Ant (as verified with <tt>ant -version</tt>) is older or newer than
this 
  
  
  
  1.10      +7 -1      ant/src/main/org/apache/tools/ant/taskdefs/optional/splash/SplashTask.java
  
  Index: SplashTask.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/splash/SplashTask.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- SplashTask.java	22 Aug 2003 15:25:44 -0000	1.9
  +++ SplashTask.java	22 Sep 2003 15:05:21 -0000	1.10
  @@ -198,7 +198,13 @@
           }
   
           if (in == null) {
  -            in = SplashTask.class.getClassLoader().getResourceAsStream("images/ant_logo_large.gif");
  +            ClassLoader cl = SplashTask.class.getClassLoader();
  +            if (cl != null) {
  +                in = cl.getResourceAsStream("images/ant_logo_large.gif");
  +            } else {
  +                in = ClassLoader
  +                    .getSystemResourceAsStream("images/ant_logo_large.gif");
  +            }
           }
   
           if (in != null) {
  
  
  

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


Mime
View raw message