tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cos...@apache.org
Subject cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler Compiler.java
Date Tue, 10 Dec 2002 21:38:01 GMT
costin      2002/12/10 13:38:01

  Modified:    jasper2/src/share/org/apache/jasper/compiler Compiler.java
  Log:
  Port the fixes to main.
  This adds more debug info on compiler errors.
  
  Revision  Changes    Path
  1.42      +16 -2     jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Compiler.java
  
  Index: Compiler.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Compiler.java,v
  retrieving revision 1.41
  retrieving revision 1.42
  diff -u -r1.41 -r1.42
  --- Compiler.java	8 Dec 2002 13:42:53 -0000	1.41
  +++ Compiler.java	10 Dec 2002 21:38:00 -0000	1.42
  @@ -318,6 +318,10 @@
           StringBuffer errorReport = new StringBuffer();
           boolean success = true;
   
  +        StringBuffer info=new StringBuffer();
  +        info.append("Compile: javaFileName=" + javaFileName + "\n" );
  +        info.append("    classpath=" + classpath + "\n" );
  +
           // Start capturing the System.err output for this thread
           SystemLogHandler.setThread();
   
  @@ -328,11 +332,13 @@
           // Initializing classpath
           Path path = new Path(project);
           path.setPath(System.getProperty("java.class.path"));
  +        info.append("     cp=" + System.getProperty("java.class.path") + "\n");
           StringTokenizer tokenizer = new StringTokenizer(classpath, sep);
           while (tokenizer.hasMoreElements()) {
               String pathElement = tokenizer.nextToken();
               File repository = new File(pathElement);
               path.setLocation(repository);
  +            info.append("     cp=" + repository + "\n");
           }
   
           if( log.isDebugEnabled() )
  @@ -343,28 +349,36 @@
           Path srcPath = new Path(project);
           srcPath.setLocation(options.getScratchDir());
   
  +        info.append("     work dir=" + options.getScratchDir() + "\n");
  +
           // Configure the compiler object
           javac.setEncoding(javaEncoding);
           javac.setClasspath(path);
           javac.setDebug(ctxt.getOptions().getClassDebugInfo());
           javac.setSrcdir(srcPath);
           javac.setOptimize(! ctxt.getOptions().getClassDebugInfo() );
  +        info.append("    srcDir=" + srcPath + "\n" );
   
           // Set the Java compiler to use
           if (options.getCompiler() != null) {
               javac.setCompiler(options.getCompiler());
  +            info.append("    compiler=" + options.getCompiler() + "\n");
           }
   
           // Build includes path
           PatternSet.NameEntry includes = javac.createInclude();
  -        includes.setName(ctxt.getJspPath());
  +        File f=new File( ctxt.getJspPath());
  +
  +        includes.setName(f.getCanonicalPath());
  +        info.append("    include="+ ctxt.getJspPath() + "\n" );
   
           try {
               synchronized(javacLock) {
                   javac.execute();
               }
           } catch (BuildException e) {
  -            log.error( "Javac exception ", e);
  +            log.error( "Javac execption ", e);
  +            log.error( "Env: " + info.toString());
               success = false;
           }
   
  
  
  

--
To unsubscribe, e-mail:   <mailto:tomcat-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:tomcat-dev-help@jakarta.apache.org>


Mime
View raw message