bloritsch 01/05/23 14:27:42
Modified: lib batik-all.jar
src/org/apache/cocoon/servlet CocoonServlet.java
src/org/apache/cocoon/util ClassUtils.java
src/org/apache/cocoon/xml/dom SVGBuilder.java
Log:
Update to most recent Batik
Revision Changes Path
1.2 +6882 -6490xml-cocoon2/lib/batik-all.jar
<<Binary file>>
1.5 +2 -3
xml-cocoon2/src/org/apache/cocoon/servlet/CocoonServlet.java
Index: CocoonServlet.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/servlet/CocoonServlet.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- CocoonServlet.java 2001/05/23 17:30:25 1.4
+++ CocoonServlet.java 2001/05/23 21:27:35 1.5
@@ -57,7 +57,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Stefano Mazzocchi</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Nicola Ken Barozzi</a> Aisa
* @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
- * @version CVS $Revision: 1.4 $ $Date: 2001/05/23 17:30:25 $
+ * @version CVS $Revision: 1.5 $ $Date: 2001/05/23 21:27:35 $
*/
public class CocoonServlet extends HttpServlet {
@@ -109,7 +109,6 @@
this.servletContext = conf.getServletContext();
- ClassUtils.setClassLoader(classLoader);
this.appContext.put(Constants.CONTEXT_CLASS_LOADER, classLoader);
this.appContext.put(Constants.CONTEXT_ENVIRONMENT_CONTEXT, new
HttpContext(this.servletContext));
@@ -157,7 +156,7 @@
* get the classloader to use for Cocoon instantiation
*/
protected RepositoryClassLoader buildInitClassLoader() {
- return new RepositoryClassLoader(new URL[] {},
this.getClass().getClassLoader());
+ return new RepositoryClassLoader(new URL[] {},
Thread.currentThread().getContextClassLoader());
}
/**
1.4 +2 -23 xml-cocoon2/src/org/apache/cocoon/util/ClassUtils.java
Index: ClassUtils.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/util/ClassUtils.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ClassUtils.java 2001/05/23 17:30:39 1.3
+++ ClassUtils.java 2001/05/23 21:27:37 1.4
@@ -18,16 +18,11 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Ricardo Rocha</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Stefano Mazzocchi</a>
- * @version CVS $Revision: 1.3 $ $Date: 2001/05/23 17:30:39 $
+ * @version CVS $Revision: 1.4 $ $Date: 2001/05/23 21:27:37 $
*/
public class ClassUtils {
/**
- * Reference for global ClassLoader that Cocoon uses throughout.
- */
- private static ClassLoader loader = null;
-
- /**
* Create a new instance given a class name
*
* @param className A class name
@@ -73,23 +68,7 @@
* @return The context classloader.
*/
public static ClassLoader getClassLoader() {
- if (ClassUtils.loader == null) {
- setClassLoader(Thread.currentThread().getContextClassLoader());
- }
-
- return ClassUtils.loader;
- }
-
- /**
- * Set the context classloader
- * BL: if this is command line operation, the classloading issues
- * are more sane. During servlet execution, we explicitly set
- * the ClassLoader.
- */
- public static void setClassLoader(ClassLoader loader) {
- if (ClassUtils.loader == null) {
- ClassUtils.loader = loader;
- }
+ return Thread.currentThread().getContextClassLoader();
}
/**
1.2 +2 -2 xml-cocoon2/src/org/apache/cocoon/xml/dom/SVGBuilder.java
Index: SVGBuilder.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/xml/dom/SVGBuilder.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SVGBuilder.java 2001/05/09 20:49:32 1.1
+++ SVGBuilder.java 2001/05/23 21:27:40 1.2
@@ -37,7 +37,7 @@
* SVG-DOM Document from SAX events using Batik's SVGDocumentFactory.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Davanum Srinivas</a>
- * @version CVS $Revision: 1.1 $ $Date: 2001/05/09 20:49:32 $
+ * @version CVS $Revision: 1.2 $ $Date: 2001/05/23 21:27:40 $
*/
public class SVGBuilder extends SAXSVGDocumentFactory implements
XMLConsumer, Loggable {
protected Logger log;
@@ -46,7 +46,7 @@
= "org.apache.xerces.parsers.SAXParser";
private final static String CSS_PARSER_CLASS_NAME =
- "org.w3c.flute.parser.Parser";
+ "org.apache.batik.css.parser.Parser";
static {
CSSDocumentHandler.setParserClassName(CSS_PARSER_CLASS_NAME);
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
