[pkg-java] r17152 - in tags/commons-jci: . 1.0-7/debian 1.0-7/debian/patches
Damien Raude-Morvan
drazzib at alioth.debian.org
Sat Aug 17 13:17:45 UTC 2013
Author: drazzib
Date: 2013-08-17 13:17:45 +0000 (Sat, 17 Aug 2013)
New Revision: 17152
Added:
tags/commons-jci/1.0-7/
tags/commons-jci/1.0-7/debian/changelog
tags/commons-jci/1.0-7/debian/compat
tags/commons-jci/1.0-7/debian/control
tags/commons-jci/1.0-7/debian/patches/01_janino_version_change.diff
Removed:
tags/commons-jci/1.0-7/debian/changelog
tags/commons-jci/1.0-7/debian/compat
tags/commons-jci/1.0-7/debian/control
tags/commons-jci/1.0-7/debian/patches/01_janino_version_change.diff
Log:
[svn-buildpackage] Tagging commons-jci 1.0-7
Deleted: tags/commons-jci/1.0-7/debian/changelog
===================================================================
--- trunk/commons-jci/debian/changelog 2013-08-16 10:43:07 UTC (rev 17150)
+++ tags/commons-jci/1.0-7/debian/changelog 2013-08-17 13:17:45 UTC (rev 17152)
@@ -1,85 +0,0 @@
-commons-jci (1.0-6) unstable; urgency=low
-
- * Added a patch to compile with Eclipse JDT compiler 3.8 and later
- (Closes: #713759)
- * Updated Standards-Version to 3.9.4 (no changes)
- * Use canonical URLs for the Vcs-* fields
- * debian/rules: Added a clean target to allow rebuilds
- * debian/copyright: Updated to the copyright format 1.0
-
- -- Emmanuel Bourg <ebourg at apache.org> Mon, 24 Jun 2013 00:07:38 +0200
-
-commons-jci (1.0-5) unstable; urgency=low
-
- * d/control: Drop Depends on default-jre per Debian Java Policy as its
- a library package.
- * d/control: B-D and Depends on librhino-java instead of rhino
- (ie. so no JRE in dependencies graph).
- * Bump Standards-Version 3.9.2: no changes needed.
-
- -- Damien Raude-Morvan <drazzib at debian.org> Sat, 25 Jun 2011 13:06:33 +0200
-
-commons-jci (1.0-4) unstable; urgency=low
-
- [ Torsten Werner ]
- * Change maintainers into Maintainers.
-
- [ Onkar Shinde ]
- * Team upload.
- * Convert package to 3.0 source format.
- * asm2 -> asm3 transition.
- * Update standards version to 3.8.4.
- * Link javadoc against the system installed javadoc.
- * Install API docs to /usr/share/doc/libcommons-jci-java/ instead of
- /usr/share/doc/libcommons-jci-java-doc/. Update doc-base file accordingly.
-
- [ Damien Raude-Morvan ]
- * Update to unstable.
-
- -- Damien Raude-Morvan <drazzib at debian.org> Wed, 23 Jun 2010 19:26:21 +0200
-
-commons-jci (1.0-3) unstable; urgency=low
-
- * Update my email address
- * Bump Standards-Version 3.8.3 (no changes needed)
- * Bump debhelper version to 7
- * Maven POMs:
- - Add a Build-Depends-Indep dependency on maven-repo-helper
- - Use mh_installpoms and mh_installjar to install the POM and the jar to the
- Maven repository
- * Maven ant helper (build system):
- - Add a Build-Depends dependency on maven-ant-helper
- - Update debian/build.xml to use /usr/share/maven-ant-helper/maven-build.xml
- - Build classpath is now defined in debian/build.properties
- * Use default-jdk:
- - Build-Depend on default-jdk instead of openjdk-6-jdk
- - Depends on default-jre-headless
- - Use /usr/lib/jvm/default-java as JAVA_HOME
-
- -- Damien Raude-Morvan <drazzib at debian.org> Tue, 24 Nov 2009 00:29:48 +0100
-
-commons-jci (1.0-2) unstable; urgency=low
-
- * Upload to unstable as Lenny is now released
- * Set Maintainer field to Debian Java Team
- * Add myself as Uploaders
- * Switch to Quilt patch system:
- - Refresh all patches
- - Remove B-D on dpatch, Add B-D on quilt
- - Include patchsys-quilt.mk in debian/rules
- * Bump Standards-Version 3.8.2:
- - Add a README.source to describe patch system
- - Move libcommons-jci-java-* to "java" section
- * Depends on default-jre-headless instead of java-gcj-compat
-
- -- Damien Raude-Morvan <drazzib at drazzib.com> Fri, 17 Jul 2009 16:09:24 +0200
-
-commons-jci (1.0-1) experimental; urgency=low
-
- * Initial release. (Closes: #499448)
- * debian/control:
- - each binary package now depends on headless version of java-gcj-compat
- - don't use alternative in B-D line (increase build reproducibility)
- * Include examples in libcommons-jci-java-doc package
-
- -- Damien Raude-Morvan <drazzib at drazzib.com> Sat, 29 Nov 2008 22:48:17 +0100
Copied: tags/commons-jci/1.0-7/debian/changelog (from rev 17151, trunk/commons-jci/debian/changelog)
===================================================================
--- tags/commons-jci/1.0-7/debian/changelog (rev 0)
+++ tags/commons-jci/1.0-7/debian/changelog 2013-08-17 13:17:45 UTC (rev 17152)
@@ -0,0 +1,95 @@
+commons-jci (1.0-7) unstable; urgency=low
+
+ * Fix build with janino 2.6.x release:
+ - d/patches/01_janino_version_change.diff: Updated.
+ - d/control: Tighten dependencies to libjanino-java (>= 2.6.0).
+ * d/control: Wrap-and-sort.
+ * d/compat: Bump debhelper compat to 9.
+
+ -- Damien Raude-Morvan <drazzib at debian.org> Fri, 16 Aug 2013 14:16:11 +0200
+
+commons-jci (1.0-6) unstable; urgency=low
+
+ * Added a patch to compile with Eclipse JDT compiler 3.8 and later
+ (Closes: #713759)
+ * Updated Standards-Version to 3.9.4 (no changes)
+ * Use canonical URLs for the Vcs-* fields
+ * debian/rules: Added a clean target to allow rebuilds
+ * debian/copyright: Updated to the copyright format 1.0
+
+ -- Emmanuel Bourg <ebourg at apache.org> Mon, 24 Jun 2013 00:07:38 +0200
+
+commons-jci (1.0-5) unstable; urgency=low
+
+ * d/control: Drop Depends on default-jre per Debian Java Policy as its
+ a library package.
+ * d/control: B-D and Depends on librhino-java instead of rhino
+ (ie. so no JRE in dependencies graph).
+ * Bump Standards-Version 3.9.2: no changes needed.
+
+ -- Damien Raude-Morvan <drazzib at debian.org> Sat, 25 Jun 2011 13:06:33 +0200
+
+commons-jci (1.0-4) unstable; urgency=low
+
+ [ Torsten Werner ]
+ * Change maintainers into Maintainers.
+
+ [ Onkar Shinde ]
+ * Team upload.
+ * Convert package to 3.0 source format.
+ * asm2 -> asm3 transition.
+ * Update standards version to 3.8.4.
+ * Link javadoc against the system installed javadoc.
+ * Install API docs to /usr/share/doc/libcommons-jci-java/ instead of
+ /usr/share/doc/libcommons-jci-java-doc/. Update doc-base file accordingly.
+
+ [ Damien Raude-Morvan ]
+ * Update to unstable.
+
+ -- Damien Raude-Morvan <drazzib at debian.org> Wed, 23 Jun 2010 19:26:21 +0200
+
+commons-jci (1.0-3) unstable; urgency=low
+
+ * Update my email address
+ * Bump Standards-Version 3.8.3 (no changes needed)
+ * Bump debhelper version to 7
+ * Maven POMs:
+ - Add a Build-Depends-Indep dependency on maven-repo-helper
+ - Use mh_installpoms and mh_installjar to install the POM and the jar to the
+ Maven repository
+ * Maven ant helper (build system):
+ - Add a Build-Depends dependency on maven-ant-helper
+ - Update debian/build.xml to use /usr/share/maven-ant-helper/maven-build.xml
+ - Build classpath is now defined in debian/build.properties
+ * Use default-jdk:
+ - Build-Depend on default-jdk instead of openjdk-6-jdk
+ - Depends on default-jre-headless
+ - Use /usr/lib/jvm/default-java as JAVA_HOME
+
+ -- Damien Raude-Morvan <drazzib at debian.org> Tue, 24 Nov 2009 00:29:48 +0100
+
+commons-jci (1.0-2) unstable; urgency=low
+
+ * Upload to unstable as Lenny is now released
+ * Set Maintainer field to Debian Java Team
+ * Add myself as Uploaders
+ * Switch to Quilt patch system:
+ - Refresh all patches
+ - Remove B-D on dpatch, Add B-D on quilt
+ - Include patchsys-quilt.mk in debian/rules
+ * Bump Standards-Version 3.8.2:
+ - Add a README.source to describe patch system
+ - Move libcommons-jci-java-* to "java" section
+ * Depends on default-jre-headless instead of java-gcj-compat
+
+ -- Damien Raude-Morvan <drazzib at drazzib.com> Fri, 17 Jul 2009 16:09:24 +0200
+
+commons-jci (1.0-1) experimental; urgency=low
+
+ * Initial release. (Closes: #499448)
+ * debian/control:
+ - each binary package now depends on headless version of java-gcj-compat
+ - don't use alternative in B-D line (increase build reproducibility)
+ * Include examples in libcommons-jci-java-doc package
+
+ -- Damien Raude-Morvan <drazzib at drazzib.com> Sat, 29 Nov 2008 22:48:17 +0100
Deleted: tags/commons-jci/1.0-7/debian/compat
===================================================================
--- trunk/commons-jci/debian/compat 2013-08-16 10:43:07 UTC (rev 17150)
+++ tags/commons-jci/1.0-7/debian/compat 2013-08-17 13:17:45 UTC (rev 17152)
@@ -1 +0,0 @@
-7
Copied: tags/commons-jci/1.0-7/debian/compat (from rev 17151, trunk/commons-jci/debian/compat)
===================================================================
--- tags/commons-jci/1.0-7/debian/compat (rev 0)
+++ tags/commons-jci/1.0-7/debian/compat 2013-08-17 13:17:45 UTC (rev 17152)
@@ -0,0 +1 @@
+9
Deleted: tags/commons-jci/1.0-7/debian/control
===================================================================
--- trunk/commons-jci/debian/control 2013-08-16 10:43:07 UTC (rev 17150)
+++ tags/commons-jci/1.0-7/debian/control 2013-08-17 13:17:45 UTC (rev 17152)
@@ -1,116 +0,0 @@
-Source: commons-jci
-Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Damien Raude-Morvan <drazzib at debian.org>, Emmanuel Bourg <ebourg at apache.org>
-Standards-Version: 3.9.4
-Section: java
-Priority: optional
-Build-Depends: default-jdk, ant, debhelper (>= 7), cdbs, maven-ant-helper
-Build-Depends-Indep: libcommons-io-java, libcommons-lang-java, libcommons-logging-java,
- libasm3-java, groovy, librhino-java, janino, libecj-java, maven-repo-helper,
- default-jdk-doc
-Homepage: http://commons.apache.org/jci/
-Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/commons-jci/
-Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/commons-jci/
-
-Package: libcommons-jci-java
-Architecture: all
-Depends: ${misc:Depends}, libcommons-io-java, libcommons-lang-java, libcommons-logging-java, libasm3-java
-Description: common Java interface for various compilers - Core and FAM
- Commons JCI is a common Java compiler interface for various compilers.
- .
- It can be used to either compile Java (or any other language that can be
- compiled to Java classes like e.g. Groovy or Javascript) to Java.
- .
- It is integrated with a Java FAM (Filesystem Alteration Monitor)
- that can be used with JCI compiling/reloading classloader.
- .
- This package contains FAM and Core module of Commons JCI.
-
-Package: libcommons-jci-rhino-java
-Architecture: all
-Depends: ${misc:Depends}, libcommons-jci-java (= ${source:Version}), librhino-java
-Description: common Java interface for various compilers - Javascript
- Commons JCI is a common Java compiler interface for various compilers.
- .
- It can be used to either compile Java (or any other language that can be
- compiled to Java classes like e.g. Groovy or Javascript) to Java.
- .
- It is integrated with a Java FAM (Filesystem Alteration Monitor)
- that can be used with JCI compiling/reloading classloader.
- .
- This package contains Rhino compiler (Javascript) module of Commons JCI.
-
-Package: libcommons-jci-groovy-java
-Architecture: all
-Depends: ${misc:Depends}, libcommons-jci-java (= ${source:Version}), groovy
-Description: common Java interface for various compilers - Groovy
- Commons JCI is a common Java compiler interface for various compilers.
- .
- It can be used to either compile Java (or any other language that can be
- compiled to Java classes like e.g. Groovy or Javascript) to Java.
- .
- It is integrated with a Java FAM (Filesystem Alteration Monitor)
- that can be used with JCI compiling/reloading classloader.
- .
- This package contains Groovy compiler module of Commons JCI.
-
-Package: libcommons-jci-janino-java
-Architecture: all
-Depends: ${misc:Depends}, libcommons-jci-java (= ${source:Version}), janino
-Description: common Java interface for various compilers - Janino
- Commons JCI is a common Java compiler interface for various compilers.
- .
- It can be used to either compile Java (or any other language that can be
- compiled to Java classes like e.g. Groovy or Javascript) to Java.
- .
- It is integrated with a Java FAM (Filesystem Alteration Monitor)
- that can be used with JCI compiling/reloading classloader.
- .
- This package contains Janino compiler module of Commons JCI.
-
-Package: libcommons-jci-eclipse-java
-Architecture: all
-Depends: ${misc:Depends}, libcommons-jci-java (= ${source:Version}), libecj-java
-Description: common Java interface for various compilers - Eclipse JDT
- Commons JCI is a common Java compiler interface for various compilers.
- .
- It can be used to either compile Java (or any other language that can be
- compiled to Java classes like e.g. Groovy or Javascript) to Java.
- .
- It is integrated with a Java FAM (Filesystem Alteration Monitor)
- that can be used with JCI compiling/reloading classloader.
- .
- This package contains Eclipse JDT compiler module of Commons JCI.
-
-#Package: libcommons-jci-jsr199-java
-#Architecture: all
-#Depends: ${misc:Depends}, libcommons-jci-java (= ${source:Version})
-#Description: common Java interface for various compilers - Java6 JSR199
-# Commons JCI is a common Java compiler interface for various compilers.
-# .
-# It can be used to either compile Java (or any other language that can be
-# compiled to Java classes like e.g. Groovy or Javascript) to Java.
-# .
-# It is integrated with a Java FAM (Filesystem Alteration Monitor)
-# that can be used with JCI compiling/reloading classloader.
-# .
-# This package contains Java6 JSR199 compiler module of Commons JCI.
-# .
-# Need a Java 6 compliant runtime environnement.
-
-Package: libcommons-jci-java-doc
-Architecture: all
-Section: doc
-Depends: ${misc:Depends}
-Recommends: default-jdk-doc
-Suggests: libcommons-jci-java
-Description: common Java interface for various compilers - documentation
- Commons JCI is a common Java compiler interface for various compilers.
- .
- It can be used to either compile Java (or any other language that can be
- compiled to Java classes like e.g. Groovy or Javascript) to Java.
- .
- It is integrated with a Java FAM (Filesystem Alteration Monitor)
- that can be used with JCI compiling/reloading classloader.
- .
- This package contains Javadoc API of Commons JCI.
Copied: tags/commons-jci/1.0-7/debian/control (from rev 17151, trunk/commons-jci/debian/control)
===================================================================
--- tags/commons-jci/1.0-7/debian/control (rev 0)
+++ tags/commons-jci/1.0-7/debian/control 2013-08-17 13:17:45 UTC (rev 17152)
@@ -0,0 +1,116 @@
+Source: commons-jci
+Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Uploaders: Damien Raude-Morvan <drazzib at debian.org>,
+ Emmanuel Bourg <ebourg at apache.org>
+Standards-Version: 3.9.4
+Section: java
+Priority: optional
+Build-Depends: ant, cdbs, debhelper (>= 9), default-jdk, maven-ant-helper
+Build-Depends-Indep: default-jdk-doc,
+ groovy,
+ libasm3-java,
+ libcommons-io-java,
+ libcommons-lang-java,
+ libcommons-logging-java,
+ libecj-java,
+ libjanino-java (>= 2.6.0),
+ librhino-java,
+ maven-repo-helper
+Homepage: http://commons.apache.org/jci/
+Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/commons-jci/
+Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/commons-jci/
+
+Package: libcommons-jci-java
+Architecture: all
+Depends: libasm3-java,
+ libcommons-io-java,
+ libcommons-lang-java,
+ libcommons-logging-java,
+ ${misc:Depends}
+Description: common Java interface for various compilers - Core and FAM
+ Commons JCI is a common Java compiler interface for various compilers.
+ .
+ It can be used to either compile Java (or any other language that can be
+ compiled to Java classes like e.g. Groovy or Javascript) to Java.
+ .
+ It is integrated with a Java FAM (Filesystem Alteration Monitor)
+ that can be used with JCI compiling/reloading classloader.
+ .
+ This package contains FAM and Core module of Commons JCI.
+
+Package: libcommons-jci-rhino-java
+Architecture: all
+Depends: libcommons-jci-java (= ${source:Version}),
+ librhino-java,
+ ${misc:Depends}
+Description: common Java interface for various compilers - Javascript
+ Commons JCI is a common Java compiler interface for various compilers.
+ .
+ It can be used to either compile Java (or any other language that can be
+ compiled to Java classes like e.g. Groovy or Javascript) to Java.
+ .
+ It is integrated with a Java FAM (Filesystem Alteration Monitor)
+ that can be used with JCI compiling/reloading classloader.
+ .
+ This package contains Rhino compiler (Javascript) module of Commons JCI.
+
+Package: libcommons-jci-groovy-java
+Architecture: all
+Depends: groovy, libcommons-jci-java (= ${source:Version}), ${misc:Depends}
+Description: common Java interface for various compilers - Groovy
+ Commons JCI is a common Java compiler interface for various compilers.
+ .
+ It can be used to either compile Java (or any other language that can be
+ compiled to Java classes like e.g. Groovy or Javascript) to Java.
+ .
+ It is integrated with a Java FAM (Filesystem Alteration Monitor)
+ that can be used with JCI compiling/reloading classloader.
+ .
+ This package contains Groovy compiler module of Commons JCI.
+
+Package: libcommons-jci-janino-java
+Architecture: all
+Depends: libcommons-jci-java (= ${source:Version}),
+ libjanino-java (>= 2.6.0),
+ ${misc:Depends}
+Description: common Java interface for various compilers - Janino
+ Commons JCI is a common Java compiler interface for various compilers.
+ .
+ It can be used to either compile Java (or any other language that can be
+ compiled to Java classes like e.g. Groovy or Javascript) to Java.
+ .
+ It is integrated with a Java FAM (Filesystem Alteration Monitor)
+ that can be used with JCI compiling/reloading classloader.
+ .
+ This package contains Janino compiler module of Commons JCI.
+
+Package: libcommons-jci-eclipse-java
+Architecture: all
+Depends: libcommons-jci-java (= ${source:Version}), libecj-java, ${misc:Depends}
+Description: common Java interface for various compilers - Eclipse JDT
+ Commons JCI is a common Java compiler interface for various compilers.
+ .
+ It can be used to either compile Java (or any other language that can be
+ compiled to Java classes like e.g. Groovy or Javascript) to Java.
+ .
+ It is integrated with a Java FAM (Filesystem Alteration Monitor)
+ that can be used with JCI compiling/reloading classloader.
+ .
+ This package contains Eclipse JDT compiler module of Commons JCI.
+
+Package: libcommons-jci-java-doc
+Architecture: all
+Section: doc
+Depends: ${misc:Depends}
+Recommends: default-jdk-doc
+Suggests: libcommons-jci-java
+Description: common Java interface for various compilers - documentation
+ Commons JCI is a common Java compiler interface for various compilers.
+ .
+ It can be used to either compile Java (or any other language that can be
+ compiled to Java classes like e.g. Groovy or Javascript) to Java.
+ .
+ It is integrated with a Java FAM (Filesystem Alteration Monitor)
+ that can be used with JCI compiling/reloading classloader.
+ .
+ This package contains Javadoc API of Commons JCI.
Deleted: tags/commons-jci/1.0-7/debian/patches/01_janino_version_change.diff
===================================================================
--- trunk/commons-jci/debian/patches/01_janino_version_change.diff 2013-08-16 10:43:07 UTC (rev 17150)
+++ tags/commons-jci/1.0-7/debian/patches/01_janino_version_change.diff 2013-08-17 13:17:45 UTC (rev 17152)
@@ -1,45 +0,0 @@
-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
Copied: tags/commons-jci/1.0-7/debian/patches/01_janino_version_change.diff (from rev 17151, trunk/commons-jci/debian/patches/01_janino_version_change.diff)
===================================================================
--- tags/commons-jci/1.0-7/debian/patches/01_janino_version_change.diff (rev 0)
+++ tags/commons-jci/1.0-7/debian/patches/01_janino_version_change.diff 2013-08-17 13:17:45 UTC (rev 17152)
@@ -0,0 +1,70 @@
+Description: Upstream use Janino 2.5.10 whereas Debian include 2.6.1
+ - 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)
+ - Since Janino 2.6.0 there many classes have been moved to commons-compiler.jar
+Forwarded: partial
+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: 2013-08-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
+@@ -18,8 +18,8 @@
+ package org.apache.commons.jci.compilers;
+
+ import org.apache.commons.jci.problems.CompilationProblem;
+-import org.codehaus.janino.Location;
+-import org.codehaus.janino.Scanner.LocatedException;
++import org.codehaus.commons.compiler.Location;
++import org.codehaus.commons.compiler.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
+@@ -34,18 +34,17 @@
+ import org.apache.commons.logging.Log;
+ import org.apache.commons.logging.LogFactory;
+ import org.codehaus.janino.ClassLoaderIClassLoader;
+-import org.codehaus.janino.CompileException;
+-import org.codehaus.janino.DebuggingInformation;
++import org.codehaus.commons.compiler.CompileException;
+ import org.codehaus.janino.Descriptor;
+ import org.codehaus.janino.IClass;
+ import org.codehaus.janino.IClassLoader;
+ import org.codehaus.janino.Java;
+-import org.codehaus.janino.Location;
++import org.codehaus.commons.compiler.Location;
+ import org.codehaus.janino.Parser;
+ import org.codehaus.janino.Scanner;
+ import org.codehaus.janino.UnitCompiler;
+ import org.codehaus.janino.WarningHandler;
+-import org.codehaus.janino.Scanner.LocatedException;
++import org.codehaus.commons.compiler.LocatedException;
+ import org.codehaus.janino.UnitCompiler.ErrorHandler;
+ import org.codehaus.janino.util.ClassFile;
+
+@@ -112,7 +111,7 @@
+ }
+ });
+ log.debug("compile " + className);
+- final ClassFile[] classFiles = uc.compileUnit(DebuggingInformation.ALL);
++ final ClassFile[] classFiles = uc.compileUnit(true, true, true);
+ for (int i = 0; i < classFiles.length; i++) {
+ log.debug("compiled " + classFiles[i].getThisClassName());
+ classes.put(classFiles[i].getThisClassName(), classFiles[i].toByteArray());
+@@ -148,7 +147,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
More information about the pkg-java-commits
mailing list