Browse Source
Merge fix for 23320 from 1.6 branch
git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@275281 13f79535-47bb-0310-9956-ffa450edef68master
Stefan Bodewig
22 years ago
4 changed files with 15 additions and 6 deletions
Unified View
Diff Options
-
+3 -0WHATSNEW
-
+2 -2build.xml
-
+3 -3docs/manual/cover.html
-
+7 -1src/main/org/apache/tools/ant/taskdefs/optional/splash/SplashTask.java
+ 3
- 0
WHATSNEW
View File
| @@ -245,6 +245,9 @@ Fixed bugs: | |||||
| * <junit includeantruntime="true" fork="true"> replaced the CLASSPATH instead | * <junit includeantruntime="true" fork="true"> replaced the CLASSPATH instead | ||||
| of adding to it. Bugzilla Report 14971. | 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: | Other changes: | ||||
| -------------- | -------------- | ||||
| * All tasks can be used outside of <target>s. Note that some tasks | * All tasks can be used outside of <target>s. Note that some tasks | ||||
+ 2
- 2
build.xml
View File
| @@ -25,8 +25,8 @@ | |||||
| --> | --> | ||||
| <property name="Name" value="Apache Ant"/> | <property name="Name" value="Apache Ant"/> | ||||
| <property name="name" value="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="bootstrap.jar" value="ant-bootstrap.jar"/> | ||||
| <property name="ant.package" value="org/apache/tools/ant"/> | <property name="ant.package" value="org/apache/tools/ant"/> | ||||
+ 3
- 3
docs/manual/cover.html
View File
| @@ -2,14 +2,14 @@ | |||||
| <head> | <head> | ||||
| <meta http-equiv="Content-Language" content="en-us"> | <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> | </head> | ||||
| <body bgcolor="#FFFFFF"> | <body bgcolor="#FFFFFF"> | ||||
| <div align="center"> | <div align="center"> | ||||
| <h1><img src="../images/ant_logo_large.gif" width="190" height="120"></h1> | <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>. | <a href="http://ant.apache.org/index.html">Apache Ant</a>. | ||||
| If your version | If your version | ||||
| of Ant (as verified with <tt>ant -version</tt>) is older or newer than this | of Ant (as verified with <tt>ant -version</tt>) is older or newer than this | ||||
+ 7
- 1
src/main/org/apache/tools/ant/taskdefs/optional/splash/SplashTask.java
View File
| @@ -198,7 +198,13 @@ public class SplashTask extends Task { | |||||
| } | } | ||||
| if (in == null) { | 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) { | if (in != null) { | ||||