Don't like ads? PRO users don't see any ads ;-)
Public Pastes
Guest

Untitled

By: a guest on Jun 13th, 2012  |  syntax: None  |  size: 3.60 KB  |  hits: 21  |  expires: Never
download  |  raw  |  embed  |  report abuse  |  print
Text below is selected. Please press Ctrl+C to copy to your clipboard. (⌘+C on Mac)
  1. diff -Nru commons-jci-1.0-src/compilers/janino/src/main/java/org/apache/commons/jci/compilers/JaninoCompilationProblem.java commons-jci-1.0-src-gil/compilers/janino/src/main/java/org/apache/commons/jci/compilers/JaninoCompilationProblem.java
  2. --- commons-jci-1.0-src/compilers/janino/src/main/java/org/apache/commons/jci/compilers/JaninoCompilationProblem.java   2007-06-14 22:23:18.000000000 +0200
  3. +++ commons-jci-1.0-src-gil/compilers/janino/src/main/java/org/apache/commons/jci/compilers/JaninoCompilationProblem.java       2012-06-13 11:57:32.778432297 +0200
  4. @@ -18,8 +18,8 @@
  5.  package org.apache.commons.jci.compilers;
  6.  
  7.  import org.apache.commons.jci.problems.CompilationProblem;
  8. -import org.codehaus.janino.Location;
  9. -import org.codehaus.janino.Scanner.LocatedException;
  10. +import org.codehaus.commons.compiler.Location;
  11. +import org.codehaus.commons.compiler.LocatedException;
  12.  
  13.  /**
  14.   * Janino version of a CompilationProblem
  15. diff -Nru commons-jci-1.0-src/compilers/janino/src/main/java/org/apache/commons/jci/compilers/JaninoJavaCompiler.java commons-jci-1.0-src-gil/compilers/janino/src/main/java/org/apache/commons/jci/compilers/JaninoJavaCompiler.java
  16. --- commons-jci-1.0-src/compilers/janino/src/main/java/org/apache/commons/jci/compilers/JaninoJavaCompiler.java 2007-06-14 22:23:18.000000000 +0200
  17. +++ commons-jci-1.0-src-gil/compilers/janino/src/main/java/org/apache/commons/jci/compilers/JaninoJavaCompiler.java     2012-06-13 12:57:53.097609355 +0200
  18. @@ -34,18 +34,18 @@
  19.  import org.apache.commons.logging.Log;
  20.  import org.apache.commons.logging.LogFactory;
  21.  import org.codehaus.janino.ClassLoaderIClassLoader;
  22. -import org.codehaus.janino.CompileException;
  23. -import org.codehaus.janino.DebuggingInformation;
  24. +import org.codehaus.commons.compiler.CompileException;
  25. +//import org.codehaus.janino.DebuggingInformation;
  26.  import org.codehaus.janino.Descriptor;
  27.  import org.codehaus.janino.IClass;
  28.  import org.codehaus.janino.IClassLoader;
  29.  import org.codehaus.janino.Java;
  30. -import org.codehaus.janino.Location;
  31. +import org.codehaus.commons.compiler.Location;
  32.  import org.codehaus.janino.Parser;
  33.  import org.codehaus.janino.Scanner;
  34.  import org.codehaus.janino.UnitCompiler;
  35.  import org.codehaus.janino.WarningHandler;
  36. -import org.codehaus.janino.Scanner.LocatedException;
  37. +import org.codehaus.commons.compiler.LocatedException;
  38.  import org.codehaus.janino.UnitCompiler.ErrorHandler;
  39.  import org.codehaus.janino.util.ClassFile;
  40.  
  41. @@ -112,7 +112,7 @@
  42.                      }
  43.                  });
  44.                  log.debug("compile " + className);
  45. -                final ClassFile[] classFiles = uc.compileUnit(DebuggingInformation.ALL);
  46. +                final ClassFile[] classFiles = uc.compileUnit(true, true, true);
  47.                  for (int i = 0; i < classFiles.length; i++) {
  48.                      log.debug("compiled " + classFiles[i].getThisClassName());
  49.                      classes.put(classFiles[i].getThisClassName(), classFiles[i].toByteArray());
  50. @@ -148,7 +148,11 @@
  51.          final CompilingIClassLoader icl = new CompilingIClassLoader(pResourceReader, classFilesByName, pClassLoader);
  52.          for (int i = 0; i < pSourceNames.length; i++) {
  53.              log.debug("compiling " + pSourceNames[i]);
  54. -            icl.loadIClass(Descriptor.fromClassName(ConversionUtils.convertResourceToClassName(pSourceNames[i])));
  55. +            try {
  56. +                icl.loadIClass(Descriptor.fromClassName(ConversionUtils.convertResourceToClassName(pSourceNames[i])));
  57. +            } catch (ClassNotFoundException e) {
  58. +                log.error(e);
  59. +            }
  60.          }
  61.          
  62.          // Store all fully compiled classes
create a new version of this paste RAW Paste Data