commons-jci (1.0-4) 01_janino_version_change.diff

Description: Upstream use Janino 2.5.10 whereas Debian include 2.5.15.
 - LocatedException package location has changed in 2.5.11 (JCI-53)
 - For Janino 2.5.5 icl.loadIClass(Descriptor.fromClassName(pClasses[i])) now 
   throws ClassNotFoundException. (JCI-41)
Forwarded: yes
Origin: upstream, http://www.janino.net/changelog.html
Bug: http://issues.apache.org/jira/browse/JCI-53
Origin: upstream, http://svn.apache.org/viewvc/commons/proper/jci/trunk/compilers/janino/src/main/java/org/apache/commons/jci/compilers/JaninoJavaCompiler.java?r1=565099&r2=565475
Bug: http://issues.apache.org/jira/browse/JCI-41
Last-Update: 2009-07-16
--- a/compilers/janino/src/main/java/org/apache/commons/jci/compilers/JaninoCompilationProblem.java
+++ b/compilers/janino/src/main/java/org/apache/commons/jci/compilers/JaninoCompilationProblem.java
@@ -19,7 +19,7 @@
 
 import org.apache.commons.jci.problems.CompilationProblem;
 import org.codehaus.janino.Location;
-import org.codehaus.janino.Scanner.LocatedException;
+import org.codehaus.janino.util.LocatedException;
 
 /**
  * Janino version of a CompilationProblem
--- a/compilers/janino/src/main/java/org/apache/commons/jci/compilers/JaninoJavaCompiler.java
+++ b/compilers/janino/src/main/java/org/apache/commons/jci/compilers/JaninoJavaCompiler.java
@@ -45,7 +45,7 @@
 import org.codehaus.janino.Scanner;
 import org.codehaus.janino.UnitCompiler;
 import org.codehaus.janino.WarningHandler;
-import org.codehaus.janino.Scanner.LocatedException;
+import org.codehaus.janino.util.LocatedException;
 import org.codehaus.janino.UnitCompiler.ErrorHandler;
 import org.codehaus.janino.util.ClassFile;
 
@@ -148,7 +148,11 @@
         final CompilingIClassLoader icl = new CompilingIClassLoader(pResourceReader, classFilesByName, pClassLoader);
         for (int i = 0; i < pSourceNames.length; i++) {
             log.debug("compiling " + pSourceNames[i]);
-            icl.loadIClass(Descriptor.fromClassName(ConversionUtils.convertResourceToClassName(pSourceNames[i])));
+            try {
+                icl.loadIClass(Descriptor.fromClassName(ConversionUtils.convertResourceToClassName(pSourceNames[i])));
+            } catch (ClassNotFoundException e) {
+                log.error(e);
+            }
         }
         
         // Store all fully compiled classes