[Xdoclet-devel] CVS update: xdoclet/core/src/xdoclet/loader BootstrapClassLoader.java Bootstrapper.java XDocletModule.java

[Aslak Helles?y]

  User: rinkrank
  Date: 02/04/21 13:40:13

  Modified:    core/src/xdoclet/loader BootstrapClassLoader.java
                        Bootstrapper.java XDocletModule.java
  Log:
  -handled classloading issues in xjavadoc in stead of xdoclet
  -some loader/module bugfixes
  
  Revision  Changes    Path
  1.4       +17 -8     xdoclet/core/src/xdoclet/loader/BootstrapClassLoader.java
  
  Index: BootstrapClassLoader.java
  ===================================================================
  RCS file: 
/cvsroot/xdoclet/xdoclet/core/src/xdoclet/loader/BootstrapClassLoader.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -w -r1.3 -r1.4
  --- BootstrapClassLoader.java 11 Apr 2002 20:53:00 -0000      1.3
  +++ BootstrapClassLoader.java 21 Apr 2002 20:40:13 -0000      1.4
  @@ -9,6 +9,8 @@
   import org.apache.bcel.classfile.*;
   import org.apache.bcel.generic.*;
   import org.apache.bcel.Constants;
  +import xdoclet.util.Log;
  +import org.apache.log4j.Category;
   
   import xdoclet.GenerationManager;
   
  @@ -49,7 +51,9 @@
   
                if( !myRealJarFile.exists() )
                {
  -                     System.err.println( "You have to put xdoclet.jar under " + 
myJarFile.getParentFile().getAbsolutePath() );
  +                     Category cat = Log.getCategory( BootstrapClassLoader.class, 
"getXDocletJar" );
  +
  +                     cat.error( "You have to put xdoclet.jar under " + 
myJarFile.getParentFile().getAbsolutePath() );
                        return null;
                }
                return myRealJarFile;
  @@ -135,7 +139,7 @@
                                JavaClass newClass = cg.getJavaClass();
   
                                // Dump it for debug analysis (TODO: remove)
  -                             newClass.dump( "fixed.class" );
  +                             // newClass.dump( "fixed.class" );
   
                                // Define the *real* class
                                byte[] bytes = newClass.getBytes();
  @@ -187,14 +191,19 @@
         */
        private Method createCreateMethod( ClassGen cg, Creator creator )
        {
  +             Category cat = Log.getCategory( getClass(), "getXDocletJar" );
  +
                System.out.println( "Adding create method " + creator.methodName + " 
to " + cg.getClassName() );
   
                /*
  +              * Here is what we want to generate
  +              *
                 * public bar.BarSubTask createBar() {
                 * bar.BarSubTask barSubTask = new bar.BarSubTask();
                 * _subTasks.add(barSubTask);
                 * return barSubTask;
                 * }
  +              *
                 * Byte offset Instruction      Argument
                 * 0          new              bar.BarSubTask
                 * 3          dup
  
  
  
  1.5       +4 -0      xdoclet/core/src/xdoclet/loader/Bootstrapper.java
  
  Index: Bootstrapper.java
  ===================================================================
  RCS file: /cvsroot/xdoclet/xdoclet/core/src/xdoclet/loader/Bootstrapper.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -w -r1.4 -r1.5
  --- Bootstrapper.java 12 Apr 2002 21:01:57 -0000      1.4
  +++ Bootstrapper.java 21 Apr 2002 20:40:13 -0000      1.5
  @@ -127,9 +127,13 @@
   
                        try
                        {
  +                             Class docletClass = cl.loadClass( "xdoclet.DocletTask" 
);
                                Class ejbDocletClass = cl.loadClass( 
"xdoclet.ejb.EjbDocletTask" );
  +                             Class webDocletClass = cl.loadClass( 
"xdoclet.web.WebDocletTask" );
   
  +                             project.addTaskDefinition( "xdoclet", docletClass );
                                project.addTaskDefinition( "ejbdoclet", ejbDocletClass 
);
  +                             project.addTaskDefinition( "webdoclet", webDocletClass 
);
                        }
                        catch( Exception e )
                        {
  
  
  
  1.5       +6 -2      xdoclet/core/src/xdoclet/loader/XDocletModule.java
  
  Index: XDocletModule.java
  ===================================================================
  RCS file: /cvsroot/xdoclet/xdoclet/core/src/xdoclet/loader/XDocletModule.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -w -r1.4 -r1.5
  --- XDocletModule.java        12 Apr 2002 21:01:57 -0000      1.4
  +++ XDocletModule.java        21 Apr 2002 20:40:13 -0000      1.5
  @@ -9,13 +9,15 @@
   import xdoclet.template.TemplateEngine;
   import xdoclet.template.TemplateTagHandler;
   import xdoclet.template.TemplateException;
  +import xdoclet.util.Log;
  +import org.apache.log4j.Category;
   
   /**
    * This is an object view of the data in xdoclet.xml
    *
    * @author    <a href="mailto:[EMAIL PROTECTED]";>Aslak Helles�y</a>
    * @created   7. april 2002
  - * @version   $Revision: 1.4 $
  + * @version   $Revision: 1.5 $
    */
   class XDocletModule
   {
  @@ -38,9 +40,11 @@
   
        public void addTagHandler( String namespace, String clazz )
        {
  +             Category cat = Log.getCategory( getClass(), "addTagHandler" );
  +
                try
                {
  -                     System.out.println( "********************** addTagHandler(" + 
namespace + "," + clazz + ")" );
  +                     cat.debug( "registering tag tandler " + clazz + " to namespace 
" + namespace + "." );
   
                        TemplateTagHandler handler = ( TemplateTagHandler ) 
Class.forName( clazz ).newInstance();
   
  
  
  

_______________________________________________
Xdoclet-devel mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/xdoclet-devel