bodewig 2003/01/23 07:12:02
Modified: src/main/org/apache/tools/ant/types Tag: ANT_15_BRANCH
Path.java
Log:
Merge fix for 16242 from HEAD
Revision Changes Path
No revision
No revision
1.38.2.3 +12 -2 jakarta-ant/src/main/org/apache/tools/ant/types/Path.java
Index: Path.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/main/org/apache/tools/ant/types/Path.java,v
retrieving revision 1.38.2.2
retrieving revision 1.38.2.3
diff -u -r1.38.2.2 -r1.38.2.3
--- Path.java 13 Dec 2002 12:32:42 -0000 1.38.2.2
+++ Path.java 23 Jan 2003 15:12:00 -0000 1.38.2.3
@@ -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
@@ -605,7 +605,17 @@
+ File.separator + "lib"
+ File.separator + "rt.jar"));
- // IBM's 1.4 has rt.jar split into 5 smaller jars.
+ // Sun's 1.4 has 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"));
+ }
+
+ // IBM's 1.4 has rt.jar split into 4 smaller jars and a combined
+ // JCE/JSSE in security.jar.
String[] ibmJars =
{ "core", "graphics", "security", "server", "xml" };
for (int i = 0; i < ibmJars.length; i++) {
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
