bloritsch    01/05/23 10:02:39

  Modified:    src/org/apache/cocoon/generation JspGenerator.java
               src/org/apache/cocoon/transformation TraxTransformer.java
               src/org/apache/cocoon/util ClassUtils.java
  Log:
  ClassLoader fixes
  
  Revision  Changes    Path
  1.4       +2 -2      
xml-cocoon2/src/org/apache/cocoon/generation/JspGenerator.java
  
  Index: JspGenerator.java
  ===================================================================
  RCS file: 
/home/cvs/xml-cocoon2/src/org/apache/cocoon/generation/JspGenerator.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- JspGenerator.java 2001/05/22 14:40:59     1.3
  +++ JspGenerator.java 2001/05/23 17:02:24     1.4
  @@ -48,7 +48,7 @@
    * results into SAX events.
    *
    * @author <a href="mailto:[EMAIL PROTECTED]">Davanum Srinivas</a>
  - * @version CVS $Revision: 1.3 $ $Date: 2001/05/22 14:40:59 $
  + * @version CVS $Revision: 1.4 $ $Date: 2001/05/23 17:02:24 $
    */
   public class JspGenerator extends ServletGenerator implements Recyclable {
   
  @@ -74,7 +74,7 @@
               MyServletResponse response = new MyServletResponse(httpResponse);
   
               // start JSPServlet.
  -            Class clazz = 
Class.forName("org.apache.jasper.servlet.JspServlet");
  +            Class clazz = 
Thread.currentThread().getContextClassLoader().loadClass("org.apache.jasper.servlet.JspServlet");
               HttpServlet jsp = (HttpServlet) clazz.newInstance();
               jsp.init(new 
config((ServletContext)this.objectModel.get(HttpEnvironment.HTTP_SERVLET_CONTEXT)));
               jsp.service(request, response);
  
  
  
  1.5       +2 -2      
xml-cocoon2/src/org/apache/cocoon/transformation/TraxTransformer.java
  
  Index: TraxTransformer.java
  ===================================================================
  RCS file: 
/home/cvs/xml-cocoon2/src/org/apache/cocoon/transformation/TraxTransformer.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- TraxTransformer.java      2001/05/23 08:57:27     1.4
  +++ TraxTransformer.java      2001/05/23 17:02:31     1.5
  @@ -100,7 +100,7 @@
    * @author <a href="mailto:[EMAIL PROTECTED]">Davanum Srinivas</a>
    * @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a>
    * @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
  - * @version CVS $Id: TraxTransformer.java,v 1.4 2001/05/23 08:57:27 
cziegeler Exp $
  + * @version CVS $Id: TraxTransformer.java,v 1.5 2001/05/23 17:02:31 
bloritsch Exp $
    */
   public class TraxTransformer extends ContentHandlerWrapper
   implements Transformer, Composable, Recyclable, Configurable, Cacheable, 
Disposable, URIResolver {
  @@ -492,7 +492,7 @@
           //       there is a failure in the pipeline.
           try {
               Class clazz =
  -                Class.forName("org.apache.xalan.stree.SourceTreeHandler");
  +                
Thread.currentThread().getContextClassLoader().loadClass("org.apache.xalan.stree.SourceTreeHandler");
               Class  paramTypes[] =
                       new Class[]{ Exception.class };
               Object params[] =
  
  
  
  1.2       +2 -2      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.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ClassUtils.java   2001/05/09 20:49:32     1.1
  +++ ClassUtils.java   2001/05/23 17:02:36     1.2
  @@ -18,7 +18,7 @@
    *
    * @author <a href="mailto:[EMAIL PROTECTED]">Ricardo Rocha</a>
    * @author <a href="mailto:[EMAIL PROTECTED]">Stefano Mazzocchi</a>
  - * @version CVS $Revision: 1.1 $ $Date: 2001/05/09 20:49:32 $
  + * @version CVS $Revision: 1.2 $ $Date: 2001/05/23 17:02:36 $
    */
   public class ClassUtils {
   
  @@ -52,7 +52,7 @@
        * @exception ClassNotFoundException If a loading error occurs
        */
       public static Class loadClass(String className) throws 
ClassNotFoundException {
  -        return Class.forName(className);
  +        return 
Thread.currentThread().getContextClassLoader().loadClass(className);
       }
   
       /**
  
  
  

----------------------------------------------------------------------
In case of troubles, e-mail:     [EMAIL PROTECTED]
To unsubscribe, e-mail:          [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to