morten 01/10/30 23:48:09
Modified: java/src/org/apache/xalan/xsltc/compiler XSLTC.java
Log:
Integrated a fix from John Howard for forcing forward slashes in file paths
in JAR files and in manifests in JAR files.
PR: bugzilla 4464
Obtained from: n/a
Submitted by: John Howard ([EMAIL PROTECTED])
Reviewed by: [EMAIL PROTECTED]
Revision Changes Path
1.32 +8 -5
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/XSLTC.java
Index: XSLTC.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/XSLTC.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- XSLTC.java 2001/10/29 11:47:25 1.31
+++ XSLTC.java 2001/10/31 07:48:09 1.32
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: XSLTC.java,v 1.31 2001/10/29 11:47:25 morten Exp $
+ * @(#)$Id: XSLTC.java,v 1.32 2001/10/31 07:48:09 morten Exp $
*
* The Apache Software License, Version 1.1
*
@@ -60,6 +60,7 @@
* @author Santiago Pericas-Geertsen
* @author G. Todd Miller
* @author Morten Jorgensen
+ * @author John Howard ([EMAIL PROTECTED])
*
*/
@@ -693,9 +694,10 @@
new java.util.jar.Attributes.Name("Date");
while (classes.hasMoreElements()) {
final JavaClass clazz = (JavaClass)classes.nextElement();
+ final String className = clazz.getClassName().replace('.','/');
final java.util.jar.Attributes attr = new
java.util.jar.Attributes();
attr.put(dateAttr, now);
- map.put(classFileName(clazz.getClassName()), attr);
+ map.put(className+".class", attr);
}
final File jarFile = new File(_destDir, _jarFileName);
@@ -703,10 +705,11 @@
new JarOutputStream(new FileOutputStream(jarFile), manifest);
classes = _classes.elements();
while (classes.hasMoreElements()) {
- final JavaClass cl = (JavaClass)classes.nextElement();
- jos.putNextEntry(new JarEntry(classFileName(cl.getClassName())));
+ final JavaClass clazz = (JavaClass)classes.nextElement();
+ final String className = clazz.getClassName().replace('.','/');
+ jos.putNextEntry(new JarEntry(className+".class"));
final ByteArrayOutputStream out = new ByteArrayOutputStream(2048);
- cl.dump(out); // dump() closes it's output stream
+ clazz.dump(out); // dump() closes it's output stream
out.writeTo(jos);
}
jos.close();
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
