bodewig 2003/03/11 02:57:43
Modified: src/main/org/apache/tools/ant/types Path.java
Log:
Adapt to JDK 1.4.1 for Mac OS X.
Note that there are more jars in that directory that I'm not sure
about (whether we want to add them in addJavaRuntime, that is).
Revision Changes Path
1.47 +6 -1 ant/src/main/org/apache/tools/ant/types/Path.java
Index: Path.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/types/Path.java,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- Path.java 7 Mar 2003 11:23:07 -0000 1.46
+++ Path.java 11 Mar 2003 10:57:42 -0000 1.47
@@ -621,12 +621,17 @@
+ File.separator + "lib"
+ File.separator + "rt.jar"));
- // Sun's 1.4 has JCE and JSSE in separate jars.
+ // Sun's and Apple's 1.4 have JCE and JSSE in separate jars.
String[] secJars = { "jce", "jsse" };
for (int i = 0; i < secJars.length; i++) {
addExisting(new Path(null,
System.getProperty("java.home")
+ File.separator + "lib"
+ + File.separator + secJars[i] +
".jar"));
+ addExisting(new Path(null,
+ System.getProperty("java.home")
+ + File.separator + ".."
+ + File.separator + "Classes"
+ File.separator + secJars[i] +
".jar"));
}